JBoss Tools SVN: r3243 - trunk/seam/plugins/org.jboss.tools.seam.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-08-20 13:02:37 -0400 (Mon, 20 Aug 2007)
New Revision: 3243
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties
Log:
Added plugin.properties into binary build.
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties 2007-08-20 16:58:37 UTC (rev 3242)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties 2007-08-20 17:02:37 UTC (rev 3243)
@@ -2,7 +2,8 @@
output.seamextensions.jar = bin/
bin.includes = plugin.xml,\
seamextensions.jar,\
- META-INF/
+ META-INF/,\
+ plugin.properties
source.seamextensions.jar = src/
src.includes = src/,\
plugin.xml,\
18 years, 8 months
JBoss Tools SVN: r3242 - trunk/seam/plugins/org.jboss.tools.seam.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-08-20 12:58:37 -0400 (Mon, 20 Aug 2007)
New Revision: 3242
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties
Log:
Added META-INF into binary build
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties 2007-08-20 16:38:52 UTC (rev 3241)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties 2007-08-20 16:58:37 UTC (rev 3242)
@@ -1,7 +1,8 @@
source.seamextensions.jar = src/
output.seamextensions.jar = bin/
bin.includes = plugin.xml,\
- seamextensions.jar
+ seamextensions.jar,\
+ META-INF/
source.seamextensions.jar = src/
src.includes = src/,\
plugin.xml,\
18 years, 8 months
JBoss Tools SVN: r3241 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor: form and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-20 12:38:52 -0400 (Mon, 20 Aug 2007)
New Revision: 3241
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java
Log:
JBIDE-803
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java 2007-08-20 16:28:50 UTC (rev 3240)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java 2007-08-20 16:38:52 UTC (rev 3241)
@@ -181,6 +181,9 @@
messages[1] = "0:0";
messages[2] = s;
}
+ if(messages[1] == null || "0:0".equals(messages[1])) {
+ messages[1] = "";
+ }
}
public void go() {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java 2007-08-20 16:28:50 UTC (rev 3240)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java 2007-08-20 16:38:52 UTC (rev 3241)
@@ -325,6 +325,9 @@
result[ERROR_LOCATION] = "0:0";
result[ERROR_MESSAGE] = s;
}
+ if(result[ERROR_LOCATION] == null || "0:0".equals(result[ERROR_LOCATION])) {
+ result[ERROR_LOCATION] = "";
+ }
return result;
}
18 years, 8 months
JBoss Tools SVN: r3240 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-20 12:28:50 -0400 (Mon, 20 Aug 2007)
New Revision: 3240
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/NamespaceMapping.java
Log:
JBIDE-803
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/NamespaceMapping.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/NamespaceMapping.java 2007-08-20 16:12:16 UTC (rev 3239)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/NamespaceMapping.java 2007-08-20 16:28:50 UTC (rev 3240)
@@ -44,7 +44,7 @@
int i = name.indexOf(':');
String a = name.substring(0, i);
String d = getDefaultNamespace(a);
- if(a == null || a.equals(name)) {
+ if(d == null || a.equals(d)) {
value = name;
} else {
value = d + name.substring(i);
18 years, 8 months
JBoss Tools SVN: r3239 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-20 12:12:16 -0400 (Mon, 20 Aug 2007)
New Revision: 3239
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
Log:
JBIDE-803
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2007-08-20 16:05:00 UTC (rev 3238)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2007-08-20 16:12:16 UTC (rev 3239)
@@ -177,7 +177,7 @@
String name = n.getNodeName();
if(allowed.contains(name)) continue;
if(name.startsWith("xmlns")) continue;
- error = "Unallowed attribute " + name + " of " + element.getNodeName() + ":0:0";;
+ error = "Editor model does not support attribute " + name + " of " + element.getNodeName() + ":0:0";;
return true;
}
}
18 years, 8 months
JBoss Tools SVN: r3238 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-20 12:05:00 -0400 (Mon, 20 Aug 2007)
New Revision: 3238
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta
Log:
JBIDE-803
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2007-08-20 16:04:32 UTC (rev 3237)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2007-08-20 16:05:00 UTC (rev 3238)
@@ -169,7 +169,7 @@
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Managed Persistence Context..." kind="action" name="SeamPersistenceManagedContext">
- <EntityData EntityName="SeamCoreManagedPersistenceContext">
+ <EntityData EntityName="SeamPersistenceManagedContext">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="persistence-unit-jndi-name" Mandatory="no"/>
</EntityData>
18 years, 8 months
JBoss Tools SVN: r3237 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-20 12:04:32 -0400 (Mon, 20 Aug 2007)
New Revision: 3237
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
Log:
JBIDE-803
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2007-08-20 16:04:15 UTC (rev 3236)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2007-08-20 16:04:32 UTC (rev 3237)
@@ -162,7 +162,7 @@
name = namespaceMapping.convertToDefault(name);
}
if(allowed.contains(name)) continue;
- error = "Unallowed child " + name + " of " + element.getNodeName() + ":0:0";
+ error = "Editor model does not support child element " + name + " of " + element.getNodeName() + ":0:0";
return true;
}
}
18 years, 8 months
JBoss Tools SVN: r3236 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-20 12:04:15 -0400 (Mon, 20 Aug 2007)
New Revision: 3236
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java
Log:
JBIDE-803
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2007-08-20 15:43:06 UTC (rev 3235)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2007-08-20 16:04:15 UTC (rev 3236)
@@ -116,7 +116,12 @@
protected int getLocation(String s) {
Integer i = (Integer)lines.get(s);
return (i == null) ? -1 : i.intValue();
- }
+ }
+
+ boolean enabled = false;
+ public void update() {
+ if(enabled) super.update();
+ }
}
protected ResourceMarkers getResourceMarkers() {
18 years, 8 months
JBoss Tools SVN: r3235 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/mozilla and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-08-20 11:43:06 -0400 (Mon, 20 Aug 2007)
New Revision: 3235
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashForm.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
Log:
Merge the branch "jbosstools_xulrunner" with HEAD
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -2359,8 +2359,8 @@
public void setToolbarFormatControllerManager(FormatControllerManager formatControllerManager) {
toolbarFormatControllerManager = formatControllerManager;
}
- public void setSelectionBarController(SelectionBar SelectionBar) {
- selectionBar = SelectionBar;
+ public void setSelectionBarController(SelectionBar selectionBar) {
+ this.selectionBar = selectionBar;
}
public IStructuredModel getModel() {
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.editor;
import java.beans.PropertyChangeEvent;
@@ -26,6 +26,8 @@
import org.eclipse.swt.events.ShellAdapter;
import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
@@ -47,138 +49,185 @@
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.ITextEditorExtension;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.event.XModelTreeEvent;
+import org.jboss.tools.common.model.event.XModelTreeListener;
+import org.jboss.tools.common.model.ui.util.ModelUtilities;
import org.jboss.tools.jst.jsp.editor.IVisualEditor;
+import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.mozilla.EditorLoadWindowListener;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
import org.jboss.tools.vpe.editor.mozilla.MozillaPreview;
import org.jboss.tools.vpe.editor.xpl.SashForm;
+import org.jboss.tools.vpe.selbar.SelectionBar;
-public class VpeEditorPart extends EditorPart implements ITextEditor, ITextEditorExtension, IReusableEditor, IVisualEditor {
+public class VpeEditorPart extends EditorPart implements ITextEditor,
+ ITextEditorExtension, IReusableEditor, IVisualEditor {
private SashForm container;
- private StructuredTextEditor sourceEditor=null;
+ private StructuredTextEditor sourceEditor = null;
private MozillaEditor visualEditor;
private IEditorPart activeEditor;
private VpeController controller;
+ private XModelTreeListener listener;
+ XModelObject optionsObject;
+ private SelectionBar selectionBar = new SelectionBar();
private ActivationListener activationListener = new ActivationListener();
- private int visualMode=0;
+ private int visualMode = 0;
private EditorPart multiPageEditor;
- private static final QualifiedName SPLITTER_POSITION_KEY1 = new QualifiedName("", "splitter_position1");
- private static final QualifiedName SPLITTER_POSITION_KEY2 = new QualifiedName("", "splitter_position2");
- private static final QualifiedName SPLITTER_POSITION_KEY3 = new QualifiedName("", "splitter_position3");
+ private static final QualifiedName SPLITTER_POSITION_KEY1 = new QualifiedName(
+ "", "splitter_position1");
+ private static final QualifiedName SPLITTER_POSITION_KEY2 = new QualifiedName(
+ "", "splitter_position2");
+ private static final QualifiedName SPLITTER_POSITION_KEY3 = new QualifiedName(
+ "", "splitter_position3");
private int controlCount = 0;
-
+
/** default web-browser */
- private MozillaPreview previewWebBrowser = null;
-
+ private MozillaPreview previewWebBrowser = null;
+
/** preview content */
- private Composite previewContent = null;
+ private Composite previewContent = null;
- public StructuredTextEditor getSourceEditor(){
+ public StructuredTextEditor getSourceEditor() {
return sourceEditor;
}
-
+
// returns JSPMultipageEditor for closing by ctrl+F4 and ctrl+shift+F4 keys
- public EditorPart getParentEditor(){
+ public EditorPart getParentEditor() {
return multiPageEditor;
}
-
+
public void close(boolean save) {
- if(sourceEditor!=null)sourceEditor.close(save);
+ if (sourceEditor != null)
+ sourceEditor.close(save);
}
+
public void doRevertToSaved() {
- if(sourceEditor!=null)sourceEditor.doRevertToSaved();
+ if (sourceEditor != null)
+ sourceEditor.doRevertToSaved();
}
+
public IDocumentProvider getDocumentProvider() {
- if(sourceEditor!=null)return sourceEditor.getDocumentProvider();
- else{
+ if (sourceEditor != null)
+ return sourceEditor.getDocumentProvider();
+ else {
return null;
}
}
+
public IRegion getHighlightRange() {
- if(sourceEditor!=null)return sourceEditor.getHighlightRange();
- else{
+ if (sourceEditor != null)
+ return sourceEditor.getHighlightRange();
+ else {
return null;
}
}
+
public ISelectionProvider getSelectionProvider() {
- if(sourceEditor!=null)return sourceEditor.getSelectionProvider();
- else{
+ if (sourceEditor != null)
+ return sourceEditor.getSelectionProvider();
+ else {
return null;
}
}
+
public boolean isEditable() {
- if(sourceEditor!=null)return sourceEditor.isEditable();
- else{
+ if (sourceEditor != null)
+ return sourceEditor.isEditable();
+ else {
return false;
}
}
+
public void removeActionActivationCode(String actionId) {
- if(sourceEditor!=null)sourceEditor.removeActionActivationCode(actionId);
+ if (sourceEditor != null)
+ sourceEditor.removeActionActivationCode(actionId);
}
+
public void resetHighlightRange() {
- if(sourceEditor!=null)sourceEditor.resetHighlightRange();
+ if (sourceEditor != null)
+ sourceEditor.resetHighlightRange();
}
+
public void selectAndReveal(int offset, int length) {
- if(sourceEditor!=null)sourceEditor.selectAndReveal(offset, length);
+ if (sourceEditor != null)
+ sourceEditor.selectAndReveal(offset, length);
}
+
public void setAction(String actionID, IAction action) {
- if(sourceEditor!=null)sourceEditor.setAction(actionID, action);
+ if (sourceEditor != null)
+ sourceEditor.setAction(actionID, action);
}
+
public void setActionActivationCode(String actionId,
char activationCharacter, int activationKeyCode,
int activationStateMask) {
- if(sourceEditor!=null)sourceEditor.setActionActivationCode(actionId, activationCharacter, activationKeyCode, activationStateMask);
+ if (sourceEditor != null)
+ sourceEditor.setActionActivationCode(actionId, activationCharacter,
+ activationKeyCode, activationStateMask);
}
+
public void setHighlightRange(int offset, int length, boolean moveCursor) {
- if(sourceEditor!=null)sourceEditor.setHighlightRange(offset, length, moveCursor);
+ if (sourceEditor != null)
+ sourceEditor.setHighlightRange(offset, length, moveCursor);
}
+
public void showHighlightRangeOnly(boolean showHighlightRangeOnly) {
- if(sourceEditor!=null)sourceEditor.showHighlightRangeOnly(showHighlightRangeOnly);
+ if (sourceEditor != null)
+ sourceEditor.showHighlightRangeOnly(showHighlightRangeOnly);
}
+
public boolean showsHighlightRangeOnly() {
- if(sourceEditor!=null)return sourceEditor.showsHighlightRangeOnly();
- else{
- return false;
- }
+ if (sourceEditor != null)
+ return sourceEditor.showsHighlightRangeOnly();
+ else {
+ return false;
+ }
}
public void addRulerContextMenuListener(IMenuListener listener) {
- if(sourceEditor!=null)sourceEditor.addRulerContextMenuListener(listener);
+ if (sourceEditor != null)
+ sourceEditor.addRulerContextMenuListener(listener);
}
+
public boolean isEditorInputReadOnly() {
- if(sourceEditor!=null)return sourceEditor.isEditorInputReadOnly();
- else{
+ if (sourceEditor != null)
+ return sourceEditor.isEditorInputReadOnly();
+ else {
return false;
}
}
+
public void removeRulerContextMenuListener(IMenuListener listener) {
- if(sourceEditor!=null)sourceEditor.removeRulerContextMenuListener(listener);
+ if (sourceEditor != null)
+ sourceEditor.removeRulerContextMenuListener(listener);
}
+
public void setStatusField(IStatusField field, String category) {
- if(visualMode == VISUAL_MODE) {
- if(field != null) {
+ if (visualMode == VISUAL_MODE) {
+ if (field != null) {
field.setImage(null);
field.setText(null);
}
- }else
- if(sourceEditor!=null)sourceEditor.setStatusField(field, category);
+ } else if (sourceEditor != null)
+ sourceEditor.setStatusField(field, category);
}
-
-
- public VpeEditorPart(EditorPart multiPageEditor, StructuredTextEditor textEditor, boolean visualMode){
+
+ public VpeEditorPart(EditorPart multiPageEditor,
+ StructuredTextEditor textEditor, boolean visualMode) {
sourceEditor = textEditor;
- //this.visualMode = visualMode;
+ // this.visualMode = visualMode;
this.multiPageEditor = multiPageEditor;
}
-
- public IAction getAction(String actionID){
+
+ public IAction getAction(String actionID) {
return sourceEditor.getAction(actionID);
}
-
- public VpeEditorPart(){
+
+ public VpeEditorPart() {
}
-
+
public void doSave(IProgressMonitor monitor) {
if (sourceEditor != null) {
sourceEditor.doSave(monitor);
@@ -192,16 +241,18 @@
}
}
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+ public void init(IEditorSite site, IEditorInput input)
+ throws PartInitException {
setSite(site);
setInput(input);
}
public void setInput(IEditorInput input) {
super.setInput(input);
- if(visualEditor != null && visualEditor.getEditorInput() != null && visualEditor.getEditorInput() != getEditorInput()) {
+ if (visualEditor != null && visualEditor.getEditorInput() != null
+ && visualEditor.getEditorInput() != getEditorInput()) {
visualEditor.setInput(input);
- }
+ }
}
public boolean isDirty() {
@@ -219,25 +270,33 @@
return false;
}
}
-
+
protected int[] loadSplitterPosition() {
int[] sizes = new int[3];
- try {
+ try {
IEditorInput input = getEditorInput();
- if(!(input instanceof IFileEditorInput)) return null;
- IFile file = ((IFileEditorInput)input).getFile();
+ if (!(input instanceof IFileEditorInput))
+ return null;
+
+ IFile file = ((IFileEditorInput) input).getFile();
String s = file.getPersistentProperty(SPLITTER_POSITION_KEY1);
if (s != null) {
sizes[0] = Integer.parseInt(s);
- }else return null;
+ } else
+ return null;
+
s = file.getPersistentProperty(SPLITTER_POSITION_KEY2);
if (s != null) {
sizes[1] = Integer.parseInt(s);
- }else return null;
+ } else
+ return null;
+
s = file.getPersistentProperty(SPLITTER_POSITION_KEY3);
if (s != null) {
sizes[2] = Integer.parseInt(s);
- }else return null;
+ } else
+ return null;
+
} catch (Exception e) {
VpePlugin.getPluginLog().logError(e);
return null;
@@ -247,9 +306,10 @@
protected void saveSplitterPosition(int[] weights) {
IEditorInput input = getEditorInput();
- if(!(input instanceof IFileEditorInput)) return;
- IFile file = ((IFileEditorInput)input).getFile();
- try {
+ if (!(input instanceof IFileEditorInput))
+ return;
+ IFile file = ((IFileEditorInput) input).getFile();
+ try {
String s = String.valueOf(weights[0]);
file.setPersistentProperty(SPLITTER_POSITION_KEY1, s);
s = String.valueOf(weights[1]);
@@ -260,156 +320,204 @@
VpePlugin.getPluginLog().logError(e);
}
}
- Composite sourceContent=null;
- Composite visualContent=null;
-
- public void setVisualMode(int type){
- switch(type){
- case VISUALSOURCE_MODE:
- if(sourceContent!= null)sourceContent.setVisible(true);
- if(visualContent!= null)visualContent.setVisible(true);
- if(previewContent != null) {
- previewContent.setVisible(false);
- }
- break;
-
- case VISUAL_MODE:
- if(sourceContent!= null)sourceContent.setVisible(false);
- if(visualContent!= null)visualContent.setVisible(true);
- if(previewContent != null) {
- previewContent.setVisible(false);
- }
- break;
-
- case SOURCE_MODE:
- if(sourceContent!= null)sourceContent.setVisible(true);
- if(visualContent!= null)visualContent.setVisible(false);
- if(previewContent != null) {
- previewContent.setVisible(false);
- }
- break;
-
- case PREVIEW_MODE:
- if(sourceContent!= null) {
- sourceContent.setVisible(false);
- }
-
- if(visualContent!= null) {
- visualContent.setVisible(false);
- }
-
- if(previewContent != null) {
- previewWebBrowser.rebuildDom();
- previewContent.setVisible(true);
- }
- break;
+
+ Composite sourceContent = null;
+ Composite visualContent = null;
+
+ public void setVisualMode(int type) {
+ String showSelectionBar = VpePreference.SHOW_SELECTION_TAG_BAR
+ .getValue();
+ switch (type) {
+ case VISUALSOURCE_MODE:
+ selectionBar.showBar(showSelectionBar);
+ if (sourceContent != null)
+ sourceContent.setVisible(true);
+ if (visualContent != null)
+ visualContent.setVisible(true);
+ if (previewContent != null) {
+ previewContent.setVisible(false);
+ }
+ break;
+
+ case VISUAL_MODE:
+ selectionBar.showBar(showSelectionBar);
+ if (sourceContent != null)
+ sourceContent.setVisible(false);
+ if (visualContent != null)
+ visualContent.setVisible(true);
+ if (previewContent != null) {
+ previewContent.setVisible(false);
+ }
+ break;
+
+ case SOURCE_MODE:
+ selectionBar.showBar(showSelectionBar);
+ if (sourceContent != null)
+ sourceContent.setVisible(true);
+ if (visualContent != null)
+ visualContent.setVisible(false);
+ if (previewContent != null) {
+ previewContent.setVisible(false);
+ }
+ break;
+
+ case PREVIEW_MODE:
+ if (selectionBar != null) {
+ selectionBar.showBar("no");
+ }
+ if (sourceContent != null) {
+ sourceContent.setVisible(false);
+ }
+
+ if (visualContent != null) {
+ visualContent.setVisible(false);
+ }
+
+ if (previewContent != null) {
+ previewWebBrowser.rebuildDom();
+ previewContent.setVisible(true);
+ }
+ break;
}
container.layout();
- if(visualMode == SOURCE_MODE && type != SOURCE_MODE) {
+ if (visualMode == SOURCE_MODE && type != SOURCE_MODE) {
visualMode = type;
- if(controller!=null) {
+ if (controller != null) {
controller.visualRefresh();
controller.sourceSelectionChanged();
}
}
visualMode = type;
}
-
- public int getVisualMode(){
+
+ public int getVisualMode() {
return visualMode;
}
public void createPartControl(Composite parent) {
controlCount++;
- if(controlCount > 1)return;
-
- container = new SashForm(parent, SWT.VERTICAL);
- sourceContent = new Composite(container, SWT.NONE);
- sourceContent.setLayout(new FillLayout());
- visualContent = new Composite(container, SWT.NONE);
- visualContent.setLayout(new FillLayout());
-
-
- // Create a preview content
- previewContent = new Composite(container, SWT.NONE);
- previewContent.setLayout(new FillLayout());
-
- if(sourceEditor == null)sourceEditor = new StructuredTextEditor() {
+ if (controlCount > 1)
+ return;
+ // //////////////////////////////////////////////////////////////
+
+ Composite cmpEdTl = new Composite(parent, SWT.NONE);
+ GridLayout layoutEdTl = new GridLayout(1, false);
+ layoutEdTl.verticalSpacing = 0;
+ layoutEdTl.marginHeight = 0;
+ layoutEdTl.marginBottom = 3;
+ layoutEdTl.marginWidth = 0;
+ cmpEdTl.setLayout(layoutEdTl);
+ cmpEdTl.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ Composite cmpEd = new Composite(cmpEdTl, SWT.NATIVE);
+ GridLayout layoutEd = new GridLayout(1, false);
+ layoutEd.marginBottom = 0;
+ layoutEd.marginHeight = 1;
+ layoutEd.marginWidth = 0;
+ layoutEd.marginRight = 0;
+ layoutEd.marginLeft = 1;
+ layoutEd.verticalSpacing = 0;
+ layoutEd.horizontalSpacing = 0;
+ cmpEd.setLayout(layoutEd);
+ cmpEd.setLayoutData(new GridData(GridData.FILL_BOTH));
+ // /////////////////////////////////////////////////////////////////
+ container = new SashForm(cmpEd, SWT.VERTICAL);
+ container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ sourceContent = new Composite(container, SWT.NONE);
+ sourceContent.setLayout(new FillLayout());
+ visualContent = new Composite(container, SWT.NONE);
+ visualContent.setLayout(new FillLayout());
+
+ // Create a preview content
+ previewContent = new Composite(container, SWT.NONE);
+ previewContent.setLayout(new FillLayout());
+
+ // ////////////////////////////////////////////////////
+
+ selectionBar.createToolBarComposite(cmpEdTl, true);
+ // ///////////////////////////////////////////////////
+ if (sourceEditor == null)
+ sourceEditor = new StructuredTextEditor() {
public void safelySanityCheckState(IEditorInput input) {
super.safelySanityCheckState(input);
}
};
- int[] weights = loadSplitterPosition();
- if(weights != null)
- container.setWeights(weights);
- container.addWeightsChangeListener(new PropertyChangeListener(){
- public void propertyChange(PropertyChangeEvent event){
- saveSplitterPosition(container.getWeights());
- }
- });
- parent.addControlListener(new ControlListener(){
- public void controlMoved(ControlEvent event){
-
- }
- public void controlResized(ControlEvent event){
- container.layout();
- }
- });
- visualEditor = new MozillaEditor();
- try {
- visualEditor.init(getEditorSite(), getEditorInput());
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
+ int[] weights = loadSplitterPosition();
+ if (weights != null)
+ container.setWeights(weights);
+ container.addWeightsChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent event) {
+ saveSplitterPosition(container.getWeights());
}
+ });
+ parent.addControlListener(new ControlListener() {
+ public void controlMoved(ControlEvent event) {
- previewWebBrowser = new MozillaPreview(this, sourceEditor);
- try {
- previewWebBrowser.init(getEditorSite(), getEditorInput());
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
}
+ public void controlResized(ControlEvent event) {
+ container.layout();
+ }
+ });
+ visualEditor = new MozillaEditor();
try {
- sourceEditor.addPropertyListener(
- new IPropertyListener() {
- public void propertyChanged(Object source, int propId) {
- if (propId == IWorkbenchPartConstants.PROP_TITLE) {
- VpeEditorPart.this.setPartName(sourceEditor.getTitle());
- }
- VpeEditorPart.this.firePropertyChange(propId);
- }
- });
+ visualEditor.init(getEditorSite(), getEditorInput());
+ } catch (Exception e) {
+ VpePlugin.reportProblem(e);
+ }
+
+ previewWebBrowser = new MozillaPreview(this, sourceEditor);
+ try {
+ previewWebBrowser.init(getEditorSite(), getEditorInput());
+ } catch (Exception e) {
+ VpePlugin.reportProblem(e);
+ }
+
+ try {
+ sourceEditor.addPropertyListener(new IPropertyListener() {
+ public void propertyChanged(Object source, int propId) {
+ if (propId == IWorkbenchPartConstants.PROP_TITLE) {
+ VpeEditorPart.this.setPartName(sourceEditor.getTitle());
+ }
+ VpeEditorPart.this.firePropertyChange(propId);
+ }
+ });
sourceEditor.init(getEditorSite(), getEditorInput());
- if(sourceContent!=null){
+ if (sourceContent != null) {
sourceEditor.createPartControl(sourceContent);
}
- if(visualEditor!=null) {
- visualEditor.setEditorLoadWindowListener(new EditorLoadWindowListener() {
- public void load() {
- visualEditor.setEditorLoadWindowListener(null);
- controller = new VpeController(VpeEditorPart.this);
- try {
- controller.init(sourceEditor, visualEditor);
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
- }
- }
- });
+ if (visualEditor != null) {
+ visualEditor
+ .setEditorLoadWindowListener(new EditorLoadWindowListener() {
+ public void load() {
+ visualEditor.setEditorLoadWindowListener(null);
+ controller = new VpeController(
+ VpeEditorPart.this);
+ selectionBar.setVpeController(controller);
+ controller.setSelectionBarController(selectionBar);
+ try {
+ controller.init(sourceEditor, visualEditor);
+ } catch (Exception e) {
+ VpePlugin.reportProblem(e);
+ }
+ }
+ });
visualEditor.createPartControl(visualContent);
}
-
-
- if(previewWebBrowser!=null) {
- previewWebBrowser.setEditorLoadWindowListener(new EditorLoadWindowListener() {
- public void load() {
- previewWebBrowser.setEditorLoadWindowListener(null);
- previewWebBrowser.buildDom();
- }
- });
+
+ if (previewWebBrowser != null) {
+ previewWebBrowser
+ .setEditorLoadWindowListener(new EditorLoadWindowListener() {
+ public void load() {
+ previewWebBrowser
+ .setEditorLoadWindowListener(null);
+ previewWebBrowser.buildDom();
+ }
+ });
previewWebBrowser.createPartControl(previewContent);
}
-
+
activeEditor = sourceEditor;
sourceContent.addListener(SWT.Activate, new Listener() {
@@ -426,7 +534,8 @@
visualContent.addListener(SWT.Activate, new Listener() {
public void handleEvent(Event event) {
if (event.type == SWT.Activate) {
- if (visualEditor!=null && activeEditor != visualEditor) {
+ if (visualEditor != null
+ && activeEditor != visualEditor) {
activeEditor = visualEditor;
setFocus();
}
@@ -434,18 +543,17 @@
}
});
-
previewContent.addListener(SWT.Activate, new Listener() {
public void handleEvent(Event event) {
if (event.type == SWT.Activate) {
- if (previewWebBrowser!=null && activeEditor != previewWebBrowser) {
+ if (previewWebBrowser != null
+ && activeEditor != previewWebBrowser) {
activeEditor = previewWebBrowser;
setFocus();
}
}
}
});
-
IWorkbenchWindow window = getSite().getWorkbenchWindow();
window.getPartService().addPartListener(activationListener);
@@ -454,7 +562,26 @@
} catch (Exception e) {
VpePlugin.reportProblem(e);
}
- //setVisualMode(visualMode);
+ // setVisualMode(visualMode);
+ // ///////////////////////////////////////
+ // ///// Add preference listener
+ optionsObject = ModelUtilities.getPreferenceModel().getByPath(
+ VpePreference.EDITOR_PATH);
+ listener = new XModelTreeListener() {
+
+ public void nodeChanged(XModelTreeEvent event) {
+ String showSelectionBar = VpePreference.SHOW_SELECTION_TAG_BAR
+ .getValue();
+ selectionBar.showBar(showSelectionBar);
+ }
+
+ public void structureChanged(XModelTreeEvent event) {
+ }
+
+ };
+ optionsObject.getModel().addModelTreeListener(listener);
+ // ///////////////////////////////////////
+ cmpEd.layout();
}
public void setFocus() {
@@ -465,11 +592,13 @@
public void dispose() {
super.dispose();
-
+ if (optionsObject != null) {
+ optionsObject.getModel().removeModelTreeListener(listener);
+ }
if (activationListener != null) {
- IWorkbenchWindow window= getSite().getWorkbenchWindow();
+ IWorkbenchWindow window = getSite().getWorkbenchWindow();
window.getPartService().removePartListener(activationListener);
- Shell shell= window.getShell();
+ Shell shell = window.getShell();
if (shell != null && !shell.isDisposed())
shell.removeShellListener(activationListener);
activationListener = null;
@@ -479,8 +608,7 @@
controller = null;
}
-
-// editor will disposed as part of multipart editor
+ // editor will disposed as part of multipart editor
if (sourceEditor != null) {
sourceEditor.dispose();
sourceEditor = null;
@@ -490,11 +618,16 @@
visualEditor.dispose();
visualEditor = null;
}
-
+
if (previewContent != null) {
previewContent.dispose();
previewContent = null;
}
+
+ if (selectionBar != null) {
+ selectionBar.dispose();
+ selectionBar = null;
+ }
}
public Object getAdapter(Class adapter) {
@@ -504,30 +637,30 @@
return null;
}
}
-
-
- private class ActivationListener extends ShellAdapter implements IPartListener {
+
+ private class ActivationListener extends ShellAdapter implements
+ IPartListener {
private IWorkbenchPart fActivePart;
private boolean fIsHandlingActivation = false;
-
+
public void partActivated(IWorkbenchPart part) {
fActivePart = part;
handleActivation();
}
-
+
public void partBroughtToTop(IWorkbenchPart part) {
}
-
+
public void partClosed(IWorkbenchPart part) {
}
-
+
public void partDeactivated(IWorkbenchPart part) {
fActivePart = null;
}
-
+
public void partOpened(IWorkbenchPart part) {
}
-
+
public void shellActivated(ShellEvent e) {
e.widget.getDisplay().asyncExec(new Runnable() {
public void run() {
@@ -535,11 +668,11 @@
}
});
}
-
+
private void handleActivation() {
if (fIsHandlingActivation)
return;
-
+
if (fActivePart == multiPageEditor) {
fIsHandlingActivation = true;
try {
@@ -555,9 +688,9 @@
}
}
}
-
+
public VpeController getController() {
return controller;
}
-
+
}
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -83,7 +83,6 @@
private EditorDomEventListener editorDomEventListener;
private IVpeToolBarManager vpeToolBarManager;
private FormatControllerManager formatControllerManager = new FormatControllerManager();
- private SelectionBar selectionBar = new SelectionBar();
private VpeController controller;
public void doSave(IProgressMonitor monitor) {
@@ -114,9 +113,6 @@
this.controller = controller;
formatControllerManager.setVpeController(controller);
controller.setToolbarFormatControllerManager(formatControllerManager);
- //Add the Selection Bar to listen VPE
- selectionBar.setVpeController(controller);
- controller.setSelectionBarController(selectionBar);
}
Link link = null;
@@ -197,38 +193,6 @@
});
verBar.pack();
- //Bottom Button to show/hide the Selection Bar
- VpePlugin.getDefault().getPreferenceStore().setDefault(SELECT_BAR, "show"); //$NON-NLS-1$
- VpePlugin.getDefault().savePluginPreferences();
-
- ToolBar bt = new ToolBar(cmpVerticalToolbar, SWT.VERTICAL|SWT.FLAT|SWT.BOTTOM);
- ToolItem bbt = new ToolItem(bt, SWT.FLAT | SWT.CHECK);
- bbt.setToolTipText(VpeUIMessages.SHOW_HIDE_SELECTIONBAR);
- bbt.setImage(ImageDescriptor.createFromFile(MozillaEditor.class, "icons/tag_line.gif").createImage()); //$NON-NLS-1$
- boolean bshow;
- if (VpePlugin.getDefault().getPreferenceStore().getString(SELECT_BAR).equals("show")){ //$NON-NLS-1$
- bbt.setSelection(true);
- bshow = true;
- }
- else{
- bbt.setSelection(false);
- bshow = false;
- }
-
- bbt.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
- String preferenceValue = VpePlugin.getDefault().getPreferenceStore().getString(SELECT_BAR);
- selectionBar.showBar(preferenceValue);
- if (preferenceValue.equals("show")) { //$NON-NLS-1$
- VpePlugin.getDefault().getPreferenceStore().setValue(SELECT_BAR, "hide"); //$NON-NLS-1$
- }
- else {
- VpePlugin.getDefault().getPreferenceStore().setValue(SELECT_BAR, "show"); //$NON-NLS-1$
- }
- VpePlugin.getDefault().savePluginPreferences();
- }
- });
-
//Create a composite to the Editor
Composite cmpEd = new Composite (cmpEdTl, SWT.NATIVE);
GridLayout layoutEd = new GridLayout(1, false);
@@ -273,6 +237,8 @@
xulRunnerEditor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
}
catch (Exception e) {
+ VpePlugin.getPluginLog().logError(e);
+
layout.verticalSpacing = 10;
Label title = new Label(cmpEd, SWT.WRAP);
title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR);
@@ -316,7 +282,6 @@
Label fill = new Label(cmpEd, SWT.WRAP);
fill.setLayoutData(new GridData(GridData.FILL_BOTH));
}
- selectionBar.createToolBarComposite(cmpEdTl, bshow);
}
private ToolItem createToolItem(ToolBar parent, int type, String image, String toolTipText) {
@@ -336,16 +301,13 @@
public void dispose() {
removeDomEventListeners();
- removeClipboardDragDropHooks();
+ // TODO Max Areshkau figure out with ClipboardDragDropHooks
+// removeClipboardDragDropHooks();
if (xulRunnerEditor != null) {
xulRunnerEditor.dispose();
xulRunnerEditor = null;
}
- if (selectionBar != null) {
- selectionBar.dispose();
- selectionBar = null;
- }
super.dispose();
}
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -1,7 +1,14 @@
-/**
- * @author Erick
- * Created on 14.07.2005
- */
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.vpe.editor.toolbar;
import org.eclipse.swt.widgets.Composite;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashForm.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashForm.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashForm.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -73,35 +73,6 @@
int mask = SWT.BORDER;
return style & mask;
}
- public Point computeSize (int wHint, int hHint, boolean changed) {
- checkWidget();
- Control[] controls = getControls(true);
- if (controls.length == 0) return new Point(wHint, hHint);
-
- int width = 0;
- int height = 0;
- boolean vertical = (orientation == SWT.VERTICAL);
- if (vertical) {
- height += (controls.length - 1) * SASH_WIDTH;
- } else {
- width += (controls.length - 1) * SASH_WIDTH;
- }
- for (int i = 0; i < controls.length; i++) {
- if (vertical) {
- Point size = controls[i].computeSize(wHint, SWT.DEFAULT);
- height += size.y;
- width = Math.max(width, size.x);
- } else {
- Point size = controls[i].computeSize(SWT.DEFAULT, hHint);
- width += size.x;
- height = Math.max(height, size.y);
- }
- }
- if (wHint != SWT.DEFAULT) width = wHint;
- if (hHint != SWT.DEFAULT) height = hHint;
-
- return new Point(width, height);
- }
public int getOrientation() {
return orientation;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -43,7 +43,7 @@
public static String PREFERENCES;
public static String REFRESH;
public static String PAGE_DESIGN_OPTIONS;
- public static String SHOW_HIDE_SELECTIONBAR;
+ public static String HIDE_SELECTIONBAR;
public static String MOZILLA_LOADING_ERROR;
public static String MOZILLA_LOADING_ERROR_LINK_TEXT;
public static String MOZILLA_LOADING_ERROR_LINK;
@@ -89,7 +89,9 @@
public static String JUSTIFY;
public static String BULLETS;
public static String NUMBERING;
-
+ public static String CONFIRM_SELECTION_BAR_DIALOG_TITLE;
+ public static String CONFIRM_SELECTION_BAR_DIALOG_MESSAGE;
+ public static String CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE;
}
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2007-08-20 15:43:06 UTC (rev 3235)
@@ -3,7 +3,7 @@
PREFERENCES=Preferences
REFRESH=Refresh
PAGE_DESIGN_OPTIONS=Page Design Options
-SHOW_HIDE_SELECTIONBAR=Show/Hide Selection Bar
+HIDE_SELECTIONBAR=Hide Selection Bar
SHOW_BORDER_FOR_ALL_TAGS=show border for all tags
MOZILLA_LOADING_ERROR=The VPE editor can't be run because your system environment needs to be changed slightly.
MOZILLA_LOADING_ERROR_LINK_TEXT=Find out more.
@@ -49,3 +49,6 @@
JUSTIFY=Justify
BULLETS=Bullets
NUMBERING=Numbering
+CONFIRM_SELECTION_BAR_DIALOG_TITLE=Confirm hide selection bar
+CONFIRM_SELECTION_BAR_DIALOG_MESSAGE=Hide selection bar ?
+CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE=Always hide selection bar without prompt
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2007-08-20 15:42:56 UTC (rev 3234)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2007-08-20 15:43:06 UTC (rev 3235)
@@ -7,60 +7,72 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.selbar;
-import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.compare.Splitter;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.ui.util.ModelUtilities;
+import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.selection.VpeSourceSelection;
import org.jboss.tools.vpe.editor.selection.VpeSourceSelectionBuilder;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+import org.w3c.dom.Node;
/**
- * @author erick
- * This class create and manage the Selection Bar under the VPE. Entry point from the class MozilaEditor
- * This bar can be hiden and shown it uses splitter for this
+ * @author erick This class create and manage the Selection Bar under the VPE.
+ * Entry point from the class MozilaEditor This bar can be hiden and
+ * shown it uses splitter for this
*/
-
+
public class SelectionBar extends Layout implements SelectionListener {
- private Splitter splitter;
+ private Splitter splitter;
- private VpeController vpeController = null;
+ private VpeController vpeController = null;
- private ToolBar selBar = null;
+ private ToolBar selBar = null;
+ private ToolBar closeSelectionBar = null;
- private int itemCount = 0;
+ private int itemCount = 0;
- Composite cmpToolBar = null;
+ private Composite cmpToolBar = null;
+ private Composite cmpTlEmpty = null;
+ private Composite cmpBar = null;
+ private Composite closeBar = null;
- Composite cmpBar = null;
+ Listener selbarListener = null;
- Listener selbarListener = null;
+ final static String PREFERENCE_STATUS_BAR_ENABLE = "yes";
+ final static String PREFERENCE_STATUS_BAR_DISABLE = "no";
-
public Composite createToolBarComposite(Composite parent, boolean show) {
-
splitter = new Splitter(parent, SWT.NONE);
splitter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
/*
* The empty composite
*/
- Composite cmpTlEmpty = new Composite(splitter, SWT.NONE) {
+ cmpTlEmpty = new Composite(splitter, SWT.NONE) {
public Point computeSize(int wHint, int hHint, boolean changed) {
Point point = super.computeSize(wHint, hHint, changed);
point.y = 1;
@@ -70,59 +82,95 @@
cmpTlEmpty.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- // Main composite of the visivle splitter
+ // Main composite of the visible splitter
cmpToolBar = new Composite(splitter, SWT.NONE);
cmpToolBar.setLayout(this);
-
+
GridLayout layoutTl = new GridLayout(1, false);
layoutTl.marginBottom = 0;
layoutTl.marginHeight = 0;
layoutTl.marginWidth = 0;
layoutTl.verticalSpacing = 0;
layoutTl.horizontalSpacing = 0;
-
- // Midle composite, witch contain the selectbar
+
+ // Middle composite, witch contain the selectbar
cmpBar = new Composite(cmpToolBar, SWT.NONE);
cmpBar.setLayout(layoutTl);
cmpBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ closeBar = new Composite(cmpToolBar, SWT.NONE);
+ closeBar.setLayout(layoutTl);
+ closeBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ closeSelectionBar = new ToolBar(closeBar, SWT.HORIZONTAL | SWT.FLAT);
+ ToolItem closeItem = new ToolItem(closeSelectionBar, SWT.FLAT);
+ closeItem.setImage(PlatformUI.getWorkbench().getSharedImages()
+ .getImage(ISharedImages.IMG_TOOL_DELETE));
+ closeItem.setToolTipText(VpeUIMessages.HIDE_SELECTIONBAR);
+ closeItem.addListener(SWT.Selection, new Listener() {
+
+ public void handleEvent(Event event) {
+ boolean toggleState = VpePreference.ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT
+ .getValue().equals(PREFERENCE_STATUS_BAR_ENABLE);
+ XModelObject optionsObject = ModelUtilities
+ .getPreferenceModel().getByPath(
+ VpePreference.VPE_EDITOR_PATH);
+ if (!toggleState) {
+ MessageDialogWithToggle dialog = MessageDialogWithToggle
+ .openOkCancelConfirm(
+ PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow()
+ .getShell(),
+ VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TITLE,
+ VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_MESSAGE,
+ VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE,
+ false, null, null);
+ if (dialog.getReturnCode() != IDialogConstants.OK_ID) {
+ return;
+ }
+ if (dialog.getToggleState()) {
+ optionsObject
+ .setAttributeValue(
+ VpePreference.ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT,
+ PREFERENCE_STATUS_BAR_ENABLE);
+ }
+ }
+ optionsObject.setAttributeValue(
+ VpePreference.ATT_SHOW_SELECTION_TAG_BAR,
+ PREFERENCE_STATUS_BAR_DISABLE);
+ showBar(PREFERENCE_STATUS_BAR_DISABLE);
+ }
+ });
// Create selection bar
selBar = new ToolBar(cmpBar, SWT.HORIZONTAL | SWT.FLAT);
if (show == true) {
splitter.setVisible(cmpTlEmpty, false);
splitter.setVisible(cmpToolBar, true);
- }
- else {
+ } else {
splitter.setVisible(cmpTlEmpty, true);
splitter.setVisible(cmpToolBar, false);
}
-
return splitter;
}
- public void showBar(String show) {
-
- Control[] children = splitter.getChildren();
- if (children != null && children.length > 0) {
- if (show.equals("show")) {
- splitter.setVisible(children[0], true);
- splitter.setVisible(children[1], false);
- splitter.getParent().layout(true, true);
- } else {
- splitter.setVisible(children[0], false);
- splitter.setVisible(children[1], true);
- splitter.getParent().layout(true, true);
- }
+ public void showBar(String show) {
+ if (PREFERENCE_STATUS_BAR_ENABLE.equals(show)) {
+ splitter.setVisible(cmpToolBar, true);
+ splitter.setVisible(cmpTlEmpty, false);
+ splitter.getParent().layout(true, true);
+ } else {
+ splitter.setVisible(cmpToolBar, false);
+ splitter.setVisible(cmpTlEmpty, true);
+ splitter.getParent().layout(true, true);
}
}
- public void setVpeController(VpeController vpeController) {
+ public void setVpeController(VpeController vpeController) {
this.vpeController = vpeController;
}
- public void selectionChanged() {
-
+ public void selectionChanged() {
VpeSourceSelectionBuilder sourceSelectionBuilder = new VpeSourceSelectionBuilder(
vpeController.getSourceEditor());
VpeSourceSelection selection = sourceSelectionBuilder.getSelection();
@@ -130,7 +178,7 @@
return;
}
-// Node node = selection.getFocusNode();
+ // Node node = selection.getFocusNode();
Node node = selection.getStartNode();
if (node != null && node.getNodeType() == Node.TEXT_NODE) {
node = node.getParentNode();
@@ -140,27 +188,33 @@
while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
ToolItem item = null;
if (selBar.getItemCount() > elementCounter) {
- item = selBar.getItem(selBar.getItemCount() - elementCounter - 1);
+ item = selBar.getItem(selBar.getItemCount() - elementCounter
+ - 1);
item.setData(node);
} else {
item = new ToolItem(selBar, SWT.FLAT, 0);
item.addSelectionListener(this);
- item.setData(node);
+ item.setData(node);
}
+
item.setText(node.getNodeName());
elementCounter++;
node = node.getParentNode();
}
+
itemCount = elementCounter;
cmpToolBar.layout();
+ // bug was fixed when toolbar are not shown for resizeble components
+ cmpToolBar.layout();
}
- protected Point computeSize(Composite composite, int wHint, int hHint,
- boolean flushCache) {
- return selBar.computeSize(SWT.DEFAULT, hHint);
+ protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
+ Point point = selBar.computeSize(SWT.DEFAULT, hHint);
+ point.y = closeBar.getSize().y;
+ return point;
}
- protected void layout(Composite composite, boolean flushCache) {
+ protected void layout(Composite composite, boolean flushCache) {
Rectangle rect = null;
try {
rect = composite.getBounds();
@@ -168,14 +222,20 @@
VpePlugin.getPluginLog().logError(e);
}
+ Rectangle closeBarRect = closeSelectionBar.getItem(0).getBounds();
+ rect.width -= closeBarRect.width;
+
int allItems = selBar.getItems().length;
- if (allItems == 0)
+ if (allItems == 0) {
+ cmpBar.setBounds(new Rectangle(rect.x, rect.y, rect.width,
+ closeBarRect.height));
+ closeBar.setBounds(new Rectangle(rect.width, rect.y, rect.width
+ + closeBarRect.width, closeBarRect.height));
return;
-
+ }
Rectangle r = selBar.getItem(allItems - 1).getBounds();
int width = r.x + r.width;
int height = r.height;
-
if (allItems >= itemCount) {
int x = 0;
@@ -185,41 +245,54 @@
} else {
x = selBar.getItem(allItems - itemCount).getBounds().x;
}
+
rect.x -= x;
- }
- if (rect.width < (r.x + r.width - Math.abs(rect.x) + 10)) {
- rect.x -= (r.x + r.width - Math.abs(rect.x)) - rect.width;
+ if (rect.width < (r.x + r.width - Math.abs(rect.x) + 10)) {
+ rect.x -= (r.x + r.width - Math.abs(rect.x)) - rect.width;
+ }
+
+ cmpBar.setBounds(new Rectangle(rect.x, 0, width, height));
+ selBar.setSize(width, closeBarRect.height);
+ closeBar.setBounds(new Rectangle(rect.width, rect.y, rect.width
+ + closeBarRect.width, closeBarRect.height));
}
- cmpBar.setBounds(new Rectangle(rect.x, 0, width, height));
- selBar.setSize(width, height);
}
- public void dispose() {
- if (selBar != null && (!selBar.isDisposed())) {
- for (int i =0; i < selBar.getItemCount(); i++) {
+ public void dispose() {
+ if (!selBar.isDisposed()) {
+ for (int i = 0; i < selBar.getItemCount(); i++) {
if (!selBar.getItem(i).isDisposed()) {
selBar.getItem(i).removeSelectionListener(this);
}
}
}
+ if (!closeSelectionBar.isDisposed()) {
+ for (int i = 0; i < closeSelectionBar.getItemCount(); i++) {
+ if (!closeSelectionBar.getItem(i).isDisposed()) {
+ closeSelectionBar.getItem(i).removeSelectionListener(this);
+ }
+ }
+ }
}
- public void widgetSelected(SelectionEvent e) {
+ public void widgetSelected(SelectionEvent e) {
ToolItem toolItem = (ToolItem) e.widget;
- int offset = ((ElementImpl)(Node)toolItem.getData()).getStartOffset();
- setSourceFocus(offset);
+ int offset = ((ElementImpl) toolItem.getData()).getStartOffset();
+ setSourceFocus(offset);
}
public void widgetDefaultSelected(SelectionEvent e) {
}
-
+
private void setSourceFocus(int offset) {
- vpeController.getPageContext().getSourceBuilder().getStructuredTextViewer().setSelectedRange(offset, 0);
- vpeController.getPageContext().getSourceBuilder().getStructuredTextViewer().revealRange(offset, 0);
+ vpeController.getPageContext().getSourceBuilder()
+ .getStructuredTextViewer().setSelectedRange(offset, 0);
+ vpeController.getPageContext().getSourceBuilder()
+ .getStructuredTextViewer().revealRange(offset, 0);
}
-
- public String toString() {
+
+ public String toString() {
StringBuffer st = new StringBuffer("CountItem: ");
st.append(itemCount);
st.append(" Parent Composite: " + cmpToolBar.getBounds().width);
@@ -227,5 +300,4 @@
st.append(" Bar : " + selBar.getBounds().width);
return st.toString();
}
-
}
18 years, 8 months
JBoss Tools SVN: r3234 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-08-20 11:42:56 -0400 (Mon, 20 Aug 2007)
New Revision: 3234
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
Log:
Merge the branch "jbosstools_xulrunner" with HEAD
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-08-20 14:43:55 UTC (rev 3233)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-08-20 15:42:56 UTC (rev 3234)
@@ -68,7 +68,7 @@
* xpcom flasher component which used to draw lines
*/
private inIFlasher iFlasher;
-
+ private nsIDocShell docShell = null;
//flasher contact id
private static final String FLASHER_CIID="@mozilla.org/inspector/flasher;1";
@@ -138,8 +138,12 @@
}
public nsIDocShell getDocShell() {
- nsIInterfaceRequestor interfaceRequestor = (nsIInterfaceRequestor) getWebBrowser().queryInterface(nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID);
- return (nsIDocShell) interfaceRequestor.getInterface(nsIDocShell.NS_IDOCSHELL_IID);
+ if (docShell == null) {
+ nsIInterfaceRequestor interfaceRequestor = (nsIInterfaceRequestor) getWebBrowser().queryInterface(nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID);
+ docShell = (nsIDocShell) interfaceRequestor.getInterface(nsIDocShell.NS_IDOCSHELL_IID);
+ }
+
+ return docShell;
}
public nsIDOMDocument getDOMDocument() {
18 years, 8 months