Author: scabanovich
Date: 2009-02-05 07:09:25 -0500 (Thu, 05 Feb 2009)
New Revision: 13484
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties
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/XMLTextEditorStandAlone.java
Log:
JBIDE-3741
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2009-02-05
12:05:24 UTC (rev 13483)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2009-02-05
12:09:25 UTC (rev 13484)
@@ -25,4 +25,5 @@
public static String PROPERTIES;
public static String PREVIEW;
public static String MUST_BE_IFILEEDITORINPUT;
+ public static String CANNOT_DISPLAY_DOCUMENT_CONTENTS;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2009-02-05
12:05:24 UTC (rev 13483)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2009-02-05
12:09:25 UTC (rev 13484)
@@ -3,3 +3,4 @@
PROPERTIES=Properties
PREVIEW=Preview
MUST_BE_IFILEEDITORINPUT=Invalid Input: Must be IFileEditorInput
+CANNOT_DISPLAY_DOCUMENT_CONTENTS=Cannot display document contents.
\ No newline at end of file
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 2009-02-05
12:05:24 UTC (rev 13483)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2009-02-05
12:09:25 UTC (rev 13484)
@@ -27,9 +27,12 @@
import org.eclipse.jface.text.TextEvent;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
@@ -53,6 +56,7 @@
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
+import org.jboss.tools.common.model.ui.messages.UIMessages;
import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor;
import org.jboss.tools.common.model.util.PositionSearcher;
@@ -81,8 +85,24 @@
public TextEditorSupport getSupport() {
return support;
}
-
+
+ boolean isNullEditor = false;
+
+ public void createPartControl(Composite parent) {
+ if(getModel() == null) {
+ setObject(null);
+ isNullEditor = true;
+ Label label = new Label(parent, SWT.NONE);
+ label.setText(UIMessages.CANNOT_DISPLAY_DOCUMENT_CONTENTS);
+ label.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
+ return;
+ } else {
+ super.createPartControl(parent);
+ }
+ }
+
public void setObject(XModelObject object) {
+ if(isNullEditor) return;
isObjectNull = (object == null);
if(isObjectNull) return;
getDocumentListenerRegister().unregister();
@@ -157,11 +177,13 @@
}
public void addFocusListener(FocusListener listener) {
- getSourceViewer().getTextWidget().addFocusListener(listener);
+ ISourceViewer sv = getSourceViewer();
+ if (sv != null) sv.getTextWidget().addFocusListener(listener);
}
public void removeFocusListener(FocusListener listener) {
- getSourceViewer().getTextWidget().removeFocusListener(listener);
+ ISourceViewer sv = getSourceViewer();
+ if (sv != null) getSourceViewer().getTextWidget().removeFocusListener(listener);
}
public void setCursor(int line, int position) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java 2009-02-05
12:05:24 UTC (rev 13483)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java 2009-02-05
12:09:25 UTC (rev 13484)
@@ -25,7 +25,6 @@
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
public class XMLTextEditorStandAlone extends XMLTextEditorComponent implements
XModelTreeListener {
@@ -43,6 +42,9 @@
public void createPartControl(Composite parent) {
super.createPartControl(parent);
+ if(getModel() == null) {
+ return;
+ }
XModelObject o = getModelObject();
setObject(o);
if(o != null) o.getModel().addModelTreeListener(syncListener);
Show replies by date