svn commit: r17564 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui
Michiel van der Wulp <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mvw
Date: 2009-11-30 07:12:09-0800
New Revision: 17564
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java
Log:
Getting rid of the direct use of the TargetManager.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java?view=diff&pathrev=17564&r1=17563&r2=17564
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLChangeExpressionModel.java 2009-11-30 07:12:09-0800
@@ -26,7 +26,6 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
/**
* The model for the boolean expression of a ChangeEvent.
@@ -53,14 +52,14 @@
*/
public Object getExpression() {
return Model.getFacade().getChangeExpression(
- TargetManager.getInstance().getTarget());
+ getTarget());
}
/*
* @see org.argouml.uml.ui.UMLExpressionModel2#setExpression(java.lang.Object)
*/
public void setExpression(Object expression) {
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
if (target == null) {
throw new IllegalStateException("There is no target");
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java?view=diff&pathrev=17564&r1=17563&r2=17564
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConditionExpressionModel.java 2009-11-30 07:12:09-0800
@@ -26,7 +26,6 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
/**
*
@@ -49,15 +48,14 @@
* @see org.argouml.uml.ui.UMLExpressionModel2#getExpression()
*/
public Object getExpression() {
- return Model.getFacade().getCondition(
- TargetManager.getInstance().getTarget());
+ return Model.getFacade().getCondition(getTarget());
}
/*
* @see org.argouml.uml.ui.UMLExpressionModel2#setExpression(java.lang.Object)
*/
public void setExpression(Object expression) {
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
if (target == null) {
throw new IllegalStateException("There is no target");
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java?view=diff&pathrev=17564&r1=17563&r2=17564
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java 2009-11-30 07:12:09-0800
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
/**
* The model for the expression for a default value of a Parameter.
@@ -47,7 +46,7 @@
* @see org.argouml.uml.ui.UMLExpressionModel2#getExpression()
*/
public Object getExpression() {
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
if (target == null) {
return null;
}
@@ -58,7 +57,7 @@
* @see org.argouml.uml.ui.UMLExpressionModel2#setExpression(java.lang.Object)
*/
public void setExpression(Object expression) {
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
if (target != null) {
Model.getCoreHelper().setDefaultValue(target, null);
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java?view=diff&pathrev=17564&r1=17563&r2=17564
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExpressionExpressionModel.java 2009-11-30 07:12:09-0800
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
/**
* The model for a UML Expression that is obtained from its "parent"
@@ -47,8 +46,7 @@
* @see org.argouml.uml.ui.UMLExpressionModel2#getExpression()
*/
public Object getExpression() {
- return Model.getFacade().getExpression(
- TargetManager.getInstance().getTarget());
+ return Model.getFacade().getExpression(getTarget());
}
/*
@@ -56,7 +54,7 @@
*/
public void setExpression(Object expr) {
assert (expr == null) || Model.getFacade().isAExpression(expr);
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
assert Model.getFacade().isAGuard(target)
|| Model.getFacade().isAChangeEvent(target);
Model.getStateMachinesHelper().setExpression(target, null);
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java?view=diff&pathrev=17564&r1=17563&r2=17564
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLRecurrenceExpressionModel.java 2009-11-30 07:12:09-0800
@@ -26,7 +26,6 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
/**
*
@@ -52,15 +51,14 @@
* @see org.argouml.uml.ui.UMLExpressionModel2#getExpression()
*/
public Object getExpression() {
- return Model.getFacade().getRecurrence(
- TargetManager.getInstance().getTarget());
+ return Model.getFacade().getRecurrence(getTarget());
}
/*
* @see org.argouml.uml.ui.UMLExpressionModel2#setExpression(java.lang.Object)
*/
public void setExpression(Object expression) {
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
if (target == null) {
throw new IllegalStateException("There is no target");
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java?view=diff&pathrev=17564&r1=17563&r2=17564
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTimeExpressionModel.java 2009-11-30 07:12:09-0800
@@ -26,7 +26,6 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
/**
*
@@ -50,15 +49,14 @@
* @see org.argouml.uml.ui.UMLExpressionModel2#getExpression()
*/
public Object getExpression() {
- return Model.getFacade().getWhen(
- TargetManager.getInstance().getTarget());
+ return Model.getFacade().getWhen(getTarget());
}
/*
* @see org.argouml.uml.ui.UMLExpressionModel2#setExpression(java.lang.Object)
*/
public void setExpression(Object expression) {
- Object target = TargetManager.getInstance().getTarget();
+ Object target = getTarget();
if (target == null) {
throw new IllegalStateException("There is no target");
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2425516
To unsubscribe from this discussion, e-mail: [[email protected]].