Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2018-06-01 08:08:28 +0000
committerQuentin Le Menez2018-06-01 09:33:22 +0000
commitc39d2473c9c273c84cae8fd1208d49bb4c4a5695 (patch)
treee6983b779e98564c9d848272cb11bd2bedc34587 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus
parentef46a8f6f3acb600bc62e0eda549fba86f20eb4b (diff)
downloadorg.eclipse.papyrus-c39d2473c9c273c84cae8fd1208d49bb4c4a5695.tar.gz
org.eclipse.papyrus-c39d2473c9c273c84cae8fd1208d49bb4c4a5695.tar.xz
org.eclipse.papyrus-c39d2473c9c273c84cae8fd1208d49bb4c4a5695.zip
Bug 528895 - [Quality] Field modifier should follow convention order
- use correct order for field modifier - add missing header - replace C<>line by Celine Change-Id: I2608484da46215dbd65a1e85d47d0aa7706feb58 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java26
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java2
5 files changed, 18 insertions, 18 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java
index dcd068f11ef..caf3fdd7d34 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java
@@ -158,7 +158,7 @@ public abstract class CreateCallActionDialog extends CreateInvocationActionDialo
* @return true if there are parameters which will be mapped with output
* pins
*/
- abstract protected boolean hasOutParameters(EObject invokedObject);
+ protected abstract boolean hasOutParameters(EObject invokedObject);
/**
*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java
index 659fb22aac1..a2ef70827e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java
@@ -229,14 +229,14 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
*
* @return preference id
*/
- abstract protected String getSelectionIsDefaultPreference();
+ protected abstract String getSelectionIsDefaultPreference();
/**
* Get the id of the preference storing the last selected owner.
*
* @return preference id
*/
- abstract protected String getCreationDefaultOwnerPreference();
+ protected abstract String getCreationDefaultOwnerPreference();
/**
* Create the other needed sections. Subclasses can override this method.
@@ -677,7 +677,7 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
*
* @return array of EClasses
*/
- abstract protected EClass[] getPossibleInvokedTypes();
+ protected abstract EClass[] getPossibleInvokedTypes();
/**
* Get the possible parents of the new invoked element
@@ -686,7 +686,7 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
* the parent of the action
* @return collection of EObject possible owners
*/
- abstract protected Set<? extends EClassifier> getPossibleInvokedParents(EObject actionParent);
+ protected abstract Set<? extends EClassifier> getPossibleInvokedParents(EObject actionParent);
/**
* Whether element can be parent of the new invoked element
@@ -695,21 +695,21 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
* the parent to test
* @return true if parent is of an appropriate eclass
*/
- abstract protected boolean isPossibleInvokedParent(EObject parent);
+ protected abstract boolean isPossibleInvokedParent(EObject parent);
/**
* Get feature referencing the invoked object
*
* @return invocation feature
*/
- abstract protected EReference getInvocationFeature();
+ protected abstract EReference getInvocationFeature();
/**
* Get the image for the parent selection button
*
* @return image
*/
- abstract protected Image getParentImage();
+ protected abstract Image getParentImage();
/**
* Get the label to present the name of the invoked object
@@ -752,40 +752,40 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
*
* @return dialog title
*/
- abstract protected String getTitle();
+ protected abstract String getTitle();
/**
* Get the title of the invocation creation section
*
* @return section title
*/
- abstract protected String getInvocationCreationSectionTitle();
+ protected abstract String getInvocationCreationSectionTitle();
/**
* Get the help description of the invocation creation section
*
* @return section title
*/
- abstract protected String getInvocationCreationSectionHelp();
+ protected abstract String getInvocationCreationSectionHelp();
/**
* Get the title of the invocation selection section
*
* @return section title
*/
- abstract protected String getInvocationSelectionSectionTitle();
+ protected abstract String getInvocationSelectionSectionTitle();
/**
* Get the label to choose to select an existing element
*
* @return label
*/
- abstract protected String getSelectionLabel();
+ protected abstract String getSelectionLabel();
/**
* Get the label to choose to create a new element
*
* @return label
*/
- abstract protected String getCreationLabel();
+ protected abstract String getCreationLabel();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java
index 9478b9c28b4..33115d0676f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java
@@ -25,9 +25,9 @@ import org.eclipse.papyrus.uml.diagram.common.Activator;
*/
public class AutomatedModelCompletionPreferencesInitializer extends AbstractPreferenceInitializer {
- final static public String PIN_SYNCHRONIZATION = CustomMessages.AutomatedModelCompletionPreferencesInitializer_PinSynchronization;
+ public static final String PIN_SYNCHRONIZATION = CustomMessages.AutomatedModelCompletionPreferencesInitializer_PinSynchronization;
- final static public String NONE = CustomMessages.AutomatedModelCompletionPreferencesInitializer_None;
+ public static final String NONE = CustomMessages.AutomatedModelCompletionPreferencesInitializer_None;
/**
* Constructor.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java
index c76a05850af..52938ef5788 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java
@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.InvocationAction;
public class UMLCallActionTester extends PropertyTester {
/** Tester ID for UML Call Action nature */
- public final static String IS_CALL_ACTION = "isCallAction";
+ public static final String IS_CALL_ACTION = "isCallAction";
/** Default constructor */
public UMLCallActionTester() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java
index 5d78eca8fec..1450d27089a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java
@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Package;
public class UMLPackageSelectionTester extends PropertyTester {
/** Tester ID for UML Call Action nature */
- public final static String IS_PACKAGE = "isUMLPackage";
+ public static final String IS_PACKAGE = "isUMLPackage";
public UMLPackageSelectionTester() {
}

Back to the top