[jbosstools-commits] JBoss Tools SVN: r7117 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: meta/constraint/impl and 8 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Mar 25 12:26:40 EDT 2008
Author: scabanovich
Date: 2008-03-25 12:26:40 -0400 (Tue, 25 Mar 2008)
New Revision: 7117
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintListInt.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintProperties.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeEditorImpl.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/meta/impl/XModelMetaDataImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.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/XModelImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/XStudioDataLoaderImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/extension/ExtensionPointUtil.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -225,12 +225,7 @@
public Object createInstance() {
if(name == null || name.trim().length() == 0) return null;
validate();
- try {
- return ModelFeatureFactory.getInstance().createFeatureInstance(name);
- } catch (Exception e) {
- name = null;
- return null;
- }
+ return ModelFeatureFactory.getInstance().createFeatureInstance(name);
}
private void validate() {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -32,7 +32,7 @@
try {
int i = Integer.parseInt(value);
return (i >= min && i <= max);
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
//ignore
return false;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintListInt.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintListInt.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintListInt.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -18,7 +18,7 @@
if(values.contains(value)) return true;
try {
return (Integer.parseInt(value) >= 0);
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
//ignore
return false;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintProperties.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintProperties.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintProperties.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -40,7 +40,7 @@
if(v == null || v.length() == 0) return def;
try {
return Integer.parseInt(v);
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
//ignore
return def;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeEditorImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeEditorImpl.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeEditorImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -37,22 +37,14 @@
}
private void findViewerName() {
- try {
- viewer = viewer.substring(1, viewer.length() - 1);
- viewer = getMetaModel().getMapping("AttributeEditor").getValue(viewer);
- } catch (Exception e) {
- //ignore
- viewer = null;
- }
+ if(viewer == null || viewer.length() < 2) return;
+ viewer = viewer.substring(1, viewer.length() - 1);
+ viewer = getMetaModel().getMapping("AttributeEditor").getValue(viewer);
}
protected void setDefaultClassName() {
- try {
- editor = getMetaModel().getMapping("AttributeEditor").getValue(getName());
- } catch (Exception e) {
- //ignore
- }
+ editor = getMetaModel().getMapping("AttributeEditor").getValue(getName());
}
public void load(Element element) {
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-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -252,13 +252,9 @@
}
public void setAdoptManager(String adoptclass) {
- try {
- if(adoptclass != null && adoptclass.length() > 0) {
- adopt = new XAdoptWrapper(adoptclass, this);
- }
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError("XModelEntityImpl:setAdoptManager:" + e.getMessage());
- }
+ if(adoptclass != null && adoptclass.length() > 0) {
+ adopt = new XAdoptWrapper(adoptclass, this);
+ }
}
void validateChildren() {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -45,8 +45,8 @@
}
private XModelMetaDataImpl() {
+ long t = System.currentTimeMillis();
try {
- long t = System.currentTimeMillis();
XMetaDataLoader.loadMetaModel(this);
instance = this;
@@ -60,14 +60,14 @@
XModelEntity[] es = this.entities.values().toArray(new XModelEntity[0]);
for (int i = 0; i < es.length; i++) ((XModelEntityImpl)es[i]).validate();
- if(reportLoadingTime) {
- long dt = - t + (t = System.currentTimeMillis());
- ModelPlugin.getPluginLog().logInfo("Meta model loaded in " + dt + " ms");
- }
} catch (Exception e) {
ModelPlugin.getPluginLog().logError(e);
throw new RuntimeException("Cannot create metamodel: " + e.getMessage());
}
+ if(reportLoadingTime) {
+ long dt = - t + (t = System.currentTimeMillis());
+ ModelPlugin.getPluginLog().logInfo("Meta model loaded in " + dt + " ms");
+ }
}
public XIconList getIconList() {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -1,6 +1,7 @@
package org.jboss.tools.common.model.files.handlers;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.QualifiedName;
import org.jboss.tools.common.meta.action.XAction;
import org.jboss.tools.common.model.XModelObject;
@@ -53,7 +54,7 @@
QualifiedName n = new QualifiedName("", action.getName() + "_lastPath");
try {
folder.getProject().setPersistentProperty(n, path);
- } catch (Exception e) {
+ } catch (CoreException e) {
ModelPlugin.getPluginLog().logError("CreateFileSuppport:TargetHolder:saveLastPath:" + e.getMessage());
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RunAntHandler.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -20,6 +20,7 @@
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.extension.ExtensionPointUtil;
/**
@@ -40,8 +41,12 @@
Platform.getBundle(pluginId);
try {
return (IObjectActionDelegate)ExtensionPointUtil.findClassByElementId("org.eclipse.ui.popupMenus", actionId);
- } catch (Exception ex) {
- ///XStudioPlugin.log(ex);
+ } catch (IllegalArgumentException ex) {
+ //ignore
+ } catch (CoreException ex) {
+ //ignore
+ } catch (ClassCastException ex) {
+ ModelPlugin.getPluginLog().logError(ex);
}
return null;
}
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-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -76,7 +76,7 @@
private int getIconHash(String[] types) {
int res = 0;
for (int i = 0; i < types.length; i++) {
- ImageComponent component = (ImageComponent)components.get(types[i]);
+ ImageComponent component = components.get(types[i]);
if(component != null) res += component.getHash(object);
}
return res;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -374,16 +374,12 @@
}
////ProjectWatcher
- private void loadWatcher() {
- try {
- if(getProperties().get("project") == null) return;
- XObjectLoader l = (XObjectLoader)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.common.model.project.WatcherLoader");
- XModelObject fs = getByPath("FileSystems");
- if(l != null && fs != null) l.load(fs);
- } catch (Exception t) {
- ModelPlugin.getPluginLog().logError("XModelImpl:loadWatcher:" + t.getMessage());
- }
- }
+ private void loadWatcher() {
+ if(getProperties().get("project") == null) return;
+ XObjectLoader l = (XObjectLoader)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.common.model.project.WatcherLoader");
+ XModelObject fs = getByPath("FileSystems");
+ if(l != null && fs != null) l.load(fs);
+ }
public boolean isDummy() {
return "RootDummy".equals(getRoot().getModelEntity().getName());
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -385,7 +385,7 @@
public String getMainIconName() {
try {
return getModelEntity().getRenderer().getIconInfo("main");
- } catch (Exception e) {
+ } catch (NullPointerException e) {
return "main.closedbox";
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -12,6 +12,7 @@
import java.util.*;
import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.impl.XModelObjectImpl;
@@ -45,7 +46,7 @@
IMarker[] ms = new IMarker[0];
try {
ms = ModelPlugin.getWorkspace().getRoot().findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
- } catch (Exception e) {
+ } catch (CoreException e) {
ModelPlugin.getPluginLog().logError(e);
}
reload(ms, errorObjects, IMarker.SEVERITY_ERROR);
@@ -68,9 +69,9 @@
if(attr != null && attr.length() > 0) ((XModelObjectImpl)o).addErrorAttributeDirty(attr);
}
synchronized(objects) {
- Iterator it = objects.iterator();
+ Iterator<XModelObject> it = objects.iterator();
while(it.hasNext()) {
- XModelObject o = (XModelObject)it.next();
+ XModelObject o = it.next();
if(!es.contains(o)) {
if(o.getErrorState() == severity) {
o.setErrorState(0);
@@ -124,7 +125,7 @@
IMarker[] ms = null;
try {
ms = file.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
- } catch (Exception e) {
+ } catch (CoreException e) {
//ignore no markers - no problem
return null;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/XStudioDataLoaderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/XStudioDataLoaderImpl.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/XStudioDataLoaderImpl.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -11,6 +11,7 @@
package org.jboss.tools.common.model.options.impl;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
@@ -104,7 +105,7 @@
if(f.exists() && (!f.isFile() || !f.canWrite())) return;
try {
if(!f.exists()) f.createNewFile();
- } catch (Exception e1) {
+ } catch (IOException e1) {
ModelPlugin.getPluginLog().logError("XStudioDataLoaderImpl:save:Cannot create file:" + e1.getMessage());
return;
}
@@ -116,7 +117,7 @@
check(xs.getChildNodes(), names);
try {
XModelObjectLoaderUtil.serialize(xs, f.getAbsolutePath());
- } catch (Exception e2) {
+ } catch (IOException e2) {
ModelPlugin.getPluginLog().logError(e2);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/extension/ExtensionPointUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/extension/ExtensionPointUtil.java 2008-03-25 16:14:01 UTC (rev 7116)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/extension/ExtensionPointUtil.java 2008-03-25 16:26:40 UTC (rev 7117)
@@ -14,12 +14,12 @@
public class ExtensionPointUtil {
- public static Object findClassByElementId(String pointId, String id) throws Exception {
+ public static Object findClassByElementId(String pointId, String id) throws CoreException, IllegalArgumentException {
IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(pointId);
return findClassByElementId(point, id);
}
- public static Object findClassByElementId(IExtensionPoint point, String id) throws Exception {
+ public static Object findClassByElementId(IExtensionPoint point, String id) throws CoreException, IllegalArgumentException {
IConfigurationElement element = getElementById(point, id);
if(element == null)
throw new IllegalArgumentException("Configuration element with id=" + id + " is not found");
More information about the jbosstools-commits
mailing list