Author: tfmorris Date: 2008-04-25 16:23:07-0700 New Revision: 14470 Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java
Log: Style cleanup Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java?view=diff&rev=14470&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java&r1=14469&r2=14470 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java 2008-04-25 16:23:07-0700 @@ -346,7 +346,7 @@ * @return newly created Signal */ private Signal buildSignalInt(Object element) { - Signal signal = (Signal) createSignal(); + Signal signal = createSignal(); Namespace ns = ((ModelElement) element).getNamespace(); signal.setNamespace(ns); return signal; Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=14470&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=14469&r2=14470 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java 2008-04-25 16:23:07-0700 @@ -92,7 +92,6 @@ import org.omg.uml.foundation.core.CorePackage; import org.omg.uml.foundation.core.DataType; import org.omg.uml.foundation.core.Dependency; -import org.omg.uml.foundation.core.Element; import org.omg.uml.foundation.core.ElementResidence; import org.omg.uml.foundation.core.Enumeration; import org.omg.uml.foundation.core.EnumerationLiteral; @@ -1626,9 +1625,8 @@ * publicly visible. */ private boolean isVisiblyOwned(ModelElement me, Namespace ns) { - return ((Namespace) ns).getOwnedElement().contains(me) - && VisibilityKindEnum.VK_PUBLIC.equals(((ModelElement) me) - .getVisibility()); + return ns.getOwnedElement().contains(me) + && VisibilityKindEnum.VK_PUBLIC.equals(me.getVisibility()); } private boolean isValidNamespace( Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java?view=diff&rev=14470&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&r1=14469&r2=14470 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java 2008-04-25 16:23:07-0700 @@ -104,8 +104,7 @@ // Create a new TagDefinition if none found Object rootModel = modelImpl.getModelManagementFactory().getRootModel(); - TagDefinition td = (TagDefinition) buildTagDefinition(tagName, null, - rootModel); + TagDefinition td = buildTagDefinition(tagName, null, rootModel); super.initialize(td); return td; Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=14470&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=14469&r2=14470 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java 2008-04-25 16:23:07-0700 @@ -261,7 +261,7 @@ if ("core".equals(packageName)) { packageName = "Core"; // optimization for frequent case } else { - packageName = (String) packageMap.get(packageName); + packageName = packageMap.get(packageName); if (packageName == null) { throw new IllegalArgumentException("Invalid class" + clazz); } @@ -295,8 +295,8 @@ */ public boolean isValidStereoType(Object theModelElement, Object theStereotype) { - return isValidStereotype(theModelElement, theStereotype); - } + return isValidStereotype(theModelElement, theStereotype); + } public boolean isValidStereotype(Object theModelElement, Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java?view=diff&rev=14470&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java&r1=14469&r2=14470 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java 2008-04-25 16:23:07-0700 @@ -32,11 +32,9 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import javax.jmi.model.ModelPackage; import javax.jmi.model.MofPackage; Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java?view=diff&rev=14470&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java&r1=14469&r2=14470 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java 2008-04-25 16:23:07-0700 @@ -25,7 +25,6 @@ package org.argouml.model.mdr; import org.apache.log4j.Logger; -import org.argouml.model.Model; import org.argouml.model.StateMachinesFactory; import org.omg.uml.behavioralelements.statemachines.CallEvent; import org.omg.uml.behavioralelements.statemachines.ChangeEvent; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
