Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2016-02-02 15:48:59 +0000
committerVincent Lorenzo2016-02-02 15:52:46 +0000
commite49a56a73ed5fbbab0fe414f3fdfa7fef5f23c80 (patch)
tree3157fd7ae7beb75f3f1c577fd599039740cf3acc
parentc8e552daf57bf096d2a97313f306dfba0c299271 (diff)
downloadorg.eclipse.papyrus-e49a56a73ed5fbbab0fe414f3fdfa7fef5f23c80.tar.gz
org.eclipse.papyrus-e49a56a73ed5fbbab0fe414f3fdfa7fef5f23c80.tar.xz
org.eclipse.papyrus-e49a56a73ed5fbbab0fe414f3fdfa7fef5f23c80.zip
Bug 455060: [Tree Table] Papyrus must provide a way to configure the paste in the tree table https://bugs.eclipse.org/bugs/show_bug.cgi?id=455060
- rename action in plugin.xml - rename wizard - externalize the string of the wizard Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties3
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java7
4 files changed, 14 insertions, 4 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
index 3f5d715c510..f2207ec338a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
@@ -1441,7 +1441,7 @@
defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ConfigureCategoriesHandler"
description="Allows to configure the categories to display in the Tree Table"
id="org.eclipse.papyrus.infra.nattable.row.categories.command"
- name="Configure Categories">
+ name="Configure Categories And Paste">
</command>
<command
categoryId="org.eclipse.papyrus.infra.nattable.rows.command.category"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
index 37f5ae8af10..71115e9060e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
@@ -145,6 +145,12 @@ public class Messages extends NLS {
public static String ConfigurePastePage_fourthColumnTitle;
+ public static String ConfigureTableCategoriesWizard_ConfigureCategoriesAndPaste;
+
+ public static String ConfigureTableCategoriesWizard_Depth;
+
+ public static String ConfigureTableCategoriesWizard_DepthFilledByUser;
+
public static String DeleteNatTableContextAdvice_DestroyNattableCommand;
public static String EditConfiguration_ConfigurationFactoryNotFound;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
index 2be5059cc33..3a5a4145310 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
@@ -59,6 +59,9 @@ ConfigurePastePage_firstColumnTitle=Depth/Categorie
ConfigurePastePage_secondColumnTitle=Detached Mode
ConfigurePastePage_thirdColumnTitle=Pasted Element Id
ConfigurePastePage_fourthColumnTitle=Containment Feature
+ConfigureTableCategoriesWizard_ConfigureCategoriesAndPaste=Configure Categories & Paste
+ConfigureTableCategoriesWizard_Depth=depth {0}
+ConfigureTableCategoriesWizard_DepthFilledByUser=depth {0} (filled by user)
CompositeAxisManager_AddAxisCommand=Add Axis Command
DeleteNatTableContextAdvice_DestroyNattableCommand=Destroy NatTables command
EditConfiguration_ConfigurationFactoryNotFound=I can't find config factory for {0}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
index 860b905ef84..3be9f832d23 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
@@ -40,6 +40,7 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
@@ -111,7 +112,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard implemen
public ConfigureTableCategoriesWizard(final INattableModelManager manager) {
this.manager = manager;
this.natTable = (NatTable) ((IAdaptable) manager).getAdapter(NatTable.class);
- setWindowTitle("Configure Categories");
+ setWindowTitle(Messages.ConfigureTableCategoriesWizard_ConfigureCategoriesAndPaste);
this.initialSelection = createInitialSelection();
}
@@ -323,9 +324,9 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard implemen
Integer value = Integer.parseInt((String) element);
int depth = value;
if (depth == 0 && axis.getChildren().isEmpty()) {
- return NLS.bind("depth {0} (filled by user)", depth);
+ return NLS.bind(Messages.ConfigureTableCategoriesWizard_DepthFilledByUser, depth);
} else {
- return NLS.bind("depth {0}", depth);
+ return NLS.bind(Messages.ConfigureTableCategoriesWizard_Depth, depth);
}
}
}

Back to the top