Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2016-08-09 10:25:50 +0000
committerGerrit Code Review @ Eclipse.org2016-08-28 15:46:41 +0000
commit7310db0b3b2e8ee805fedf4bfd16baf438c89332 (patch)
tree3dadff6a067e8d8bcbf837d8277dfac7749aef27 /plugins/infra/properties
parent7851474fe5f33de156c797942945a3e9c97cb0a8 (diff)
downloadorg.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.gz
org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.xz
org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.zip
Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*
Bug 499554 - Oxygen release version number moved to 3.0.0. Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007
Diffstat (limited to 'plugins/infra/properties')
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml20
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java10
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java24
4 files changed, 30 insertions, 30 deletions
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
index 9802cebba00..3441b89268d 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
@@ -19,13 +19,13 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
org.eclipse.xwt;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Eclipse-BuddyPolicy: dependent
Bundle-Activator: org.eclipse.papyrus.infra.properties.internal.ui.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml
index 42bea23053d..7b474182ce5 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.papyrus.infra-properties</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>org.eclipse.papyrus.infra.properties.ui</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus.infra-properties</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.properties.ui</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java
index 59eada00b74..78814eff5f8 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java
@@ -170,7 +170,7 @@ public abstract class AbstractModelElement implements ModelElement, IDataSourceL
* @param propertyPath
* The path of the property we want to observe
* @return
- * The new IObservable
+ * The new IObservable
*/
protected abstract IObservable doGetObservable(String propertyPath);
@@ -210,8 +210,8 @@ public abstract class AbstractModelElement implements ModelElement, IDataSourceL
return observableDisposeListener;
}
-
-
+
+
/**
* @see org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement#getNameResolutionHelper(java.lang.String)
*
@@ -232,13 +232,13 @@ public abstract class AbstractModelElement implements ModelElement, IDataSourceL
public IPapyrusConverter getPapyrusConverter(String propertyPath) {
return null;
}
-
+
/**
* Get the observables map by property path.
*
* @return the observables.
*
- * @since 1.3
+ * @since 2.0
*/
public Map<String, IObservable> getObservables() {
return observables;
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java
index c9147c1045d..d1bdce53b75 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java
@@ -36,7 +36,7 @@ public class PropertiesUtil {
/**
* @param source
* @return
- * the given String with the first letter capitalized
+ * the given String with the first letter capitalized
*/
public static String firstToUpper(String source) {
if (source.length() == 0) {
@@ -48,7 +48,7 @@ public class PropertiesUtil {
/**
* @param source
* @return
- * the given String with the first letter lowered
+ * the given String with the first letter lowered
*/
public static String firstToLower(String source) {
if (source.length() == 0) {
@@ -74,7 +74,7 @@ public class PropertiesUtil {
/**
* @param variableName
* @return
- * A formatted version of the given variable name
+ * A formatted version of the given variable name
*/
public static String getLabel(String variableName) {
// "CamelCase" to "Natural case"
@@ -109,7 +109,7 @@ public class PropertiesUtil {
* @param namespace
* @param value
* @return
- * True if they are equal
+ * True if they are equal
*/
public static boolean namespaceEquals(Namespace namespace, String value) {
if (namespace == null) {
@@ -125,7 +125,7 @@ public class PropertiesUtil {
* @param namespace
* @param name
* @return
- * True if they are equal
+ * True if they are equal
*/
public static boolean namespaceEqualsByName(Namespace namespace, String name) {
if (namespace == null) {
@@ -142,7 +142,7 @@ public class PropertiesUtil {
* @param namespace
* The namespace we want to prefix
* @return
- * The prefixed namespace
+ * The prefixed namespace
*/
public static String getPrefixedValue(Namespace namespace) {
String prefixedValue = ""; //$NON-NLS-1$
@@ -161,7 +161,7 @@ public class PropertiesUtil {
* @param namespace
* The namespace for which we want to get the qualified name
* @return
- * The namespace's qualified name
+ * The namespace's qualified name
*/
public static String getQualifiedName(Namespace namespace) {
if (namespace.getName() == null || namespace.getName().trim().equals("")) { //$NON-NLS-1$
@@ -180,7 +180,7 @@ public class PropertiesUtil {
* @param fromContextElements
* The collection of DataContextElements in which the method should look
* @return
- * The matching DataContextElement, or null if none was found
+ * The matching DataContextElement, or null if none was found
*/
public static DataContextElement getContextElementByQualifiedName(String qualifiedName, Collection<? extends DataContextElement> fromContextElements) {
int index = qualifiedName.indexOf(":"); //$NON-NLS-1$
@@ -212,7 +212,7 @@ public class PropertiesUtil {
* @param context
* The context for which we want to retrieve the list of dependencies
* @return
- * The list of Contexts on which the given context depends
+ * The list of Contexts on which the given context depends
*/
public static List<Context> getDependencies(Context context) {
List<Context> result = new LinkedList<Context>();
@@ -241,7 +241,7 @@ public class PropertiesUtil {
* @param source
* The collection of DataContextElements for which we want to retrieve all inherited elements
* @return
- * All DataContextElements inherited (Directly or indirectly) by at least one of the source
+ * All DataContextElements inherited (Directly or indirectly) by at least one of the source
* context elements
*/
public static Set<DataContextElement> getAllContextElements(Collection<DataContextElement> source) {
@@ -269,10 +269,10 @@ public class PropertiesUtil {
* @param maxCharPerLine
* The maximum number of characters per line in the resulting string
* @return
- * The split string
+ * The split string
*/
public static String resizeString(String string, int maxCharPerLine) {
- if (string == null || string.trim().length() <= maxCharPerLine) {
+ if (string.trim().length() <= maxCharPerLine) {
return string.trim();
}

Back to the top