Author: mvw
Date: 2010-08-09 00:56:08-0700
New Revision: 18634
Added:
trunk/src/argouml-core-transformer/src/org/argouml/i18n/
trunk/src/argouml-core-transformer/src/org/argouml/i18n/transform.properties (contents, props changed)
Modified:
trunk/src/argouml-core-transformer/src/org/argouml/transformer/EventTransformer.java
trunk/src/argouml-core-transformer/src/org/argouml/transformer/SimpleStateTransformer.java
trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerAction.java
trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerManager.java
Log:
Reinstate i18n for the Transformers.
Do not show the "Transform to" menu when it has no sub-menus.
Added: trunk/src/argouml-core-transformer/src/org/argouml/i18n/transform.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-transformer/src/org/argouml/i18n/transform.properties?view=markup&pathrev=18634
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-transformer/src/org/argouml/i18n/transform.properties 2010-08-09 00:56:08-0700
@@ -0,0 +1,21 @@
+# $Id$
+#******************************************************************************
+# Copyright (c) 2010 Contributors - see below
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# mvw
+#******************************************************************************
+#
+#
+#
+transform.button.new-callevent = Call Event
+transform.button.new-changeevent = Change Event
+transform.button.new-signalevent = Signal Event
+transform.button.new-timeevent = Time Event
+transform.menu.popup.transform = Transform to
+transform.button.new-compositestate = Composite State
+
Modified: trunk/src/argouml-core-transformer/src/org/argouml/transformer/EventTransformer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-transformer/src/org/argouml/transformer/EventTransformer.java?view=diff&pathrev=18634&r1=18633&r2=18634
==============================================================================
--- trunk/src/argouml-core-transformer/src/org/argouml/transformer/EventTransformer.java (original)
+++ trunk/src/argouml-core-transformer/src/org/argouml/transformer/EventTransformer.java 2010-08-09 00:56:08-0700
@@ -20,6 +20,7 @@
import javax.swing.Action;
+import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.model.Model;
@@ -132,7 +133,8 @@
* Constructor.
*/
EventToCallEvent(Project project, Object sourceModelElement) {
- super("Transform to Call Event", project, sourceModelElement);
+ super(Translator.localize("transform.button.new-callevent"),
+ project, sourceModelElement);
}
@Override
@@ -155,7 +157,8 @@
* Constructor.
*/
EventToSignalEvent(Project project, Object sourceModelElement) {
- super("Transform to Signal Event", project, sourceModelElement);
+ super(Translator.localize("transform.button.new-signalevent"),
+ project, sourceModelElement);
}
@Override
@@ -171,7 +174,8 @@
* Constructor.
*/
EventToChangeEvent(Project project, Object sourceModelElement) {
- super("Transform to Change Event", project, sourceModelElement);
+ super(Translator.localize("transform.button.new-changeevent"),
+ project, sourceModelElement);
}
@Override
@@ -189,7 +193,8 @@
* Constructor.
*/
EventToTimeEvent(Project project, Object sourceModelElement) {
- super("Transform to Time Event", project, sourceModelElement);
+ super(Translator.localize("transform.button.new-timeevent"),
+ project, sourceModelElement);
}
@Override
Modified: trunk/src/argouml-core-transformer/src/org/argouml/transformer/SimpleStateTransformer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-transformer/src/org/argouml/transformer/SimpleStateTransformer.java?view=diff&pathrev=18634&r1=18633&r2=18634
==============================================================================
--- trunk/src/argouml-core-transformer/src/org/argouml/transformer/SimpleStateTransformer.java (original)
+++ trunk/src/argouml-core-transformer/src/org/argouml/transformer/SimpleStateTransformer.java 2010-08-09 00:56:08-0700
@@ -23,6 +23,7 @@
import javax.swing.Action;
import org.apache.log4j.Logger;
+import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
@@ -77,7 +78,8 @@
class SimpleStateToCompositeState extends TransformerAction {
SimpleStateToCompositeState(Project project, Object sourceModelElement) {
- super("Transform to Composite State", project, sourceModelElement);
+ super(Translator.localize("transform.button.new-compositestate"),
+ project, sourceModelElement);
}
public void actionPerformed(ActionEvent e) {
Modified: trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerAction.java?view=diff&pathrev=18634&r1=18633&r2=18634
==============================================================================
--- trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerAction.java (original)
+++ trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerAction.java 2010-08-09 00:56:08-0700
@@ -14,10 +14,6 @@
package org.argouml.transformer;
-import javax.swing.Action;
-
-import org.argouml.application.helpers.ResourceLoaderWrapper;
-import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.ui.UndoableAction;
Modified: trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerManager.java?view=diff&pathrev=18634&r1=18633&r2=18634
==============================================================================
--- trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerManager.java (original)
+++ trunk/src/argouml-core-transformer/src/org/argouml/transformer/TransformerManager.java 2010-08-09 00:56:08-0700
@@ -13,12 +13,10 @@
package org.argouml.transformer;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import javax.swing.Action;
-
+import org.argouml.i18n.Translator;
import org.argouml.kernel.ActionList;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
@@ -66,13 +64,14 @@
public List createContextPopupActions(Object element) {
final Project p = ProjectManager.getManager().getCurrentProject();
- final ActionList result = new ActionList("Transform to");
+ final ActionList result = new ActionList(
+ Translator.localize("transform.menu.popup.transform"));
for (Transformer t : getTransformers()) {
if (t.canTransform(element)) {
result.addAll(t.actions(p, element));
}
}
- return result;
+ return result.size() > 0 ? result : null;
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2644549
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.