svn commit: r13679 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2007-10-11 01:43:20-0700
New Revision: 13679

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java

Log:
Style and annotations

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=13679&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=13678&r2=13679
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	2007-10-11 01:43:20-0700
@@ -116,7 +116,8 @@
 class CoreFactoryMDRImpl extends AbstractUmlModelFactoryMDR implements
         CoreFactory {
 
-    private static final Logger LOG = Logger.getLogger(CoreFactoryMDRImpl.class);
+    private static final Logger LOG = Logger
+            .getLogger(CoreFactoryMDRImpl.class);
     
     /**
      * The model implementation.
@@ -287,7 +288,8 @@
     }
 
 
-    public EnumerationLiteral buildEnumerationLiteral(String name, Object enumeration) {
+    public EnumerationLiteral buildEnumerationLiteral(String name,
+            Object enumeration) {
         EnumerationLiteral el = createEnumerationLiteral();
         el.setName(name);
         el.setEnumeration((Enumeration) enumeration);
@@ -491,7 +493,8 @@
     }
 
 
-    public UmlAssociation buildAssociation(Object classifier1, Object classifier2) {
+    public UmlAssociation buildAssociation(Object classifier1,
+            Object classifier2) {
         Classifier c1 = (Classifier) classifier1;
         Classifier c2 = (Classifier) classifier2;
         return buildAssociation(c1, true, AggregationKindEnum.AK_NONE, c2,
@@ -524,9 +527,9 @@
     }
 
 
-    public AssociationEnd buildAssociationEnd(Object assoc, String name, Object type,
-            Object multi, Object stereo, boolean navigable, Object order,
-            Object aggregation, Object scope, Object changeable,
+    public AssociationEnd buildAssociationEnd(Object assoc, String name,
+            Object type, Object multi, Object stereo, boolean navigable,
+            Object order, Object aggregation, Object scope, Object changeable,
             Object visibility) {
         // wellformednessrules and preconditions
         if (assoc == null || !(assoc instanceof UmlAssociation) || type == null
@@ -805,7 +808,7 @@
 
     public UmlClass buildClass() {
         ModelCommand command = new ModelCommand() {
-            UmlClass cl;
+            private UmlClass cl;
             public UmlClass execute() {
                 cl = createClass();
                 cl.setName("");
@@ -1013,7 +1016,7 @@
         return per;
     }
 
-
+    @Deprecated
     public Generalization buildGeneralization(Object child, Object parent, 
             String name) {
         if (child == null || parent == null
@@ -1127,7 +1130,8 @@
     }
     
 
-    public Operation buildOperation2(Object cls, Object returnType, String name) {
+    public Operation buildOperation2(Object cls, Object returnType, 
+            String name) {
         Operation oper = buildOperation(cls, returnType);
         if (oper != null) {
             oper.setName(name);
@@ -1172,7 +1176,8 @@
     }
 
 
-    public Abstraction buildRealization(Object clnt, Object spplr, Object model) {
+    public Abstraction buildRealization(Object clnt, Object spplr, 
+            Object model) {
         ModelElement client = (ModelElement) clnt;
         ModelElement supplier = (ModelElement) spplr;
         if (client == null || supplier == null || client.getNamespace() == null
@@ -1277,7 +1282,8 @@
     }
     
 
-    public Binding buildBinding(Object client, Object supplier, List arguments) {
+    public Binding buildBinding(Object client, Object supplier, 
+            List arguments) {
         Collection<Dependency> clientDeps = ((ModelElement) client)
                 .getClientDependency();
         for (Dependency dep : clientDeps) {

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=13679&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=13678&r2=13679
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	2007-10-11 01:43:20-0700
@@ -2418,7 +2418,7 @@
                 + expr);
     }
 
-    
+    @Deprecated
     public void setChangeability(Object handle, Object ck) {
         if (ck == null || ck instanceof ChangeableKind) {
             ChangeableKind changeableKind = (ChangeableKind) ck;
@@ -2782,6 +2782,7 @@
     }
 
 
+    @Deprecated
     public void setOwnerScope(Object handle, Object os) {
         if (handle instanceof Feature
                 && (os == null || os instanceof ScopeKind)) {
@@ -2964,6 +2965,7 @@
     }
 
 
+    @Deprecated
     public void setTaggedValue(Object handle, String tag, String value) {
         if (handle instanceof ModelElement) {
             TaggedValue tv =
@@ -2984,12 +2986,14 @@
     }
 
 
+    @Deprecated
     public void setTaggedValues(Object handle, Collection taggedValues) {
         Model.getExtensionMechanismsHelper().setTaggedValue(handle,
                 taggedValues);
     }
 
 
+    @Deprecated
     public void setTargetScope(Object handle, Object scopeKind) {
         if (scopeKind instanceof ScopeKind) {
             if (handle instanceof StructuralFeature) {