catch up with dev
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f2bd24b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+**/bin/
+**/target/
+**._trace
+**.log.properties
+**git.properties
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.utils.themes.ui.feature/.project b/org.eclipse.osbp.utils.themes.ui.feature/.project
index 249a235..5e8923f 100644
--- a/org.eclipse.osbp.utils.themes.ui.feature/.project
+++ b/org.eclipse.osbp.utils.themes.ui.feature/.project
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.utils.themes.ui.feature/feature.xml b/org.eclipse.osbp.utils.themes.ui.feature/feature.xml
index 9f1d05c..0dc3eb5 100644
--- a/org.eclipse.osbp.utils.themes.ui.feature/feature.xml
+++ b/org.eclipse.osbp.utils.themes.ui.feature/feature.xml
@@ -14,7 +14,8 @@
id="org.eclipse.osbp.utils.themes.ui.feature"
label="%featureName"
version="0.9.0.qualifier"
- provider-name="%providerName">
+ provider-name="%providerName"
+ plugin="org.eclipse.osbp.utils.themes.ui">
<description>
%description
diff --git a/org.eclipse.osbp.utils.themes.ui/.classpath b/org.eclipse.osbp.utils.themes.ui/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.utils.themes.ui/.project b/org.eclipse.osbp.utils.themes.ui/.project
index a7b6feb..401b2ce 100644
--- a/org.eclipse.osbp.utils.themes.ui/.project
+++ b/org.eclipse.osbp.utils.themes.ui/.project
@@ -31,12 +31,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/org.eclipse.osbp.utils.themes.ui/.settings/com.vaadin.integration.eclipse.prefs b/org.eclipse.osbp.utils.themes.ui/.settings/com.vaadin.integration.eclipse.prefs
new file mode 100644
index 0000000..0904e44
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.settings/com.vaadin.integration.eclipse.prefs
@@ -0,0 +1,2 @@
+com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["7.7.7"]
+eclipse.preferences.version=1
diff --git a/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.utils.themes.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.utils.themes.ui/META-INF/MANIFEST.MF b/org.eclipse.osbp.utils.themes.ui/META-INF/MANIFEST.MF
index a80b921..e5f8379 100644
--- a/org.eclipse.osbp.utils.themes.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.utils.themes.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.osbp.gitinfo;bundle-version="[0.9.0,0.10.0)"
Export-Package: org.eclipse.osbp.utils.themes.ui;version="0.9.0"
-Import-Package: com.vaadin.server;version="7.5.7",
+Import-Package: com.vaadin.server;version="7.7.6",
org.eclipse.core.runtime,
org.eclipse.osbp.ui.api.themes;version="0.9.0",
org.osgi.framework;version="1.8.0"
diff --git a/org.eclipse.osbp.utils.themes.ui/plugin.xml b/org.eclipse.osbp.utils.themes.ui/plugin.xml
index 7463205..7650ad5 100644
--- a/org.eclipse.osbp.utils.themes.ui/plugin.xml
+++ b/org.eclipse.osbp.utils.themes.ui/plugin.xml
@@ -1,36 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin>
- <extension-point id="org.eclipse.osbp.vaaclipse.theme" name="Vaaclipse Theme" schema="schema/org.eclipse.osbp.vaaclipse.theme.exsd"/>
- <extension
- point="org.eclipse.osbp.vaaclipse.theme">
- <!--theme
- cssUri="platform:/plugin/com.vaadin.themes/VAADIN/themes/valo/styles.css"
- description="Vaadin Valo theme"
- id="valo"
- label="Valo">
- <resourceLocationUri
- uri="platform:/plugin/com.vaadin.themes/VAADIN/themes/valo/">
- </resourceLocationUri>
- </theme>
- <theme
- cssUri="platform:/plugin/org.eclipse.osbp.vaadin.widgetset/VAADIN/themes/osbp/styles.css"
- id="osbp"
- label="OSBP Default Theme CSS"
- description="OS.theme OSBP based on Valo">
- <inheritedTheme
- refid="reindeer">
- </inheritedTheme>
- <resourceLocationUri
- uri="platform:/plugin/org.eclipse.osbp.vaadin.widgetset/VAADIN/themes/osbp/">
- </resourceLocationUri>
- </theme -->
- <!--themecontribution
- cssUri="platform:/plugin/org.eclipse.osbp.vaadin.widgetset/VAADIN/themes/osbp/styles.css"
- id="osbp-valo-contribution"
- insertPosition="after=MAIN_CSS">
- <themeid
- refid="valo">
- </themeid>
- </themecontribution-->
- </extension>
+ <extension
+ point="org.eclipse.osbp.vaaclipse.theme">
+ <theme
+ cssUri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp/styles.css"
+ id="osbp"
+ label="Classic"
+ description="Classic">
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp/image/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp/icon/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp/flag/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/valo/shared/img">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/base/fonts">
+ </resourceLocationUri>
+ </theme>
+ <theme
+ cssUri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/styles.css"
+ id="osbp-steel"
+ label="Steel"
+ description="Steel">
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/image/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/icon/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/flag/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/valo/shared/img">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/base/fonts">
+ </resourceLocationUri>
+ </theme>
+ <theme
+ cssUri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/styles.css"
+ id="osbp-tea"
+ label="Green Tea"
+ description="Green Tea">
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/image/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/icon/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/flag/">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/valo/shared/img">
+ </resourceLocationUri>
+ <resourceLocationUri
+ uri="platform:/plugin/org.eclipse.osbp.themes/VAADIN/themes/base/fonts">
+ </resourceLocationUri>
+ </theme>
+ </extension>
</plugin>
diff --git a/org.eclipse.osbp.utils.themes.ui/src/org/eclipse/osbp/utils/themes/ui/VaaclipseUiTheme.java b/org.eclipse.osbp.utils.themes.ui/src/org/eclipse/osbp/utils/themes/ui/VaaclipseUiTheme.java
index d8f7b61..25d8f59 100644
--- a/org.eclipse.osbp.utils.themes.ui/src/org/eclipse/osbp/utils/themes/ui/VaaclipseUiTheme.java
+++ b/org.eclipse.osbp.utils.themes.ui/src/org/eclipse/osbp/utils/themes/ui/VaaclipseUiTheme.java
@@ -28,8 +28,10 @@
import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
/**
- * @see org.eclipse.osbp.utils Bundle <code>org.eclipse.osbp.utils</code> for OSBP themes
- * @see org.eclipse.osbp.utils.themes.ui Bundle <code>org.eclipse.osbp.utils.themes.ui</code> for extension points
+ * @see org.eclipse.osbp.utils Bundle <code>org.eclipse.osbp.utils</code> for
+ * OSBP themes
+ * @see org.eclipse.osbp.utils.themes.ui Bundle
+ * <code>org.eclipse.osbp.utils.themes.ui</code> for extension points
* <hr>
* {@link https://github.com/semanticsoft/vaaclipse/wiki/Resource-system}<br>
* {@link https://github.com/semanticsoft/vaaclipse/wiki/Resource-system#themes}<br>
@@ -40,8 +42,7 @@
public enum ThemeList {
@Deprecated
- internal(new String[] {}), forWizard(new String[] { "base", "chameleon", "chameleon-legacy", "liferay", "presentation", "reindeer", "runo", "valo" }), forProduct(
- new String[] { "base", "chameleon", "chameleon-legacy", "liferay", "presentation", "reindeer", "runo", "valo" });
+ internal(new String[] {}), forWizard(new String[] { "base", "chameleon", "chameleon-legacy", "liferay", "presentation", "reindeer", "runo", "valo" }), forProduct(new String[] { "base", "chameleon", "chameleon-legacy", "liferay", "presentation", "reindeer", "runo", "valo" });
protected final List<String> blackList;
protected Set<VaaclipseUiTheme> availables;
@@ -69,7 +70,8 @@
forWhat.availables = new TreeSet<VaaclipseUiTheme>(COMPARATOR);
IExtensionRegistry registry = RegistryFactory.getRegistry();
if (registry != null) {
- for (IConfigurationElement element : registry.getConfigurationElementsFor("org.eclipse.osbp.vaaclipse.theme")) {
+ for (IConfigurationElement element : registry
+ .getConfigurationElementsFor("org.eclipse.osbp.vaaclipse.theme")) {
String contributor = element.getContributor().getName();
String name = element.getName();
if ("theme".equals(name)) {
@@ -106,12 +108,13 @@
private final String iconPath = ThemeResourceType.ICON.toString().toLowerCase() + "/";
private final String imagePath = ThemeResourceType.IMAGE.toString().toLowerCase() + "/";
- private VaaclipseUiTheme(String id, String label, String description, String bundleId, List<URI> resourceLocationUris) {
+ private VaaclipseUiTheme(String id, String label, String description, String bundleId,
+ List<URI> resourceLocationUris) {
this.id = id;
this.label = label == null ? this.id : label;
this.description = description == null ? this.label : description;
- this.bundleId = bundleId == null ? this.bundleId : bundleId;
- this.resourceLocationUris = resourceLocationUris == null ? this.resourceLocationUris : resourceLocationUris;
+ this.bundleId = bundleId;
+ this.resourceLocationUris = resourceLocationUris;
}
@Override
@@ -131,6 +134,10 @@
return id + " - " + label + " - " + description;
}
+ public String getValue() {
+ return id + " - " + label + " - " + description;
+ }
+
public String getId() {
return id;
}
@@ -153,7 +160,6 @@
public boolean hasIconsUri() {
for (URI uri : resourceLocationUris) {
- String path = uri.getPath();
if (uri.getPath().endsWith(iconPath)) {
return true;
}
@@ -192,4 +198,43 @@
public int compare(VaaclipseUiTheme theme1, VaaclipseUiTheme theme2) {
return theme1.getId().compareTo(theme2.getId());
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((description == null) ? 0 : description.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((label == null) ? 0 : label.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ VaaclipseUiTheme other = (VaaclipseUiTheme) obj;
+ if (description == null) {
+ if (other.description != null)
+ return false;
+ } else if (!description.equals(other.description))
+ return false;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ if (label == null) {
+ if (other.label != null)
+ return false;
+ } else if (!label.equals(other.label))
+ return false;
+ return true;
+ }
+
+
}
