Author: penyaskito
Date: 2008-08-23 07:05:57-0700
New Revision: 15604
Added:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel.java
- copied, changed from r15603,
/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java
Removed:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java
Log:
Solves Issue 5323: UMLExpressionModel descendants doesn't work. Solved by
creating a constructor with the target (we don't need to listen to target
changes, we rebuild the panel each time).
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
2008-08-23 07:05:57-0700
@@ -267,16 +267,14 @@
JComponent control = null;
if ("initialValue".equals(prop.getName())) {
- UMLExpressionModel3 model = new UMLInitialValueExpressionModel();
- // model.setTarget(target);
-
+ UMLExpressionModel model =
+ new UMLInitialValueExpressionModel(target);
p = new UMLExpressionPanel(model, prop.getName());
control = p;
}
if ("defaultValue".equals(prop.getName())) {
- UMLExpressionModel3 model = new UMLDefaultValueExpressionModel();
- // model.setTarget(target);
-
+ UMLExpressionModel model =
+ new UMLDefaultValueExpressionModel(target);
p = new UMLExpressionPanel(model, prop.getName());
control = p;
}
@@ -297,37 +295,37 @@
control = new JScrollPane(text);
}
else if ("condition".equals(prop.getName())) {
- UMLExpressionModel3 conditionModel =
- new UMLConditionExpressionModel();
+ UMLExpressionModel conditionModel =
+ new UMLConditionExpressionModel(target);
JTextArea conditionArea =
new UMLExpressionBodyField(conditionModel, true);
conditionArea.setRows(5);
control = new JScrollPane(conditionArea);
}
else if ("script".equals(prop.getName())) {
- UMLExpressionModel3 scriptModel =
- new UMLScriptExpressionModel();
+ UMLExpressionModel scriptModel =
+ new UMLScriptExpressionModel(target);
p = new UMLExpressionPanel(scriptModel, prop.getName());
control = p;
}
else if ("recurrence".equals(prop.getName())) {
- UMLExpressionModel3 recurrenceModel =
- new UMLRecurrenceExpressionModel();
+ UMLExpressionModel recurrenceModel =
+ new UMLRecurrenceExpressionModel(target);
p = new UMLExpressionPanel(recurrenceModel, prop.getName());
control = p;
}
else if ("expression".equals(prop.getName())) {
- UMLExpressionModel3 model = new UMLExpressionExpressionModel();
+ UMLExpressionModel model = new
UMLExpressionExpressionModel(target);
p = new UMLExpressionPanel(model, prop.getName());
control = p;
}
else if ("changeExpression".equals(prop.getName())) {
- UMLExpressionModel3 model = new UMLChangeExpressionModel();
+ UMLExpressionModel model = new UMLChangeExpressionModel(target);
p = new UMLExpressionPanel(model, prop.getName());
control = p;
}
else if ("when".equals(prop.getName())) {
- UMLExpressionModel3 model = new UMLTimeExpressionModel();
+ UMLExpressionModel model = new UMLTimeExpressionModel(target);
p = new UMLExpressionPanel(model, prop.getName());
control = p;
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java
2008-08-23 07:05:57-0700
@@ -34,9 +34,9 @@
/**
* The model for the boolean expression of a ChangeEvent.
*
- * @author michiel
+ * @author michiel, penyaskito
*/
-class UMLChangeExpressionModel extends UMLExpressionModel3 {
+class UMLChangeExpressionModel extends UMLExpressionModel {
private static final Logger LOG =
Logger.getLogger(UMLChangeExpressionModel.class);
@@ -47,8 +47,8 @@
* @param container the container of UML user interface components
* @param propertyName the name of the property
*/
- public UMLChangeExpressionModel() {
- super("changeExpression");
+ public UMLChangeExpressionModel(Object target) {
+ super(target, "changeExpression");
}
/*
@@ -78,20 +78,4 @@
LOG.debug("new boolean expression");
return Model.getDataTypesFactory().createBooleanExpression("", "");
}
-
- public void targetAdded(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetRemoved(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetSet(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java
2008-08-23 07:05:57-0700
@@ -33,10 +33,10 @@
/**
*
- * @author mkl
+ * @author mkl, penyaskito
*
*/
-public class UMLConditionExpressionModel extends UMLExpressionModel3 {
+public class UMLConditionExpressionModel extends UMLExpressionModel {
private static final Logger LOG =
Logger.getLogger(UMLConditionExpressionModel.class);
@@ -44,8 +44,8 @@
/**
* The constructor.
*/
- public UMLConditionExpressionModel() {
- super("condition");
+ public UMLConditionExpressionModel(Object target) {
+ super(target, "condition");
}
/*
@@ -75,26 +75,4 @@
LOG.debug("new boolean expression");
return Model.getDataTypesFactory().createBooleanExpression("", "");
}
-
-
- public void targetAdded(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetRemoved(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetSet(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void propertyChange(PropertyChangeEvent evt) {
- // TODO: Auto-generated method stub
-
- }
-
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
2008-08-23 07:05:57-0700
@@ -32,24 +32,15 @@
*
* @author penyaskito
*/
-class UMLDefaultValueExpressionModel extends UMLExpressionModel3 {
+class UMLDefaultValueExpressionModel extends UMLExpressionModel {
/**
* The constructor.
*
* @param propertyName the name of the property
*/
- public UMLDefaultValueExpressionModel() {
- super("default value");
- }
-
- /**
- * The constructor.
- *
- * @param propertyName the name of the property
- */
- public UMLDefaultValueExpressionModel(String propertyName) {
- super(propertyName);
+ public UMLDefaultValueExpressionModel(Object target) {
+ super(target, "default value");
}
/*
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionBodyField.java
2008-08-23 07:05:57-0700
@@ -39,7 +39,7 @@
*
*/
class UMLExpressionBodyField extends JTextArea
- implements DocumentListener, PropertyChangeListener {
+ implements DocumentListener {
/**
* Logger.
@@ -47,7 +47,7 @@
private static final Logger LOG =
Logger.getLogger(UMLExpressionBodyField.class);
- private UMLExpressionModel3 model;
+ private UMLExpressionModel model;
private boolean notifyModel;
/**
@@ -60,7 +60,7 @@
* Set to true to forward events to model. Only one of Language
* and Body fields should have this set to true.
*/
- public UMLExpressionBodyField(UMLExpressionModel3 expressionModel,
+ public UMLExpressionBodyField(UMLExpressionModel expressionModel,
boolean notify) {
model = expressionModel;
notifyModel = notify;
@@ -68,28 +68,7 @@
setToolTipText(Translator.localize("label.body.tooltip"));
setFont(LookAndFeelMgr.getInstance().getStandardFont());
setRows(2); // make it stretch vertically
- }
-
- /*
- * @see org.argouml.uml.ui.UMLUserInterfaceComponent#targetChanged()
- */
- public void targetChanged() {
- LOG.debug("UMLExpressionBodyField: targetChanged");
- if (notifyModel) {
- model.targetChanged();
- }
- update();
- }
-
- /*
- * @see org.argouml.uml.ui.UMLUserInterfaceComponent#targetReasserted()
- */
- public void targetReasserted() {
- }
-
- /* TODO: This does not work - no event arrives. */
- public void propertyChange(PropertyChangeEvent event) {
- LOG.debug("UMLExpressionBodyField: propertySet" + event);
+
update();
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java
2008-08-23 07:05:57-0700
@@ -32,16 +32,16 @@
* The model for a UML Expression that is obtained from its "parent"
* by getExpression - hence: Guard, ChangeEvent, TimeEvent.
*
- * @author Michiel
+ * @author Michiel, Penyaskito
*/
-public class UMLExpressionExpressionModel extends UMLExpressionModel3 {
+public class UMLExpressionExpressionModel extends UMLExpressionModel {
/**
* The constructor.
*
*/
- public UMLExpressionExpressionModel() {
- super("expression");
+ public UMLExpressionExpressionModel(Object target) {
+ super(target, "expression");
}
/*
@@ -66,20 +66,4 @@
public Object newExpression() {
return Model.getDataTypesFactory().createBooleanExpression("", "");
}
-
- public void targetAdded(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetRemoved(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetSet(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionLanguageField.java
2008-08-23 07:05:57-0700
@@ -36,7 +36,7 @@
class UMLExpressionLanguageField extends JTextField implements
DocumentListener {
- private UMLExpressionModel3 model;
+ private UMLExpressionModel model;
private boolean notifyModel;
/**
@@ -47,28 +47,15 @@
* @param n Only one of Language and Body fields should
* forward events to model
*/
- public UMLExpressionLanguageField(UMLExpressionModel3 m, boolean n) {
+ public UMLExpressionLanguageField(UMLExpressionModel m, boolean n) {
model = m;
notifyModel = n;
getDocument().addDocumentListener(this);
setToolTipText(Translator.localize("label.language.tooltip"));
setFont(LookAndFeelMgr.getInstance().getStandardFont());
- }
-
- /*
- * @see org.argouml.uml.ui.UMLUserInterfaceComponent#targetChanged()
- */
- public void targetChanged() {
- if (notifyModel) model.targetChanged();
update();
}
- /*
- * @see org.argouml.uml.ui.UMLUserInterfaceComponent#targetReasserted()
- */
- public void targetReasserted() {
- }
-
private void update() {
String oldText = getText();
String newText = model.getLanguage();
Copied:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel.java
(from r15603,
/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java)
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel.java?view=diff&rev=15604&p1=/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel.java
2008-08-23 07:05:57-0700
@@ -25,13 +25,13 @@
package org.argouml.core.propertypanels.ui;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetListener;
/**
- * @author mkl
- * @author penyaskito
+ * @author mkl, penyaskito
*/
-abstract class UMLExpressionModel3 implements TargetListener {
+abstract class UMLExpressionModel {
+
+ private Object target;
private String propertyName;
private Object/*MExpression*/ expression;
private boolean mustRefresh;
@@ -40,23 +40,19 @@
/**
* The constructor.
*
- * @param c the container of UML user interface components
+ * @param target the UML element
* @param name the name of the property
*/
- public UMLExpressionModel3(String name) {
+ public UMLExpressionModel(Object target, String name) {
+ this.target = target;
propertyName = name;
mustRefresh = true;
}
- /**
- * When the target is changed, we must refresh.
- */
- public void targetChanged() {
- mustRefresh = true;
- expression = null;
+ protected Object getTarget() {
+ return target;
}
-
-
+
/**
* @return the expression
*/
Removed:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionModel3.java?view=auto&rev=15603
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLExpressionPanel.java
2008-08-23 07:05:57-0700
@@ -37,11 +37,11 @@
*/
class UMLExpressionPanel extends JPanel {
- private final UMLExpressionModel3 model;
+ private final UMLExpressionModel model;
private final UMLExpressionLanguageField languageField;
private final UMLExpressionBodyField bodyField;
- public UMLExpressionPanel(UMLExpressionModel3 model, String title) {
+ public UMLExpressionPanel(UMLExpressionModel model, String title) {
super(new LabelledLayout());
TitledBorder border = new TitledBorder(title);
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLInitialValueExpressionModel.java
2008-08-23 07:05:57-0700
@@ -38,16 +38,12 @@
* @author penyaskito
*/
class UMLInitialValueExpressionModel
- extends UMLExpressionModel3 {
+ extends UMLExpressionModel {
- public UMLInitialValueExpressionModel() {
- super("initial value");
- }
-
- public UMLInitialValueExpressionModel(String name) {
- super(name);
+ public UMLInitialValueExpressionModel(Object target) {
+ super(target, "initial value");
}
/**
@@ -81,25 +77,4 @@
Object target = null; // TODO getTarget();
Model.getCoreHelper().setInitialValue(target, expression);
}
-
- public void targetAdded(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetRemoved(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetSet(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void propertyChange(PropertyChangeEvent evt) {
- // TODO: Auto-generated method stub
-
- }
-
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java
2008-08-23 07:05:57-0700
@@ -31,10 +31,10 @@
/**
*
- * @author mkl
+ * @author mkl, penyaskito
*
*/
-public class UMLRecurrenceExpressionModel extends UMLExpressionModel3 {
+public class UMLRecurrenceExpressionModel extends UMLExpressionModel {
private static final Logger LOG =
Logger.getLogger(UMLRecurrenceExpressionModel.class);
@@ -45,8 +45,8 @@
* @param container the container of UML user interface components
* @param propertyName the name of the property
*/
- public UMLRecurrenceExpressionModel() {
- super("recurrence");
+ public UMLRecurrenceExpressionModel(Object target) {
+ super(target, "recurrence");
}
/*
@@ -76,20 +76,4 @@
LOG.debug("new boolean expression");
return Model.getDataTypesFactory().createIterationExpression("", "");
}
-
- public void targetAdded(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetRemoved(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetSet(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLScriptExpressionModel.java
2008-08-23 07:05:57-0700
@@ -30,10 +30,10 @@
/**
*
- * @author mkl
+ * @author mkl, penyaskito
*
*/
-public class UMLScriptExpressionModel extends UMLExpressionModel3 {
+public class UMLScriptExpressionModel extends UMLExpressionModel {
/**
* The constructor.
@@ -41,16 +41,15 @@
* @param container the container of UML user interface components
* @param propertyName the name of the property
*/
- public UMLScriptExpressionModel() {
- super("script");
+ public UMLScriptExpressionModel(Object target) {
+ super(target, "script");
}
/*
* @see org.argouml.uml.ui.UMLExpressionModel2#getExpression()
*/
public Object getExpression() {
- return Model.getFacade().getScript(
- TargetManager.getInstance().getTarget());
+ return Model.getFacade().getScript(getTarget());
}
/*
@@ -58,7 +57,7 @@
*/
public void setExpression(Object expression) {
Model.getCommonBehaviorHelper()
- .setScript(TargetManager.getInstance().getTarget(), expression);
+ .setScript(getTarget(), expression);
}
/*
@@ -67,20 +66,4 @@
public Object newExpression() {
return Model.getDataTypesFactory().createActionExpression("", "");
}
-
- public void targetAdded(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetRemoved(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
- public void targetSet(TargetEvent e) {
- // TODO: Auto-generated method stub
-
- }
-
}
Modified:
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java?view=diff&rev=15604&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java&r1=15603&r2=15604
==============================================================================
---
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java
(original)
+++
branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java
2008-08-23 07:05:57-0700
@@ -34,7 +34,7 @@
* @author mkl
*
*/
-public class UMLTimeExpressionModel extends UMLExpressionModel3 {
+public class UMLTimeExpressionModel extends UMLExpressionModel {
private static final Logger LOG =
Logger.getLogger(UMLTimeExpressionModel.class);
@@ -43,8 +43,8 @@
* The constructor.
*
*/
- public UMLTimeExpressionModel() {
- super("when");
+ public UMLTimeExpressionModel(Object target) {
+ super(target, "when");
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
