Author: maurelio1234
Date: 2008-07-31 02:41:29-0700
New Revision: 15418
Modified:
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java
branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java
Log:
removing dependency in Agency to org.argouml.uml.cognitive.critics
fixing bug in ProfileManagerImpl (NullPointer for profiles without model)
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Agency.java 2008-07-31 02:41:29-0700
@@ -35,7 +35,6 @@
import java.util.Vector;
import org.apache.log4j.Logger;
-import org.argouml.uml.cognitive.critics.CrUML;
/**
* Agency manages Critics. Since classes are not really first class
@@ -243,26 +242,13 @@
*
* @param cr the critic to register
*/
- public static void register(CrUML cr) {
+ public static void register(Critic cr) {
Set<Object> metas = cr.getCriticizedMetatypes();
for (Object meta : metas) {
register(cr, meta);
}
}
- /**
- * Register a compound critic in the global table of critics that have been
- * loaded.
- *
- * @param cr the critic to register
- */
- public static void register(CompoundCritic cr) {
- Set<Object> metas = cr.getCriticizedMetatypes();
- for (Object meta : metas) {
- register(cr, meta);
- }
- }
-
private static Hashtable<Class, Collection<Critic>> cachedCritics =
new Hashtable<Class, Collection<Critic>>();
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java 2008-07-31 02:41:29-0700
@@ -300,14 +300,14 @@
throw new UnsupportedOperationException();
}
- /**
+ /*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
*/
public Set<Object> getCriticizedMetatypes() {
Set<Object> ret = new HashSet<Object>();
for (Critic cr : this.critics) {
if (cr instanceof CrUML) {
- ret.addAll(((CrUML)cr).getCriticizedMetatypes());
+ ret.addAll(((CrUML) cr).getCriticizedMetatypes());
}
}
return ret;
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/cognitive/Critic.java 2008-07-31 02:41:29-0700
@@ -26,9 +26,11 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Observable;
+import java.util.Set;
import javax.swing.Icon;
@@ -1018,6 +1020,18 @@
args = h;
}
+
+ /**
+ * Get the design materials to be criticized by this critic, no
+ * metatype is assumed by default.
+ *
+ * @return the metatypes
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ return ret;
+ }
+
////////////////////////////////////////////////////////////////
// design feedback
@@ -1065,6 +1079,7 @@
public void fixIt(ToDoItem item, Object arg) {
}
+
/*
* Reply a string that describes this Critic. Identical to getCriticName()
*
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/Profile.java 2008-07-31 02:41:29-0700
@@ -152,9 +152,9 @@
}
/**
- * @param critics The critics to set.
+ * @param criticsSet The critics to set.
*/
- protected void setCritics(Set<CrUML> critics) {
- this.critics = critics;
+ protected void setCritics(Set<CrUML> criticsSet) {
+ this.critics = criticsSet;
}
}
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/profile/internal/ProfileManagerImpl.java 2008-07-31 02:41:29-0700
@@ -150,7 +150,7 @@
disableConfigurationUpdate = true;
StringTokenizer tokenizer = new StringTokenizer(Configuration
- .getString(KEY_DEFAULT_DIRECTORIES), DIRECTORY_SEPARATOR, false);
+ .getString(KEY_DEFAULT_DIRECTORIES), DIRECTORY_SEPARATOR, false);
while (tokenizer.hasMoreTokens()) {
searchDirectories.add(tokenizer.nextToken());
@@ -296,7 +296,7 @@
if (p instanceof UserDefinedProfile) {
UserDefinedProfile udp = (UserDefinedProfile) p;
- if (udp.getModelFile().equals(file)) {
+ if (file.equals(udp.getModelFile())) {
return udp;
}
}
@@ -308,7 +308,7 @@
return profileUML;
}
- /**
+ /*
* @see org.argouml.profile.ProfileManager#lookForRegisteredProfile(java.lang.String)
*/
public Profile lookForRegisteredProfile(String value) {
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/ui/ProjectSettingsTabProfile.java 2008-07-31 02:41:29-0700
@@ -256,7 +256,7 @@
if (!dependents.isEmpty()) {
String message = Translator.localize(
"tab.profiles.confirmdeletewithdependencies",
- new Object[] { dependents });
+ new Object[] {dependents});
String title = Translator
.localize("tab.profiles.confirmdeletewithdependencies.title");
remove = (JOptionPane.showConfirmDialog(this, message,
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java 2008-07-31 02:41:29-0700
@@ -70,7 +70,7 @@
return problem;
}
- /**
+ /*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
*/
public Set<Object> getCriticizedMetatypes() {
Modified: branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java?view=diff&rev=15418&p1=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java&p2=branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java&r1=15417&r2=15418
==============================================================================
--- branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java (original)
+++ branches/gsoc2008/work_issue5029_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUML.java 2008-07-31 02:41:29-0700
@@ -268,17 +268,6 @@
}
/**
- * Get the metatypes to be criticized by this critic, no
- * metatype is assumed by default.
- *
- * @return the metatypes
- */
- public Set<Object> getCriticizedMetatypes() {
- Set<Object> ret = new HashSet<Object>();
- return ret;
- }
-
- /**
* The UID.
*/
private static final long serialVersionUID = 1785043010468681602L;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.