[jbosstools-commits] JBoss Tools SVN: r7088 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: attribute/editor and 5 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 24 12:20:28 EDT 2008
Author: scabanovich
Date: 2008-03-24 12:20:28 -0400 (Mon, 24 Mar 2008)
New Revision: 7088
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -65,7 +65,7 @@
if(newValueClassName != null) {
try {
newValueProvider = (INewValueProvider)ModelFeatureFactory.getInstance().createFeatureInstance(newValueClassName);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -409,7 +409,7 @@
return getChildCount() == 0;
}
- public Iterator children() {
+ public Iterator<JavaElement> children() {
return children.iterator();
}
@@ -532,7 +532,7 @@
AccessibleJava.IContextPackageProvider o = (AccessibleJava.IContextPackageProvider)ModelFeatureFactory.getInstance().createFeatureInstance(cls);
if(o != null) o.setObject(((DefaultValueAdapter)adapter).getModelObject());
return o;
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
return null;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -259,7 +259,7 @@
AccessibleJava.IContextPackageProvider o = (AccessibleJava.IContextPackageProvider)ModelFeatureFactory.getInstance().createFeatureInstance(cls);
if(o != null) o.setObject(((DefaultValueAdapter)adapter).getModelObject());
return o;
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
return null;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -15,13 +15,10 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dnd.IDragAndDropService;
-import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.navigator.TreeViewerDragDropProvider;
import org.jboss.tools.common.meta.XAdoptManager;
import org.jboss.tools.common.model.event.*;
-import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
@@ -33,7 +30,7 @@
static {
try {
paletteAdopt = (XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt");
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -239,7 +236,7 @@
private TreeItem getPrevTreeItem (Tree tree, TreeItem item) {
TreeItem result = null;
- Vector rows = getTreeExpandedItems(tree);
+ Vector<TreeItem> rows = getTreeExpandedItems(tree);
int index = rows.indexOf(item);
if (index > 0) {
result = (TreeItem)rows.get(index - 1);
@@ -368,9 +365,9 @@
public Widget findTreeItem (int x, int y) {
try {
Tree tree = (provider.getControl() instanceof Tree) ? (Tree)provider.getControl() : null;
- Vector items = getTreeExpandedItems(tree);
+ Vector<TreeItem> items = getTreeExpandedItems(tree);
for (int i = 0; i < items.size(); i++) {
- TreeItem item = (TreeItem)items.get(i);
+ TreeItem item = items.get(i);
Rectangle bounds = item.getBounds();
Point p = tree.toDisplay(bounds.x, bounds.y);
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -39,7 +39,7 @@
} else {
try {
form = (IForm)ModelFeatureFactory.getInstance().createFeatureInstance(forms[i].getFormClassName());
- } catch(Exception e) {
+ } catch(ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -86,7 +86,7 @@
XFilteredTree result = null;
try {
result = (XFilteredTree)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
return null;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -26,7 +26,7 @@
CreateFileSupport support = null;
try {
support = (CreateFileSupport)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.model.handlers.CreateJSPFileSupport");
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
if(support == null) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-03-24 16:03:00 UTC (rev 7087)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-03-24 16:20:28 UTC (rev 7088)
@@ -145,12 +145,11 @@
ISpecialWizardStep step = null;
try {
step = (ISpecialWizardStep)ModelFeatureFactory.getInstance().createFeatureInstance(cls);
- //Class.forName(cls, true, getClass().getClassLoader()).newInstance();
if(step instanceof AbstractSpecialWizardStep) {
((AbstractSpecialWizardStep)step).setWizard(this);
}
step.setSupport(support, i);
- } catch (Exception e) {
+ } catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError("Cannot load class '" + cls + "'.");
}
return step;
More information about the jbosstools-commits
mailing list