svn commit: r18022 - trunk/src/argouml-app/src/org/argouml: profile/internal/ui uml/diagram/ui uml/ui uml/ui/foundation/core
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2010-02-16 00:24:42-0800
New Revision: 18022
Modified:
trunk/src/argouml-app/src/org/argouml/profile/internal/ui/ProfilePropPanelFactory.java
trunk/src/argouml-app/src/org/argouml/profile/internal/ui/PropPanelCritic.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
trunk/src/argouml-app/src/org/argouml/uml/ui/TabDocumentation.java
trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Log:
Stop PropPanelCritic from listening to target change
Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ui/ProfilePropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ui/ProfilePropPanelFactory.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ui/ProfilePropPanelFactory.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ui/ProfilePropPanelFactory.java 2010-02-16 00:24:42-0800
@@ -51,7 +51,7 @@
public PropPanel createPropPanel(Object object) {
if (object instanceof CrUML) {
- return new PropPanelCritic();
+ return new PropPanelCritic(object);
} else {
return null;
}
Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ui/PropPanelCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ui/PropPanelCritic.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ui/PropPanelCritic.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ui/PropPanelCritic.java 2010-02-16 00:24:42-0800
@@ -77,7 +77,7 @@
/**
* Constructor
*/
- public PropPanelCritic() {
+ public PropPanelCritic(Object target) {
super("", (ImageIcon) null);
criticClass = new JTextField();
@@ -113,26 +113,20 @@
knowledgeType = new JTextField();
addField("label.knowledge_types", knowledgeType);
knowledgeType.setEditable(false);
+
+ setCritic((Critic) target);
}
/**
* @param t the target
* @see org.argouml.uml.ui.PropPanel#setTarget(java.lang.Object)
*/
- public void setTarget(Object t) {
-
+ private void setCritic(Critic c) {
final String targetType =
- getTarget().getClass().getCanonicalName();
+ c.getClass().getCanonicalName();
- if (!(t instanceof Critic)) {
- throw new IllegalArgumentException("A Critic is expected as the target, a " + targetType + " was received");
- }
-
- super.setTarget(t);
-
criticClass.setText(targetType);
- Critic c = (Critic) getTarget();
name.setText(c.getCriticName());
headline.setText(c.getHeadline());
description.setText(c.getDescriptionTemplate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java 2010-02-16 00:24:42-0800
@@ -52,6 +52,7 @@
import javax.swing.JTextField;
import org.argouml.i18n.Translator;
+import org.argouml.ui.TabModelTarget;
import org.argouml.ui.UndoableAction;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
@@ -69,7 +70,7 @@
* This class represents the properties panel for a Diagram.
*
*/
-public class PropPanelDiagram extends PropPanel {
+public class PropPanelDiagram extends PropPanel implements TabModelTarget {
private JComboBox homeModelSelector;
private UMLDiagramHomeModelComboBoxModel homeModelComboBoxModel =
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java 2010-02-16 00:24:42-0800
@@ -97,7 +97,7 @@
* hierarchy that matches the UML metamodel.
*/
public abstract class PropPanel extends AbstractArgoJPanel implements
- TabModelTarget, UMLUserInterfaceContainer, ComponentListener {
+ UMLUserInterfaceContainer, ComponentListener {
/**
* Logger.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabDocumentation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabDocumentation.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabDocumentation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabDocumentation.java 2010-02-16 00:24:42-0800
@@ -50,6 +50,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.swingext.UpArrowIcon;
+import org.argouml.ui.TabModelTarget;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.Horizontal;
import org.tigris.swidgets.Vertical;
@@ -85,7 +86,7 @@
* UMLModelElementTaggedValueDocument is used to access the tagged values of an
* MModelElement.
*/
-public class TabDocumentation extends PropPanel {
+public class TabDocumentation extends PropPanel implements TabModelTarget {
private static String orientation = Configuration.getString(Configuration
.makeKey("layout", "tabdocumentation"));
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java 2010-02-16 00:24:42-0800
@@ -62,6 +62,7 @@
import org.argouml.model.Model;
import org.argouml.swingext.SpacerPanel;
import org.argouml.swingext.UpArrowIcon;
+import org.argouml.ui.TabModelTarget;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.ui.foundation.core.UMLModelElementStereotypeListModel;
@@ -76,7 +77,7 @@
* The code for the 2 lists and the buttons to move items
* from one side to the other is based on the PerspectiveConfigurator class.
*/
-public class TabStereotype extends PropPanel {
+public class TabStereotype extends PropPanel implements TabModelTarget {
/**
* Insets in pixels.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java?view=diff&pathrev=18022&r1=18021&r2=18022
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java 2010-02-16 00:24:42-0800
@@ -56,6 +56,7 @@
import org.argouml.kernel.UmlModelMutator;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
+import org.argouml.ui.TabModelTarget;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.PropPanel;
import org.argouml.uml.ui.ScrollList;
@@ -73,7 +74,7 @@
* subsystem.
*/
@Deprecated
-public abstract class PropPanelModelElement extends PropPanel {
+public abstract class PropPanelModelElement extends PropPanel implements TabModelTarget {
private JComboBox namespaceSelector;
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2447986
To unsubscribe from this discussion, e-mail: [[email protected]].