[jbosstools-commits] JBoss Tools SVN: r7072 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/action and 13 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 24 10:53:19 EDT 2008
Author: scabanovich
Date: 2008-03-24 10:53:19 -0400 (Mon, 24 Mar 2008)
New Revision: 7072
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java
Log:
JBIDE-893
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -12,6 +12,7 @@
import java.util.StringTokenizer;
import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.*;
@@ -72,7 +73,7 @@
}
try {
workbenchPage.openEditor(input, id);
- } catch (Exception e) {
+ } catch (PartInitException e) {
ModelUIPlugin.getPluginLog().logError((Exception)e);
}
}
@@ -91,7 +92,7 @@
IResource[] rs = null;
try {
rs = projects[i].members(true);
- } catch (Exception e) {
+ } catch (CoreException e) {
//ignore
}
if(rs != null) for (int j = 0; j < rs.length; j++) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -20,6 +20,7 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.action.SignificanceMessageFactory;
import org.jboss.tools.common.meta.action.XAction;
import org.jboss.tools.common.meta.action.XActionItem;
@@ -45,8 +46,8 @@
public Shell getShell() {
if(shell != null) return shell;
try {
- return ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
- } catch (Exception t) {
+ return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ } catch (NullPointerException t) {
return null;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XModelObjectPropertySource.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -13,13 +13,13 @@
import java.util.*;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTASync;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.views.properties.*;
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.adapter.IModelObjectAdapter;
import org.jboss.tools.common.model.event.*;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class XModelObjectPropertySource implements IPropertySource, IXModelSupport, IModelObjectAdapter, IPropertySource2 {
protected ArrayList<IPropertyDescriptor> propertyDescriptors;
@@ -114,17 +114,14 @@
if(modelObject == null || modelObject != event.getModelObject()) return;
PropertySheet sh = null;
try {
- sh = (PropertySheet)ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.ui.views.PropertySheet");
- } catch (Exception exc) {
+ sh = (PropertySheet)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.ui.views.PropertySheet");
+ } catch (NullPointerException exc) {
//ignore
}
if(sh == null) return;
- try {
- PropertySheetPage p = (PropertySheetPage)sh.getCurrentPage();
- if(p != null) p.refresh();
- } catch (Exception e) {
- //ignore
- }
+ PropertySheetPage p = (PropertySheetPage)sh.getCurrentPage();
+ if(p == null || p.getControl() == null || p.getControl().isDisposed()) return;
+ p.refresh();
}
public void structureChanged(XModelTreeEvent event) {}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -57,7 +57,7 @@
}
IResource r = EclipseResourceUtil.getJavaSourceRoot(project);
if(r == null || !r.exists()) r = project;
- return packageFragmentRoot = javaProject.getPackageFragmentRoot(r);
+ return packageFragmentRoot = javaProject == null ? null : javaProject.getPackageFragmentRoot(r);
}
public void init(IProject project, String publicId, String xPath, String name) {
@@ -86,10 +86,10 @@
return;
}
- packageFragmentRoot = javaProject.getPackageFragmentRoot(javaProject.getResource());
+ packageFragmentRoot = javaProject == null ? null : javaProject.getPackageFragmentRoot(javaProject.getResource());
try {
- javaElement = javaProject.findElement(new Path(fullClassName));
+ javaElement = javaProject == null ? null : javaProject.findElement(new Path(fullClassName));
} catch (JavaModelException e) {
javaElement = null;
// no validation here
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TreeSelectionFieldEditor.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -42,6 +42,7 @@
public TreeSelectionFieldEditor(IWidgetSettings settings) {
super(settings);
+
}
///public TreeSelectionFieldEditor(String name, String labelText, Composite parent, IWidgetSettings settings) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -58,7 +58,7 @@
sb.append(new String(b, 0, l));
}
is.close();
- } catch (Exception e) {
+ } catch (IOException e) {
CommonPlugin.getPluginLog().logError(e);
}
return sb.toString();
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -18,6 +18,7 @@
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.graphics.Color;
@@ -196,13 +197,13 @@
item = table.getItem(i);
try {
item.dispose();
- } catch (Exception e) {
+ } catch (SWTException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
if(r >= 0) try {
table.setSelection(r);
- } catch (Exception e) {
+ } catch (SWTException e) {
//ignore
}
resizeLock = false;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -19,7 +19,6 @@
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.contentoutline.*;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.dnd.ControlDragDrop;
import org.jboss.tools.common.model.ui.navigator.*;
import org.jboss.tools.common.model.ui.select.XModelObjectSelectionProvider;
@@ -53,11 +52,7 @@
if (selectionProvider!=null) selectionProvider.dispose();
selectionProvider = null;
if(getSite() == null) return;
- try {
- getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(getSelectionListener());
- } catch (Exception e) {
- ModelUIPlugin.getPluginLog().logError(e);
- }
+ getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(getSelectionListener());
}
public void setCache(XModelObjectCache cache) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -38,9 +38,9 @@
public void cache() {
problemsCache = new HashMap<Problem,IMarker>();
IMarker[] ms = new IMarker[0];
- try {
+ if(resource != null) try {
ms = resource.findMarkers(null, true, IResource.DEPTH_INFINITE);
- } catch (Exception e) {
+ } catch (CoreException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
for (int i = 0; i < ms.length; i++) {
@@ -63,7 +63,7 @@
try {
m.setAttribute(IMarker.CHAR_START, pos_i);
m.setAttribute(IMarker.CHAR_END, pos_i + 1);
- } catch (Exception e) {
+ } catch (CoreException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -75,7 +75,7 @@
for (int i = 0; i < ms.length; i++) {
try {
ms[i].delete();
- } catch (Exception e) {
+ } catch (CoreException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -52,11 +52,7 @@
public void setHost(ISelectionProvider host) {
if(this.host == host) return;
if(this.host != null) {
- try {
- this.host.removeSelectionChangedListener(this);
- } catch (Exception e) {
- ModelUIPlugin.getPluginLog().logError(e);
- }
+ this.host.removeSelectionChangedListener(this);
}
this.host = host;
if(host != null)
@@ -71,6 +67,8 @@
try {
return (host == null) ? null : convertSelectionToAdapter(host.getSelection());
} catch (Exception e) {
+ //TODO study possible problems and narrow caught exceptions.
+ ModelUIPlugin.getPluginLog().logError(e);
return null;
}
}
@@ -92,9 +90,9 @@
try {
if (!listeners.isEmpty()) {
SelectionChangedEvent newEvent = new SelectionChangedEvent(this, convertSelectionToAdapter(event.getSelection()));
- Iterator iterator = listeners.iterator();
+ Iterator<ISelectionChangedListener> iterator = listeners.iterator();
while (iterator.hasNext())
- ((ISelectionChangedListener)iterator.next()).selectionChanged(newEvent);
+ iterator.next().selectionChanged(newEvent);
}
} finally {
isFiringSelection = false;
@@ -106,9 +104,9 @@
isFiringSelection = true;
try {
if (!listeners.isEmpty()) {
- Iterator iterator = listeners.iterator();
+ Iterator<ISelectionChangedListener> iterator = listeners.iterator();
while (iterator.hasNext())
- ((ISelectionChangedListener)iterator.next()).selectionChanged(event);
+ iterator.next().selectionChanged(event);
}
} finally {
isFiringSelection = false;
@@ -116,10 +114,13 @@
}
private ISelection convertSelectionToAdapter(ISelection selection) {
+ if(!(selection instanceof IStructuredSelection) || selection.isEmpty()) {
+ return selection;
+ }
IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- List objects = structuredSelection.toList();
+ List<?> objects = structuredSelection.toList();
List<Object> adaptedObjects = new ArrayList<Object>();
- Iterator iterator = objects.iterator();
+ Iterator<?> iterator = objects.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object instanceof XModelObject) {
@@ -138,10 +139,13 @@
}
private ISelection convertSelectionFromAdapter(ISelection selection) {
+ if(!(selection instanceof IStructuredSelection) || selection.isEmpty()) {
+ return selection;
+ }
IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- List objects = structuredSelection.toList();
+ List<?> objects = structuredSelection.toList();
List<XModelObject> modelObjects = new ArrayList<XModelObject>();
- Iterator iterator = objects.iterator();
+ Iterator<?> iterator = objects.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object instanceof XModelObject) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/AddInterfaceSupport.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -53,7 +53,7 @@
if(current != null) setAttributeValue(0, property, current);
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(OK.equals(name) || FINISH.equals(name)) {
getProperties().setProperty(property, getAttributeValue(0, property));
setFinished(true);
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -13,6 +13,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Properties;
import java.util.ResourceBundle;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IMarkerDelta;
@@ -23,14 +24,14 @@
import org.jboss.tools.common.editor.ObjectTextEditor;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.TextEvent;
import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.FocusListener;
-//import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -46,9 +47,6 @@
import org.eclipse.ui.texteditor.RevertToSavedAction;
import org.eclipse.ui.texteditor.SaveAction;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
@@ -108,11 +106,7 @@
if(sv == null) return "";
IDocument d = sv.getDocument();
if(d == null) return "";
- try {
- text = d.get();
- } catch (Exception ex) {
- ModelUIPlugin.getPluginLog().logError(ex);
- }
+ text = d.get();
return (text == null) ? "" : text;
}
@@ -167,14 +161,19 @@
public void setCursor(int line, int position) {
ISourceViewer sv = getSourceViewer();
- if(sv == null) return;
+ if(sv == null || sv.getDocument() == null) return;
try {
int i = sv.getDocument().getLineOffset(line - 1) + position -1;
sv.setSelectedRange(i, 0);
sv.revealRange(i, 0);
- } catch (Exception e) {
+ } catch (BadLocationException e) {
ModelUIPlugin.getPluginLog().logError(e);
+ } catch (SWTException e) {
+ ModelUIPlugin.getPluginLog().logError(e);
+ } catch (IllegalArgumentException e) {
+ ModelUIPlugin.getPluginLog().logError(e);
}
+
}
public void doSaveAs() {
@@ -329,15 +328,11 @@
}
public void dispose() {
- try {
super.dispose();
if(changeListener != null) {
ModelPlugin.getWorkspace().removeResourceChangeListener(changeListener);
changeListener = null;
}
- } catch (Exception t) {
- ModelUIPlugin.getPluginLog().logError("Error in disposing xml editor", t);
- }
}
public void selectModelObject(XModelObject object, String attribute) {
@@ -347,11 +342,7 @@
int bp = searcher.getStartPosition();
int ep = searcher.getEndPosition();
if(ep >= bp && bp >= 0) {
- try {
- selectAndReveal(bp, ep - bp);
- } catch (Exception e) {
- ModelUIPlugin.getPluginLog().logError(e);
- }
+ selectAndReveal(bp, ep - bp);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -636,6 +636,8 @@
c = t.getOffsetAtLocation(new Point(x, y));
if (c < 0) c = 0;
} catch (IllegalArgumentException ex) {
+ //do not log, catching that exception is
+ //the way to know that we are out of line.
if (lineIndex + 1 >= t.getLineCount()) {
return t.getCharCount();
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileContext.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -93,7 +93,7 @@
class SWS extends SpecialWizardSupport {
public SWS() {}
- public void action(String name) throws Exception {}
+ public void action(String name) throws XModelException {}
}
public String validate(Properties data) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/OneStepWizard.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -14,6 +14,7 @@
import org.jboss.tools.common.model.ui.wizards.special.DefaultSpecialWizard;
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class OneStepWizard implements SpecialWizard {
@@ -46,7 +47,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(CANCEL.equals(name)) {
setFinished(true);
} else if(FINISH.equals(name)) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java 2008-03-24 14:52:43 UTC (rev 7071)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/one/ServiceDialogImpl.java 2008-03-24 14:53:19 UTC (rev 7072)
@@ -15,13 +15,14 @@
import org.jboss.tools.common.model.ui.wizards.special.DefaultSpecialWizard;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.XEntityDataImpl;
import org.jboss.tools.common.model.ServiceDialog;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class ServiceDialogImpl implements ServiceDialog {
protected String title;
@@ -45,11 +46,10 @@
public static Shell getShell() {
try {
- return ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
- } catch (Exception t) {
+ return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ } catch (NullPointerException t) {
return null;
- }
-
+ }
}
public int showDialog(String title, String message,
@@ -86,7 +86,7 @@
return options;
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
for(int i = 0; i < options.length; i++) {
if(name.equals(options[i])) {
returnCode = i;
More information about the jbosstools-commits
mailing list