11:21 a.m.
Author: scabanovich
Date: 2008-03-24 12:21:06 -0400 (Mon, 24 Mar 2008)
New Revision: 7089
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SignificanceMessageFactory.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SpecialWizardFactory.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/ProcessOut.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemsTree.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelFeatureFactory.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/WebProjectFactory.java
Log:
JBIDE-893
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SignificanceMessageFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SignificanceMessageFactory.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SignificanceMessageFactory.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -13,6 +13,7 @@
import java.util.Hashtable;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.ReplaceSignificanceMessageImpl;
@@ -49,8 +50,8 @@
private SignificanceMessage getImplInstance(String clsname) {
try {
return
(SignificanceMessage)ModelFeatureFactory.getInstance().createFeatureInstance(clsname);
- } catch (Exception t) {
- //ignore
+ } catch (ClassCastException t) {
+ ModelPlugin.getPluginLog().logError(t);
return defaultFactory;
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SpecialWizardFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SpecialWizardFactory.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/SpecialWizardFactory.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -17,7 +17,7 @@
public static SpecialWizard createSpecialWizard(String classname) {
try {
return
(SpecialWizard)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError(e);
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/UndoRedoHandler.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -10,20 +10,11 @@
******************************************************************************/
package org.jboss.tools.common.meta.action.impl.handlers;
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.Status;
-
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.plugin.ModelPlugin;
-import org.jboss.tools.common.model.util.*;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
public class UndoRedoHandler extends AbstractHandler {
- private String wizardname = (System.getProperty("testmodel") == null)
- ? "XXX.UndoRedoWizard"
- : "XXX.UndoRedoWizard";
public UndoRedoHandler() {}
@@ -33,27 +24,12 @@
public void executeHandler(XModelObject object, java.util.Properties p) throws
XModelException {
if(!isEnabled(object)) return;
- call(object.getModel());
+ //obsolete
}
public boolean isEnabled(XModelObject object) {
if(object == null) return false;
return object.getModel().getRoot().isModified();
-/// return object.getModel().getUndoManager().canUndo() ||
-/// object.getModel().getUndoManager().canRedo();
}
- private int call(XModel model) {
- try {
- Object o =
ModelFeatureFactory.getInstance().createFeatureInstance(wizardname);
- Class[] types = new Class[]{String.class, XModel.class};
- Method m = o.getClass().getMethod("showDialog", types);
- Object r = m.invoke(o, new Object[]{"Undo/Redo History", model});
- return ((Integer)r).intValue();
- } catch (Exception e) {
- ModelPlugin.getDefault().getLog().log(new Status(Status.ERROR, ModelPlugin.PLUGIN_ID,
Status.OK, "Model warning: Cannot load class " + wizardname + ". Or invoke
his method 'showDialog'",e));
- return -1;
- }
- }
-
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -234,12 +234,12 @@
if(loader == null || loader.length() == 0) {
adapter = new XAdapter();
} else {
+ String clsname = loader.indexOf('.') >= 0 ? loader :
XAttributeImpl.ATTRIBUTE_PREFIX + loader;
try {
- String clsname = loader.indexOf('.') >= 0 ? loader :
XAttributeImpl.ATTRIBUTE_PREFIX + loader;
if(loader.length() > 0) {
adapter =
(XAdapter)ModelFeatureFactory.getInstance().createFeatureInstance(clsname);
}
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError("XAttributeImpl:loadAdapter:"
+ e.getMessage());
}
}
@@ -295,14 +295,14 @@
if(loader.length() > 0) {
constraint =
(XAttributeConstraint)ModelFeatureFactory.getInstance().createFeatureInstance(clsname);
}
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError("XAttributeImpl:loadConstraint:" +
e.getMessage());
+ } catch (ClassCastException e) {
+ ModelPlugin.getPluginLog().logError("XAttributeImpl:loadConstraint:" +
e.getMessage(), e);
}
if(constraint == null) constraint = new XAttributeConstraintImpl();
if(element != null) try {
((XAttributeConstraintImpl)constraint).load(element);
} catch (Exception t) {
- ModelPlugin.getPluginLog().logError("XAttributeImpl:loadConstraint:" +
t.getMessage());
+ ModelPlugin.getPluginLog().logError("XAttributeImpl:loadConstraint:" +
t.getMessage(), t);
}
loader = null;
element = null;
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -454,7 +454,7 @@
if(adoptclass != null && adoptclass.length() > 0) {
entity.adopt =
(XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance(adoptclass);
}
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError("XModelEntityImpl:setAdoptManager:" +
e.getMessage());
entity.adopt = null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/ProcessOut.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/ProcessOut.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/ProcessOut.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -29,7 +29,7 @@
private boolean isAlive() {
try {
if(is != null && is.available() > 0) return true;
- } catch (Exception e) {
+ } catch (IOException e) {
return fireDead();
}
return p != null || fireDead();
@@ -39,7 +39,7 @@
synchronized(waitMonitor) {
try {
waitMonitor.notifyAll();
- } catch (Exception e) {
+ } catch (IllegalMonitorStateException e) {
//ignore
}
is = null;
@@ -57,7 +57,7 @@
if((av = is.available()) < 1) {
try {
Thread.sleep(200);
- } catch (Exception e) {
+ } catch (InterruptedException e) {
//ignore
}
continue;
@@ -66,7 +66,7 @@
av = is.read(b, 0, av);
}
writer.write(new String(b, 0, av));
- } catch (Exception e) {
+ } catch (IOException e) {
ModelPlugin.getPluginLog().logError(e);
}
}
@@ -80,7 +80,7 @@
if(!isAlive()) return;
try {
wait();
- } catch (Exception e) {
+ } catch (InterruptedException e) {
//ignore
}
}
@@ -90,10 +90,10 @@
public void run() {
try {
p.waitFor();
- } catch (Exception e) {
+ } catch (InterruptedException e) {
try {
p.exitValue();
- } catch (Exception e2) {
+ } catch (IllegalThreadStateException e2) {
run();
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -14,6 +14,7 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.meta.XMapping;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
public class XModelObjectIcon {
@@ -132,8 +133,8 @@
XModelObjectIcon.components.put(key, c);
}
imageComponent = c;
- } catch (Exception e) {
- ///XStudioPlugin.getDefault().getLog().log(new Status(Status.ERROR,
XStudioPlugin.PLUGIN_ID, Status.OK, "Cannot load icon " + keys[i] + "
" + v,e));
+ } catch (ClassCastException e) {
+ ModelPlugin.getPluginLog().logError(e);
XModelObjectIcon.components.remove(key);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemsTree.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemsTree.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemsTree.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -54,7 +54,7 @@
XFilteredTreeConstraint c = null;
try {
c =
(XFilteredTreeConstraint)ModelFeatureFactory.getInstance().createFeatureInstance(v);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError(e);
}
if(c == null) continue;
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -201,10 +201,12 @@
element.removeAttribute("NAME");
element.removeAttribute("EXTENSION");
return serialize(element, object);
- } catch (Exception e) {
+ } catch (IOException e) {
ModelPlugin.getPluginLog().logError(e);
- return null;
+ } catch (XModelException e) {
+ ModelPlugin.getPluginLog().logError(e);
}
+ return null;
}
protected String getDocName() {
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -186,7 +186,7 @@
private ServiceDialog createServiceDialog() {
try {
return
(ServiceDialog)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.common.model.ui.wizards.one.ServiceDialogImpl");
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError("Cannot create service dialog.");
}
return null;
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -65,19 +65,14 @@
if(contributors.containsKey(nature)) {
continue;
} else {
- try {
- Object watcher =
ModelFeatureFactory.getInstance().createFeatureInstance(CONTRIBUTORS[i][0]);
- if(watcher instanceof IWatcherContributor) {
- IWatcherContributor c = (IWatcherContributor)watcher;
- c.init(model);
- contributors.put(nature, c);
- } else
- if(ModelPlugin.isDebugEnabled()) {
- ModelPlugin.getPluginLog().logInfo("Class is not implemented
IWatcherContributor interface!");
- }
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError(e);
- }
+ Object watcher =
ModelFeatureFactory.getInstance().createFeatureInstance(CONTRIBUTORS[i][0]);
+ if(watcher instanceof IWatcherContributor) {
+ IWatcherContributor c = (IWatcherContributor)watcher;
+ c.init(model);
+ contributors.put(nature, c);
+ } else if(ModelPlugin.isDebugEnabled()) {
+ ModelPlugin.getPluginLog().logInfo("Class is not implemented
IWatcherContributor interface!");
+ }
}
} else {
contributors.remove(nature);
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelFeatureFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelFeatureFactory.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelFeatureFactory.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -85,6 +86,10 @@
instanceFailures.add(id);
if(!isActive()) return null;
ModelPlugin.getPluginLog().logError("Cannot create model feature instance "
+ id + ".", e);
+ } catch (InvalidRegistryObjectException e) {
+ instanceFailures.add(id);
+ if(!isActive()) return null;
+ ModelPlugin.getPluginLog().logError("Cannot create model feature instance "
+ id + ".", e);
}
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/WebProjectFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/WebProjectFactory.java 2008-03-24
16:20:28 UTC (rev 7088)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/WebProjectFactory.java 2008-03-24
16:21:06 UTC (rev 7089)
@@ -18,7 +18,7 @@
static {
try {
instance =
(IWebProjectFactory)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.WebProjectFactoryImpl");
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError(e);
}
}