Commit 7aa8b1c2 authored by Nico Mack's avatar Nico Mack

Improvements on Content Bootstrapping

parent d72cde05
......@@ -25,6 +25,7 @@ CIRCLE_SIZE_NODE=circleSize
COLOUR_NODE=colour
COLOURSC_NODE=colourscheme
CONNECTIONS_NODE=connections
CONTENT_NODE=content
CONTENT_BUILDER_NAMESPACE=lu.list.itis.dkd.tui.content.builder
CORNER_RADIUS_NODE=cornerRadius
CORONA_BUILDER_NAMESPACE=lu.list.itis.dkd.tui.widget.corona.builder
......
......@@ -27,6 +27,7 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
......@@ -39,35 +40,37 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<configuration>
<revisionOnScmFailure>no.scm.config.in.pom</revisionOnScmFailure>
</configuration>
<executions>
<execution>
<phase>generate-resources</phase>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
<configuration>
<timestampFormat>yyyy-MM-dd HH:mm:ss.S</timestampFormat>
<timestampPropertyName>build.date</timestampPropertyName>
</configuration>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
<timestampPropertyName>build.date</timestampPropertyName>
<revisiononscmfailure>
<format>Build: #{0} ({1,date})</format>
<items>
<item>buildNumber\d*</item>
<item>timestamp</item>
</items>
</revisiononscmfailure>
</configuration>
</plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifestEntries>
<implementation-version>${project.version}</implementation-version>
<implementation-build>${build.date}</implementation-build>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/lu/list/itis/dkd/tui/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
<dependencies>
......
......@@ -68,7 +68,7 @@ public class ContentBootstrapper {
* @throws BuildException
*/
@SuppressWarnings("unchecked")
public static Content buildTetherFromElement(Element contentNode, BootstrapContext bootstrapContext, BootstrapCallback callback) throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, BuildException {
public static Content buildContentFromElement(Element contentNode, BootstrapContext bootstrapContext, BootstrapCallback callback) throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, BuildException {
Content instance = null;
......
......@@ -68,23 +68,6 @@ public abstract class Content {
this.clippingRegion = new Area();
}
// ---------------------------------------------------------------------------
/**
* Comparison as defined by the {@link Comparable} interface. This comparison is based on the
* integer comparison of the draw priorities, ordering lower priorities first. This will result in
* lower priority {@link Content} instances being overlapped by prioritised ones.<br>
* <br>
*
* {@inheritDoc}
*/
// ---------------------------------------------------------------------------
// public int compareTo(@Nullable Content content) {
// if (content == null)
// throw new NullPointerException();
// return Integer.compare(getDrawPriority(), content.getDrawPriority());
// }
// ---------------------------------------------------------------------------
@Override
......@@ -117,6 +100,8 @@ public abstract class Content {
return Objects.hash(stageId, identifier);
}
// ---------------------------------------------------------------------------
/**
* Simple getter method for identifier.
*
......
VERSION=${project.version}
BUILD_DATE=${buildNumber}
\ No newline at end of file
......@@ -60,6 +60,7 @@ public class Externalization extends NLS {
public static String COLOUR_NODE;
public static String COLOURSC_NODE;
public static String CONNECTIONS_NODE;
public static String CONTENT_NODE;
public static String CONTENT_BUILDER_NAMESPACE;
public static String CORNER_RADIUS_NODE;
public static String CORONA_BUILDER_NAMESPACE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment