Author: mvw
Date: 2007-08-21 23:55:46-0700
New Revision: 13430
Modified:
trunk/src_new/org/argouml/application/Main.java
trunk/src_new/org/argouml/application/api/Argo.java
trunk/src_new/org/argouml/ui/SettingsTabPreferences.java
Log:
Removing the preloading of classes.
Modified: trunk/src_new/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/Main.java?view=diff&rev=13430&p1=trunk/src_new/org/argouml/application/Main.java&p2=trunk/src_new/org/argouml/application/Main.java&r1=13429&r2=13430
==============================================================================
--- trunk/src_new/org/argouml/application/Main.java (original)
+++ trunk/src_new/org/argouml/application/Main.java 2007-08-21 23:55:46-0700
@@ -169,8 +169,6 @@
"ArgoUML");
boolean doSplash = Configuration.getBoolean(Argo.KEY_SPLASH, true);
- // TODO: document use. Ref. 1/2
- boolean preload = Configuration.getBoolean(Argo.KEY_PRELOAD, true);
boolean reloadRecent =
Configuration.getBoolean(Argo.KEY_RELOAD_RECENT_PROJECT, false);
boolean batch = false;
@@ -198,8 +196,6 @@
System.exit(0);
} else if (args[i].equalsIgnoreCase("-nosplash")) {
doSplash = false;
- } else if (args[i].equalsIgnoreCase("-nopreload")) {
- preload = false;
} else if (args[i].equalsIgnoreCase("-norecentfile")) {
reloadRecent = false;
} else if (args[i].equalsIgnoreCase("-command")
@@ -390,11 +386,9 @@
Runnable startCritics = new StartCritics();
Main.addPostLoadAction(startCritics);
- st.mark("start preloader");
- if (preload) {
- Runnable preloader = new PreloadClasses();
- Main.addPostLoadAction(preloader);
- }
+ st.mark("start loading modules");
+ Runnable moduleLoader = new LoadModules();
+ Main.addPostLoadAction(moduleLoader);
PostLoad pl = new PostLoad(postLoadActions);
Thread postLoadThead = new Thread(pl);
@@ -482,7 +476,6 @@
System.err.println(" -help display this information");
LookAndFeelMgr.getInstance().printThemeArgs();
System.err.println(" -nosplash don't display logo at startup");
- System.err.println(" -nopreload don't preload common classes");
System.err.println(" -norecentfile don't reload last saved file");
System.err.println(" -command <arg> command to perform on startup");
System.err.println(" -batch don't start GUI");
@@ -539,7 +532,8 @@
/**
- * Add an element to the PostLoadActions list.
+ * Add an element to the PostLoadActions list,
+ * which contains actions that are run after ArgoUML has started.
*
* @param r a "Runnable" action
*/
@@ -856,13 +850,13 @@
} /* end class PostLoad */
/**
- * Class to do preloading of a lot of classes.
+ * Class to load modules.
*/
-class PreloadClasses implements Runnable {
+class LoadModules implements Runnable {
/**
* Logger.
*/
- private static final Logger LOG = Logger.getLogger(PreloadClasses.class);
+ private static final Logger LOG = Logger.getLogger(LoadModules.class);
private static final String[] OPTIONAL_INTERNAL_MODULES = {
@@ -892,58 +886,7 @@
public void run() {
new JavaImport().init();
huntForInternalModules();
-
- Class c = null;
- LOG.info("preloading...");
-
- // Alphabetic order
- c = org.argouml.kernel.DelayedChangeNotify.class;
- c = org.argouml.cognitive.critics.Wizard.class;
- c = org.argouml.ui.Clarifier.class;
- c = org.argouml.ui.StylePanelFigNodeModelElement.class;
- c = org.argouml.uml.GenCompositeClasses.class;
- c = org.argouml.uml.cognitive.critics.ClAttributeCompartment.class;
- c = org.argouml.uml.cognitive.critics.ClClassName.class;
- c = org.argouml.uml.cognitive.critics.ClOperationCompartment.class;
- c = org.argouml.uml.diagram.static_structure.ui.FigClass.class;
- c = org.argouml.uml.diagram.static_structure.ui.FigInterface.class;
- c = org.argouml.uml.diagram.static_structure.ui.FigPackage.class;
- c = org.argouml.uml.diagram.static_structure.ui.SelectionClass.class;
- c =
- org.argouml.uml.diagram.static_structure.ui
- .StylePanelFigClass.class;
- c =
- org.argouml.uml.diagram.static_structure.ui
- .StylePanelFigInterface.class;
- c = org.argouml.uml.diagram.ui.FigAssociation.class;
- c = org.argouml.uml.diagram.ui.FigGeneralization.class;
- c = org.argouml.uml.diagram.ui.FigRealization.class;
- c = org.tigris.gef.base.ModeCreateEdgeAndNode.class;
- c = org.argouml.uml.diagram.ui.SPFigEdgeModelElement.class;
- c = org.argouml.uml.ui.foundation.core.PropPanelAssociation.class;
- c = org.argouml.uml.ui.foundation.core.PropPanelClass.class;
- c = org.argouml.uml.ui.foundation.core.PropPanelInterface.class;
-
- c = org.tigris.gef.base.Geometry.class;
- c = org.tigris.gef.base.ModeModify.class;
- c = org.tigris.gef.base.ModePlace.class;
- c = org.tigris.gef.base.PathConvPercentPlusConst.class;
- c = org.tigris.gef.base.SelectionResize.class;
- c = org.tigris.gef.event.ModeChangeEvent.class;
- c = org.tigris.gef.graph.GraphEdgeHooks.class;
- c = org.tigris.gef.graph.GraphEvent.class;
- c = org.tigris.gef.graph.presentation.NetEdge.class;
- c = org.tigris.gef.presentation.ArrowHeadNone.class;
- c = org.tigris.gef.presentation.FigPoly.class;
- c = org.tigris.gef.ui.ColorRenderer.class;
- c = org.tigris.gef.ui.Swatch.class;
- c = org.tigris.gef.util.EnumerationEmpty.class;
- c = org.tigris.gef.util.EnumerationSingle.class;
-
- if (c == null) {
- LOG.error(" preloading error");
- }
- LOG.info("preloading done");
+ LOG.info("Module loading done");
}
-} /* end class PreloadClasses */
+} /* end class LoadModules */
Modified: trunk/src_new/org/argouml/application/api/Argo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/api/Argo.java?view=diff&rev=13430&p1=trunk/src_new/org/argouml/application/api/Argo.java&p2=trunk/src_new/org/argouml/application/api/Argo.java&r1=13429&r2=13430
==============================================================================
--- trunk/src_new/org/argouml/application/api/Argo.java (original)
+++ trunk/src_new/org/argouml/application/api/Argo.java 2007-08-21 23:55:46-0700
@@ -72,12 +72,6 @@
Configuration.makeKey("init", "splash");
/**
- * Key to preload classes.
- */
- public static final ConfigurationKey KEY_PRELOAD =
- Configuration.makeKey("init", "preload");
-
- /**
* Key to report usage statistics.
*/
public static final ConfigurationKey KEY_EDEM =
Modified: trunk/src_new/org/argouml/ui/SettingsTabPreferences.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SettingsTabPreferences.java?view=diff&rev=13430&p1=trunk/src_new/org/argouml/ui/SettingsTabPreferences.java&p2=trunk/src_new/org/argouml/ui/SettingsTabPreferences.java&r1=13429&r2=13430
==============================================================================
--- trunk/src_new/org/argouml/ui/SettingsTabPreferences.java (original)
+++ trunk/src_new/org/argouml/ui/SettingsTabPreferences.java 2007-08-21 23:55:46-0700
@@ -52,7 +52,6 @@
implements GUISettingsTabInterface {
private JCheckBox chkSplash;
- private JCheckBox chkPreload;
private JCheckBox chkReloadRecent;
private JCheckBox chkStripDiagrams;
private JTextField defaultProfile;
@@ -80,11 +79,6 @@
top.add(chkSplash, checkConstraints);
checkConstraints.gridy++;
- JCheckBox j1 = new JCheckBox(Translator.localize("label.preload"));
- chkPreload = j1;
- top.add(chkPreload, checkConstraints);
-
- checkConstraints.gridy++;
JCheckBox j2 =
new JCheckBox(Translator.localize("label.reload-recent"));
chkReloadRecent = j2;
@@ -114,8 +108,6 @@
*/
public void handleSettingsTabRefresh() {
chkSplash.setSelected(Configuration.getBoolean(Argo.KEY_SPLASH, true));
- chkPreload.setSelected(Configuration.getBoolean(Argo.KEY_PRELOAD,
- true));
chkReloadRecent.setSelected(
Configuration.getBoolean(Argo.KEY_RELOAD_RECENT_PROJECT,
false));
@@ -131,7 +123,6 @@
*/
public void handleSettingsTabSave() {
Configuration.setBoolean(Argo.KEY_SPLASH, chkSplash.isSelected());
- Configuration.setBoolean(Argo.KEY_PRELOAD, chkPreload.isSelected());
Configuration.setBoolean(Argo.KEY_RELOAD_RECENT_PROJECT,
chkReloadRecent.isSelected());
Configuration.setBoolean(Argo.KEY_XMI_STRIP_DIAGRAMS,
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.