Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change package name eu.mikrosimage.xdmat.ebucore to eu.mikrosimage.xdmat.ebucore_2015 #9

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

change package name eu.mikrosimage.xdmat.ebucore to eu.mikrosimage.xdmat.ebucore_2015 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72a2d79
Merge branch 'develop' into release/1.6
gmaucomble Jun 5, 2017
13e9fa8
renamed the package mikrosimage ebucore package to ebucore_2015
Jun 12, 2018
44ef06e
updated classe names in imports
Jun 12, 2018
a4bfffe
new release
Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ebu.metadata_schema</groupId>
<artifactId>jebu-core</artifactId>
<version>1.6.3</version>
<version>1.6.4</version>
<description>Java port of TECH 3293 EBU CORE METADATA SET (EBUCore) SPECIFICATION v. 1.6, including Audio Definition Model and
R-REC-BS.2094-0 Common definitions for the audio definition mode</description>
<developers>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/AffiliationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;

import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;

/**
* <p>Classe Java pour affiliationType complex type.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/AlternativeDateType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;

import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/AlternativeTitleType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import org.purl.dc.elements._1.ElementType;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/AwardType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;

import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/ContactDetailsType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/DateType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import org.purl.dc.elements._1.ElementType;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/DescriptionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import org.purl.dc.elements._1.ElementType;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/EbuCoreMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/FormatType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import org.purl.dc.elements._1.ElementType;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/OrganisationDetailsType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/PeriodOfTimeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/PublicationEventType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ebu/metadata_schema/ebucore_2015/TitleType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
import org.purl.dc.elements._1.ElementType;
import eu.mikrosimage.xdmat.ebucore.adapters.XmlDateAdapter;
import eu.mikrosimage.xdmat.ebucore_2015.adapters.XmlDateAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion .../ebucore/adapters/XmlCalendarAdapter.java → ...ore_2015/adapters/XmlCalendarAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.mikrosimage.xdmat.ebucore.adapters;
package eu.mikrosimage.xdmat.ebucore_2015.adapters;

import java.util.Calendar;

Expand Down
2 changes: 1 addition & 1 deletion ...dmat/ebucore/adapters/XmlDateAdapter.java → ...ebucore_2015/adapters/XmlDateAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.mikrosimage.xdmat.ebucore.adapters;
package eu.mikrosimage.xdmat.ebucore_2015.adapters;

import java.text.SimpleDateFormat;
import java.util.Date;
Expand Down
2 changes: 1 addition & 1 deletion ...helpers/AudioChannelFormatTypeHelper.java → ...helpers/AudioChannelFormatTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...ucore/helpers/AudioContentTypeHelper.java → ..._2015/helpers/AudioContentTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import java.util.Objects;

Expand Down
2 changes: 1 addition & 1 deletion ...bucore/helpers/AudioObjectTypeHelper.java → ...e_2015/helpers/AudioObjectTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import ebu.metadata_schema.ebucore_2015.AudioObject;
import ebu.metadata_schema.ebucore_2015.ObjectFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...re/helpers/AudioPackFormatTypeHelper.java → ...15/helpers/AudioPackFormatTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import ebu.metadata_schema.ebucore_2015.AudioPackFormat;
import ebu.metadata_schema.ebucore_2015.ObjectFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...ore/helpers/AudioProgrammeTypeHelper.java → ...015/helpers/AudioProgrammeTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import java.util.Objects;

Expand Down
2 changes: 1 addition & 1 deletion ...e/helpers/AudioTrackFormatTypeHelper.java → ...5/helpers/AudioTrackFormatTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...core/helpers/AudioTrackUIDTypeHelper.java → ...2015/helpers/AudioTrackUIDTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import java.util.List;
import java.util.Objects;
Expand Down
2 changes: 1 addition & 1 deletion ...image/xdmat/ebucore/helpers/IDHelper.java → .../xdmat/ebucore_2015/helpers/IDHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import java.util.Arrays;
import java.util.Objects;
Expand Down
4 changes: 2 additions & 2 deletions .../ebucore/AudioFormatExtendedTypeTest.java → ...ore_2015/AudioFormatExtendedTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore;
package eu.mikrosimage.xdmat.ebucore_2015;

import java.util.Iterator;
import java.util.List;
Expand All @@ -13,7 +13,7 @@
import ebu.metadata_schema.ebucore_2015.AudioFormatExtendedType;
import ebu.metadata_schema.ebucore_2015.AudioTrackUID;
import ebu.metadata_schema.ebucore_2015.ObjectFactory;
import eu.mikrosimage.xdmat.ebucore.helpers.AudioTrackUIDTypeHelper;
import eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioTrackUIDTypeHelper;

/**
* @author gma
Expand Down
4 changes: 2 additions & 2 deletions .../ebucore/AudioTrackUIDTypeHelperTest.java → ...ore_2015/AudioTrackUIDTypeHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore;
package eu.mikrosimage.xdmat.ebucore_2015;

import static org.junit.Assert.assertEquals;

import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import eu.mikrosimage.xdmat.ebucore.helpers.AudioTrackUIDTypeHelper;
import eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioTrackUIDTypeHelper;

/**
* @author gma
Expand Down
8 changes: 4 additions & 4 deletions ...ge/xdmat/ebucore/AudioTypeHelperTest.java → ...mat/ebucore_2015/AudioTypeHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore;
package eu.mikrosimage.xdmat.ebucore_2015;

import static org.junit.Assert.assertEquals;

import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import eu.mikrosimage.xdmat.ebucore.helpers.AudioContentTypeHelper;
import eu.mikrosimage.xdmat.ebucore.helpers.AudioObjectTypeHelper;
import eu.mikrosimage.xdmat.ebucore.helpers.AudioProgrammeTypeHelper;
import eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioContentTypeHelper;
import eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioObjectTypeHelper;
import eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioProgrammeTypeHelper;

/**
* @author Guillaume Maucomble <[email protected]>
Expand Down
8 changes: 4 additions & 4 deletions ...ers/AudioChannelFormatTypeHelpertest.java → ...ers/AudioChannelFormatTypeHelpertest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package eu.mikrosimage.xdmat.ebucore.helpers;
package eu.mikrosimage.xdmat.ebucore_2015.helpers;

import org.junit.Before;
import org.junit.BeforeClass;
Expand All @@ -28,7 +28,7 @@ public void setUp() throws Exception {
}

/**
* Test method for {@link eu.mikrosimage.xdmat.ebucore.helpers.AudioChannelFormatTypeHelper#getAudioChannelPrefix(int)}.
* Test method for {@link eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioChannelFormatTypeHelper#getAudioChannelPrefix(int)}.
*/
@Test
public void testGetAudioChannelPrefix() {
Expand All @@ -37,7 +37,7 @@ public void testGetAudioChannelPrefix() {
}

/**
* Test method for {@link eu.mikrosimage.xdmat.ebucore.helpers.AudioChannelFormatTypeHelper#getAudioChannelIdFromIndex(int)}.
* Test method for {@link eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioChannelFormatTypeHelper#getAudioChannelIdFromIndex(int)}.
*/
@Test
public void testGetAudioChannelIdFromIndex() {
Expand All @@ -46,7 +46,7 @@ public void testGetAudioChannelIdFromIndex() {
}

/**
* Test method for {@link eu.mikrosimage.xdmat.ebucore.helpers.AudioChannelFormatTypeHelper#getAudioChannelIndexFromId(java.lang.String)}.
* Test method for {@link eu.mikrosimage.xdmat.ebucore_2015.helpers.AudioChannelFormatTypeHelper#getAudioChannelIndexFromId(java.lang.String)}.
*/
@Test
public void testGetAudioChannelIndexFromId() {
Expand Down