JBoss Tools SVN: r39448 - workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-12 19:10:50 -0400 (Mon, 12 Mar 2012)
New Revision: 39448
Modified:
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.jar
Log:
Fixed Enterprise support
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.jar
===================================================================
(Binary files differ)
14 years
JBoss Tools SVN: r39446 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-12 18:32:51 -0400 (Mon, 12 Mar 2012)
New Revision: 39446
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-jbds50.xml
Log:
JBIDE-10823 JBoss Central Quickstarts Updates
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-jbds50.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-jbds50.xml 2012-03-12 20:54:50 UTC (rev 39445)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-jbds50.xml 2012-03-12 22:32:51 UTC (rev 39446)
@@ -1,6 +1,6 @@
<projects>
<project>
- <category>JBoss AS 7 Quickstarts</category>
+ <category>JBoss Quickstarts</category>
<name>helloworld</name>
<included-projects>jboss-as-helloworld</included-projects>
<shortDescription>Helloworld</shortDescription>
@@ -43,7 +43,7 @@
</project>
<project>
- <category>JBoss AS 7 Quickstarts</category>
+ <category>JBoss Quickstarts</category>
<name>helloworld-osgi</name>
<included-projects>jboss-as-helloworld-osgi</included-projects>
<shortDescription>Helloworld OSGi Example</shortDescription>
@@ -89,7 +89,7 @@
<project>
- <category>JBoss AS 7 Quickstarts</category>
+ <category>JBoss Quickstarts</category>
<name>login</name>
<included-projects>jboss-as-login</included-projects>
<shortDescription>Login</shortDescription>
@@ -132,7 +132,7 @@
</project>
<project>
- <category>JBoss AS 7 Quickstarts</category>
+ <category>JBoss Quickstarts</category>
<name>numberguess</name>
<included-projects>jboss-as-numberguess</included-projects>
<shortDescription>Numberguess</shortDescription>
@@ -175,7 +175,7 @@
</project>
<project>
- <category>JBoss AS 7 Quickstarts</category>
+ <category>JBoss Quickstarts</category>
<name>kitchensink</name>
<included-projects>jboss-as-kitchensink</included-projects>
<shortDescription>Kitchensink</shortDescription>
@@ -218,7 +218,7 @@
<icon path="icons/jboss.png" />
</project>
<project>
- <category>JBoss AS 7 Quickstarts</category>
+ <category>JBoss Quickstarts</category>
<name>helloworld-html5</name>
<included-projects>helloworld-html5</included-projects>
<shortDescription>HTML5</shortDescription>
14 years
JBoss Tools SVN: r39445 - in workspace/fred/repositories/snapshot/org/jboss/spec/archetypes: jboss-javaee6-webapp-archetype and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-12 16:54:50 -0400 (Mon, 12 Mar 2012)
New Revision: 39445
Added:
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.pom
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.pom
Log:
Temp workaround : Add fixed archetypes compatible with Forge
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-archetype/7.0.2.CR2b/jboss-javaee6-webapp-archetype-7.0.2.CR2b.pom 2012-03-12 20:54:50 UTC (rev 39445)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>6-beta-2</version>
+ </parent>
+
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-webapp-archetype</artifactId>
+ <version>7.0.2.CR2b</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Java EE 6 Webapp</name>
+
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 (by default) or EAP 6 (if the "enterprise" property is true)</description>
+
+ <url>http://jboss.org/jbossas</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <email>stevenboscarine(a)gmail.com</email>
+ </developer>
+ <developer>
+ <id>fbricon</id>
+ <name>Fred Bricon</name>
+ <email>fbricon(a)gmail.com</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/fbricon</url>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <email>dan.j.allen(a)gmail.com</email>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/dan.j.allen</url>
+ </developer>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ </developers>
+
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-webapp-ear-archetype/7.0.2.CR2b/jboss-javaee6-webapp-ear-archetype-7.0.2.CR2b.pom 2012-03-12 20:54:50 UTC (rev 39445)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+ required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License. -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>6-beta-2</version>
+ </parent>
+
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-webapp-ear-archetype</artifactId>
+ <version>7.0.2.CR2b</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>JBoss AS 7 / Java EE 6 EAR Webapp</name>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 (by default) or EAP 6 (if the "enterprise" property is true). The project is an EAR, with an EJB-JAR and WAR</description>
+
+ <url>http://jboss.org/jbossas</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <email>stevenboscarine(a)gmail.com</email>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <email>dan.j.allen(a)gmail.com</email>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/dan.j.allen</url>
+ </developer>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ <developer>
+ <id>fbricon</id>
+ <name>Fred Bricon</name>
+ <email>fbricon(a)gmail.com</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/fbricon</url>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
14 years
JBoss Tools SVN: r39443 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-03-12 12:23:07 -0400 (Mon, 12 Mar 2012)
New Revision: 39443
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
Log:
https://issues.jboss.org/browse/JBIDE-10711 - patch2 has been applied: when xulrunner is not supported -- source tab will be loaded by default.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2012-03-12 16:09:32 UTC (rev 39442)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2012-03-12 16:23:07 UTC (rev 39443)
@@ -107,6 +107,17 @@
private static final String VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME = "visulaEditorImplementations"; //$NON-NLS-1$
private IVisualEditor visualEditor;
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10711
+ * Set the xulRunnerBrowser state.
+ */
+ private boolean xulRunnerBrowserIsNotSupported = false;
+ /*
+ * Flag that indicates that the editor
+ * is being creating for the first time,
+ * i.e. part is initializing.
+ */
+ private boolean vpeIsCreating = true;
private int visualSourceIndex;
private int sourceIndex;
@@ -246,18 +257,64 @@
public void pageChange(int newPageIndex) {
selectedPageIndex = newPageIndex;
if (visualEditor != null) {
- if (newPageIndex == visualSourceIndex) {
+ if (selectedPageIndex == visualSourceIndex) {
if (visualEditor.getVisualEditor() == null) {
visualEditor.createVisualEditor();
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10711
+ * XulRunnerBrowser could be not supported.
+ * So there should be special handling when
+ * VisualEditor is created for the first time.
+ */
+ if (isXulRunnerBrowserNotSupported() && vpeIsCreating) {
+ /*
+ * Set Source tab as default
+ */
+ visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE);
+ selectedPageIndex = IVisualEditor.SOURCE_MODE;
+ setActivePage(selectedPageIndex);
+ } else {
+ /*
+ * Use default behavior for tab switching
+ * when the JSPEditor has already been initialized,
+ * but visual part is loaded for the first time.
+ */
+ visualEditor.setVisualMode(IVisualEditor.VISUALSOURCE_MODE);
+ }
+ } else {
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10711
+ * Use default behavior for tab switching
+ * when visual editor is not null.
+ */
+ visualEditor.setVisualMode(IVisualEditor.VISUALSOURCE_MODE);
}
- visualEditor.setVisualMode(IVisualEditor.VISUALSOURCE_MODE);
- } else if (newPageIndex == sourceIndex)
+ } else if (selectedPageIndex == sourceIndex)
visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE);
- else if (newPageIndex == getPreviewIndex()) {
+ else if (selectedPageIndex == getPreviewIndex()) {
if (visualEditor.getPreviewWebBrowser() == null) {
visualEditor.createPreviewBrowser();
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10711
+ */
+ if (isXulRunnerBrowserNotSupported() && vpeIsCreating) {
+ /*
+ * Set Source tab as default
+ */
+ visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE);
+ selectedPageIndex = IVisualEditor.SOURCE_MODE;
+ setActivePage(selectedPageIndex);
+ } else {
+ /*
+ * Use default behavior for tab switching
+ * when the JSPEditor has already been initialized,
+ * but preview part is loaded for the first time.
+ */
+ visualEditor.setVisualMode(IVisualEditor.PREVIEW_MODE);
+ }
+ } else {
+ visualEditor.setVisualMode(IVisualEditor.PREVIEW_MODE);
}
- visualEditor.setVisualMode(IVisualEditor.PREVIEW_MODE);
}
}
@@ -266,7 +323,7 @@
commandService.refreshElements(SelectionBarHandler.COMMAND_ID, null);
getSelectionBar().refreshVisibility();
- superPageChange(newPageIndex);
+ superPageChange(selectedPageIndex);
JspEditorPlugin.getDefault().getPreferenceStore().
setValue(IVpePreferencesPage.DEFAULT_VPE_TAB, selectedPageIndex);
}
@@ -422,11 +479,9 @@
}
protected void createPages() {
-
try {
createPagesForVPE();
loadSelectedTab();
-
switch (selectedPageIndex) {
case 0: {
// source/visual mode
@@ -460,6 +515,11 @@
}
} catch (PartInitException e) {
JspEditorPlugin.getPluginLog().logError(e);
+ } finally {
+ /*
+ * Indicate that VPE pages have been created.
+ */
+ vpeIsCreating = false;
}
}
@@ -856,6 +916,15 @@
return pr;
}
+ public boolean isXulRunnerBrowserNotSupported() {
+ return xulRunnerBrowserIsNotSupported;
+ }
+
+ public void setXulRunnerBrowserIsNotSupported(
+ boolean xulRunnerBrowserIsNotSupported) {
+ this.xulRunnerBrowserIsNotSupported = xulRunnerBrowserIsNotSupported;
+ }
+
class ResourceChangeListener implements IResourceChangeListener {
IEditorPart editorPart;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2012-03-12 16:09:32 UTC (rev 39442)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2012-03-12 16:23:07 UTC (rev 39443)
@@ -64,6 +64,7 @@
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.bundle.BundleMap;
import org.jboss.tools.jst.jsp.editor.IVisualEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.StorageRevisionEditorInputAdapter;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
@@ -76,6 +77,7 @@
import org.jboss.tools.vpe.editor.xpl.CustomSashForm.ICustomSashFormListener;
import org.jboss.tools.vpe.editor.xpl.EditorSettings;
import org.jboss.tools.vpe.editor.xpl.SashSetting;
+import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
@SuppressWarnings("restriction")
public class VpeEditorPart extends EditorPart implements
@@ -765,6 +767,18 @@
} catch (PartInitException e) {
VpePlugin.reportProblem(e);
}
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10711
+ */
+ if (!XulRunnerBrowser.isCurrentPlatformOfficiallySupported()) {
+ if (multiPageEditor instanceof JSPMultiPageEditor) {
+ JSPMultiPageEditor jspMultiPageEditor = (JSPMultiPageEditor) multiPageEditor;
+ /*
+ * Set the flag in JSPMultiPageEditor
+ */
+ jspMultiPageEditor.setXulRunnerBrowserIsNotSupported(true);
+ }
+ }
}
@Override
14 years
JBoss Tools SVN: r39442 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: mozilla and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-03-12 12:09:32 -0400 (Mon, 12 Mar 2012)
New Revision: 39442
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
https://issues.jboss.org/browse/JBIDE-11271 - Remove old VPE toolbar composite from MozillaEditor.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2012-03-12 14:34:38 UTC (rev 39441)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2012-03-12 16:09:32 UTC (rev 39442)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.vpe.editor;
-import org.eclipse.compare.Splitter;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -34,7 +33,6 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
@@ -112,9 +110,6 @@
private Composite sourceContent = null;
private Composite visualContent = null;
private Composite previewContent = null;
- private Splitter verticalToolbarSplitter = null;
- private Composite verticalToolbarEmpty = null;
- private ToolBar toolBar = null;
public StructuredTextEditor getSourceEditor() {
return sourceEditor;
@@ -222,9 +217,6 @@
* Restore the state after switching from Preview, for example.
*/
// selectionBar.setVisible(selectionBar.getAlwaysVisibleOption());
-// setVerticalToolbarVisible(true);
- setVerticalToolbarVisible(JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_VISUAL_TOOLBAR));
/*
* Fixes https://jira.jboss.org/jira/browse/JBIDE-3140
* author Denis Maliarevich.
@@ -256,7 +248,6 @@
case SOURCE_MODE:
// selectionBar.setVisible(selectionBar.getAlwaysVisibleOption());
- setVerticalToolbarVisible(false);
if (sourceContent != null) {
sourceContent.setVisible(true);
if (sourceEditor != null) {
@@ -291,7 +282,6 @@
// if (selectionBar != null) {
// selectionBar.setVisible(false);
// }
- setVerticalToolbarVisible(false);
/*
* Fixes https://jira.jboss.org/jira/browse/JBIDE-3140
* author Denis Maliarevich.
@@ -334,37 +324,15 @@
return visualMode;
}
- /**
- * Sets the visibility of the vertical toolbar for visual editor part.
- *
- * @param visible if visible
- */
- public void setVerticalToolbarVisible(boolean visible) {
- if ((null == verticalToolbarSplitter) || (null == verticalToolbarEmpty)
- || (null == toolBar)) {
- return;
- }
- if (visible) {
- verticalToolbarSplitter.setVisible(toolBar, true);
- verticalToolbarSplitter.setVisible(verticalToolbarEmpty, false);
- } else {
- verticalToolbarSplitter.setVisible(toolBar, false);
- verticalToolbarSplitter.setVisible(verticalToolbarEmpty, true);
- }
- verticalToolbarSplitter.getParent().layout(true, true);
- }
-
public void createPartControl(final Composite parent) {
-
controlCount++;
- if (controlCount > 1)
+ if (controlCount > 1) {
return;
+ }
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IVpeHelpContextIds.VISUAL_PAGE_EDITOR);
/*
- * Container composite for editor part
- */
- /*
+ * cmpEdTl -- is a container composite for editor part.
* Fix for https://jira.jboss.org/jira/browse/JBIDE-5744
* Where is a problem with composite parent redrawing in a case
* cmpEdTl = new Composite (parent, SWT.NONE)
@@ -372,7 +340,7 @@
* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=302950
*/
cmpEdTl = parent;
- GridLayout layoutEdTl = new GridLayout(2, false);
+ GridLayout layoutEdTl = new GridLayout(1, false);
layoutEdTl.verticalSpacing = 0;
layoutEdTl.marginHeight = 0;
layoutEdTl.marginBottom = 3;
@@ -381,32 +349,6 @@
cmpEdTl.setLayoutData(new GridData(GridData.FILL_BOTH));
/*
- * https://jira.jboss.org/jira/browse/JBIDE-4429
- * Composite for the left vertical toolbar
- */
- verticalToolbarSplitter = new Splitter(cmpEdTl, SWT.NONE);
- GridLayout layout = new GridLayout(1,false);
- layout.marginHeight = 2;
- layout.marginWidth = 0;
- layout.verticalSpacing = 0;
- layout.horizontalSpacing = 0;
- verticalToolbarSplitter.setLayout(layout);
- verticalToolbarSplitter.setLayoutData(new GridData(SWT.CENTER, SWT.TOP | SWT.FILL, false, true, 1, 2));
-
- /*
- * The empty vertical toolbar component
- */
- verticalToolbarEmpty = new Composite(verticalToolbarSplitter, SWT.NONE) {
- public Point computeSize(int wHint, int hHint, boolean changed) {
- Point point = super.computeSize(wHint, hHint, changed);
- point.x = 1;
- return point;
- }
- };
- verticalToolbarEmpty.setLayoutData(new GridData(GridData.FILL_VERTICAL));
- verticalToolbarEmpty.setVisible(true);
-
- /*
* The Visual Page Editor itself
*/
cmpEd = new Composite(cmpEdTl, SWT.BORDER);
@@ -497,11 +439,8 @@
visualContent.removeDisposeListener(this);
}
});
-
// createVisualEditor();
-
// createPreviewBrowser();
-
try {
sourceEditor.addPropertyListener(new IPropertyListener() {
public void propertyChanged(Object source, int propId) {
@@ -802,15 +741,13 @@
}
});
- toolBar = visualEditor.createVisualToolbar(verticalToolbarSplitter);
- visualEditor.createPartControl(visualContent);
-
- // initialize editor
- // this method must be invoked before any visual
- // node is created, see JBIDE-5105
- // this method should be called after browser was loading
- // see JBIDE-5161
- // visualEditor.getEditor();
+ visualEditor.createPartControl(visualContent);
+ // initialize editor
+ // this method must be invoked before any visual
+ // node is created, see JBIDE-5105
+ // this method should be called after browser was loading
+ // see JBIDE-5161
+ // visualEditor.getEditor();
}
public void createPreviewBrowser() {
@@ -846,12 +783,7 @@
visualMaxmin = null;
jumpingActivation = null;
jumping = null;
- if (verticalToolbarEmpty != null) {
- if (!verticalToolbarEmpty.isDisposed()) {
- verticalToolbarEmpty.dispose();
- }
- verticalToolbarEmpty = null;
- }
+
if (optionsObject != null) {
optionsObject.getModel().removeModelTreeListener(listener);
listener=null;
@@ -1073,12 +1005,6 @@
*/
public void updatePartAccordingToPreferences() {
/*
- * Update MozillaEditor's toolbar items
- */
- if (visualEditor != null) {
- visualEditor.updateToolbarItemsAccordingToPreferences();
- }
- /*
* When switching from Source view to Visual/Source controller could be null.
*/
if (getController() != null) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-03-12 14:34:38 UTC (rev 39441)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-03-12 16:09:32 UTC (rev 39442)
@@ -22,24 +22,15 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTError;
import org.eclipse.swt.browser.ProgressEvent;
import org.eclipse.swt.browser.ProgressListener;
import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.graphics.Color;
@@ -49,34 +40,25 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IReusableEditor;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.ui.internal.part.StatusPart;
import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.statushandlers.StatusAdapter;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mozilla.listener.EditorLoadWindowListener;
import org.jboss.tools.vpe.editor.mozilla.listener.MozillaResizeListener;
import org.jboss.tools.vpe.editor.mozilla.listener.MozillaTooltipListener;
-import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage;
-import org.jboss.tools.vpe.editor.preferences.VpeResourcesDialogFactory;
import org.jboss.tools.vpe.editor.toolbar.IVpeToolBarManager;
import org.jboss.tools.vpe.editor.toolbar.VpeDropDownMenu;
import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar;
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
-import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.xulrunner.XulRunnerException;
@@ -98,100 +80,33 @@
import org.mozilla.interfaces.nsIPlaintextEditor;
public class MozillaEditor extends EditorPart implements IReusableEditor {
- /**
- *
- */
+
protected static final File INIT_FILE = new File(VpePlugin.getDefault().getResourcePath("ve"), "init.html"); //$NON-NLS-1$ //$NON-NLS-2$
public static final String CONTENT_AREA_ID = "__content__area__"; //$NON-NLS-1$
- /*
- * Paths for tool bar icons
- */
- public static final String ICON_PREFERENCE = "icons/preference.gif"; //$NON-NLS-1$
- public static final String ICON_PREFERENCE_DISABLED = "icons/preference_disabled.gif"; //$NON-NLS-1$
- public static final String ICON_REFRESH = "icons/refresh.gif"; //$NON-NLS-1$
- public static final String ICON_REFRESH_DISABLED = "icons/refresh_disabled.gif"; //$NON-NLS-1$
- public static final String ICON_PAGE_DESIGN_OPTIONS = "icons/point_to_css.gif"; //$NON-NLS-1$
- public static final String ICON_PAGE_DESIGN_OPTIONS_DISABLED = "icons/point_to_css_disabled.gif"; //$NON-NLS-1$
- public static final String ICON_ORIENTATION_SOURCE_LEFT = "icons/source_left.gif"; //$NON-NLS-1$
- public static final String ICON_ORIENTATION_SOURCE_TOP = "icons/source_top.gif"; //$NON-NLS-1$
- public static final String ICON_ORIENTATION_VISUAL_LEFT = "icons/visual_left.gif"; //$NON-NLS-1$
- public static final String ICON_ORIENTATION_VISUAI_TOP = "icons/visual_top.gif"; //$NON-NLS-1$
- public static final String ICON_ORIENTATION_SOURCE_LEFT_DISABLED = "icons/source_left_disabled.gif"; //$NON-NLS-1$
- public static final String ICON_SHOW_BORDER_FOR_UNKNOWN_TAGS = "icons/border.gif"; //$NON-NLS-1$
- public static final String ICON_NON_VISUAL_TAGS = "icons/non-visusal-tags.gif"; //$NON-NLS-1$
- public static final String ICON_TEXT_FORMATTING = "icons/text-formatting.gif"; //$NON-NLS-1$
- public static final String ICON_BUNDLE_AS_EL= "icons/bundle-as-el.gif"; //$NON-NLS-1$
-
private XulRunnerEditor xulRunnerEditor;
private nsIDOMElement contentArea;
private nsIDOMNode headNode;
private MozillaEventAdapter mozillaEventAdapter = createMozillaEventAdapter();
-
private EditorLoadWindowListener editorLoadWindowListener;
-
private IVpeToolBarManager vpeToolBarManager;
private FormatControllerManager formatControllerManager = new FormatControllerManager();
private VpeController controller;
private boolean isRefreshPage = false;
private String doctype;
- private static Map<String, String> layoutIcons;
- private static Map<String, String> layoutNames;
- private static List<String> layoutValues;
- private int currentOrientationIndex = 1;
- private Action openVPEPreferencesAction;
- private Action visualRefreshAction;
- private Action showResouceDialogAction;
- private Action rotateEditorsAction;
- private Action showBorderAction;
- private Action showNonVisualTagsAction;
- private Action showTextFormattingAction;
- private Action showBundleAsELAction;
-
-
- static {
- /*
- * Values from <code>layoutValues</code> should correspond to the order
- * when increasing the index of the array will cause
- * the source editor rotation
- */
- layoutIcons = new HashMap<String, String>();
- layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_LEFT);
- layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_TOP);
- layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE, ICON_ORIENTATION_VISUAL_LEFT);
- layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, ICON_ORIENTATION_VISUAI_TOP);
-
- layoutNames = new HashMap<String, String>();
- layoutNames.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, VpeUIMessages.SPLITTING_HORIZ_LEFT_SOURCE_TOOLTIP);
- layoutNames.put(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE, VpeUIMessages.SPLITTING_VERT_TOP_SOURCE_TOOLTIP);
- layoutNames.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE, VpeUIMessages.SPLITTING_HORIZ_LEFT_VISUAL_TOOLTIP);
- layoutNames.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, VpeUIMessages.SPLITTING_VERT_TOP_VISUAL_TOOLTIP);
-
- layoutValues= new ArrayList<String>();
- layoutValues.add(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE);
- layoutValues.add(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE);
- layoutValues.add(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE);
- layoutValues.add(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE);
-
- }
-
/**
- * Used for manupalation of browser in design mode,
+ * Used for manipulation of browser in design mode,
* for example enable or disable readOnlyMode
*/
private nsIEditor editor;
private VpeDropDownMenu dropDownMenu = null;
- private ToolBar verBar = null;
private MozillaResizeListener resizeListener;
private MozillaTooltipListener tooltipListener;
- public void doSave(IProgressMonitor monitor) {
- }
+ public void doSave(IProgressMonitor monitor) {}
+ public void doSaveAs() {}
- public void doSaveAs() {
- }
-
public void init(IEditorSite site, IEditorInput input) throws PartInitException {
super.setSite(site);
super.setInput(input);
@@ -217,259 +132,6 @@
controller.setToolbarFormatControllerManager(formatControllerManager);
}
- public ToolBar createVisualToolbar(Composite parent) {
- final ToolBarManager toolBarManager = new ToolBarManager(SWT.VERTICAL | SWT.FLAT);
- verBar = toolBarManager.createControl(parent);
-
- /*
- * Create OPEN VPE PREFERENCES tool bar item
- */
- openVPEPreferencesAction = new Action(VpeUIMessages.PREFERENCES,
- IAction.AS_PUSH_BUTTON) {
- @Override
- public void run() {
- VpeEditorPreferencesPage.openPreferenceDialog();
- }
- };
- openVPEPreferencesAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_PREFERENCE));
- openVPEPreferencesAction.setToolTipText(VpeUIMessages.PREFERENCES);
- toolBarManager.add(openVPEPreferencesAction);
-
- /*
- * Create VPE VISUAL REFRESH tool bar item
- */
- visualRefreshAction = new Action(VpeUIMessages.REFRESH,
- IAction.AS_PUSH_BUTTON) {
- @Override
- public void run() {
- if (controller != null) {
- controller.visualRefresh();
- }
- }
- };
- visualRefreshAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_REFRESH));
- visualRefreshAction.setToolTipText(VpeUIMessages.REFRESH);
- toolBarManager.add(visualRefreshAction);
-
- /*
- * Create SHOW RESOURCE DIALOG tool bar item
- *
- * https://jira.jboss.org/jira/browse/JBIDE-3966
- * Disabling Page Design Options for external files.
- */
- IEditorInput input = getEditorInput();
- IFile file = null;
- if (input instanceof IFileEditorInput) {
- file = ((IFileEditorInput) input).getFile();
- } else if (input instanceof ILocationProvider) {
- ILocationProvider provider = (ILocationProvider) input;
- IPath path = provider.getPath(input);
- if (path != null) {
- file = FileUtil.getFile(input, path.lastSegment());
- }
- }
- boolean fileExistsInWorkspace = ((file != null) && (file.exists()));
- showResouceDialogAction = new Action(VpeUIMessages.PAGE_DESIGN_OPTIONS,
- IAction.AS_PUSH_BUTTON) {
- @Override
- public void run() {
- VpeResourcesDialogFactory.openVpeResourcesDialog(getEditorInput());
- }
- };
- showResouceDialogAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- fileExistsInWorkspace ? ICON_PAGE_DESIGN_OPTIONS : ICON_PAGE_DESIGN_OPTIONS_DISABLED));
- if (!fileExistsInWorkspace) {
- showResouceDialogAction.setEnabled(false);
- }
- showResouceDialogAction.setToolTipText(VpeUIMessages.PAGE_DESIGN_OPTIONS);
- toolBarManager.add(showResouceDialogAction);
-
-
- /*
- * Create ROTATE EDITORS tool bar item
- *
- * https://jira.jboss.org/jira/browse/JBIDE-4152
- * Compute initial icon state and add it to the tool bar.
- */
- String newOrientation = JspEditorPlugin
- .getDefault().getPreferenceStore().getString(
- IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING);
- currentOrientationIndex = layoutValues.indexOf(newOrientation);
- rotateEditorsAction = new Action(
- VpeUIMessages.VISUAL_SOURCE_EDITORS_SPLITTING,
- IAction.AS_PUSH_BUTTON) {
- @Override
- public void run() {
- /*
- * Rotate editors orientation clockwise.
- */
- currentOrientationIndex++;
- if (currentOrientationIndex >= layoutValues.size()) {
- currentOrientationIndex = currentOrientationIndex % layoutValues.size();
- }
- String newOrientation = layoutValues.get(currentOrientationIndex);
- /*
- * Update icon and tooltip
- */
- this.setImageDescriptor(ImageDescriptor.createFromFile(
- MozillaEditor.class, layoutIcons.get(newOrientation)));
-
- this.setToolTipText(layoutNames.get(newOrientation));
- /*
- * Call <code>filContainer()</code> from VpeEditorPart
- * to redraw CustomSashForm with new layout.
- */
- getController().getPageContext().getEditPart().fillContainer(true, newOrientation);
- JspEditorPlugin.getDefault().getPreferenceStore().
- setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, newOrientation);
- }
- };
- rotateEditorsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- layoutIcons.get(newOrientation)));
- rotateEditorsAction.setToolTipText(layoutNames.get(newOrientation));
- toolBarManager.add(rotateEditorsAction);
-
- /*
- * Create SHOW BORDER FOR UNKNOWN TAGS tool bar item
- */
- showBorderAction = new Action(
- VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS,
- IAction.AS_CHECK_BOX) {
- @Override
- public void run() {
- /*
- * Set new value to VpeVisualDomBuilder.
- */
- getController().getVisualBuilder().setShowBorderForUnknownTags(this.isChecked());
- /*
- * Update VPE
- */
- controller.visualRefresh();
- JspEditorPlugin.getDefault().getPreferenceStore().
- setValue(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, this.isChecked());
- }
- };
- showBorderAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_SHOW_BORDER_FOR_UNKNOWN_TAGS));
- showBorderAction.setToolTipText(VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS);
- toolBarManager.add(showBorderAction);
-
- /*
- * Create SHOW INVISIBLE TAGS tool bar item
- */
- showNonVisualTagsAction = new Action(
- VpeUIMessages.SHOW_NON_VISUAL_TAGS, IAction.AS_CHECK_BOX) {
- @Override
- public void run() {
-
- /*
- * Change flag
- */
- controller.getVisualBuilder().setShowInvisibleTags(
- this.isChecked());
- /*
- * Update VPE
- */
- controller.visualRefresh();
- JspEditorPlugin.getDefault().getPreferenceStore().
- setValue(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, this.isChecked());
- }
- };
- showNonVisualTagsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_NON_VISUAL_TAGS));
- showNonVisualTagsAction.setToolTipText(VpeUIMessages.SHOW_NON_VISUAL_TAGS);
- toolBarManager.add(showNonVisualTagsAction);
-
- /*
- * Create SHOW TEXT FORMATTING tool bar item
- */
- showTextFormattingAction = new Action(
- VpeUIMessages.SHOW_TEXT_FORMATTING, IAction.AS_CHECK_BOX) {
- @Override
- public void run() {
- /*
- * Update Text Formatting Bar
- */
- vpeToolBarManager.setToolbarVisibility(this.isChecked());
- JspEditorPlugin.getDefault().getPreferenceStore().
- setValue(IVpePreferencesPage.SHOW_TEXT_FORMATTING, this.isChecked());
- }
- };
- showTextFormattingAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_TEXT_FORMATTING));
- showTextFormattingAction.setToolTipText(VpeUIMessages.SHOW_TEXT_FORMATTING);
- toolBarManager.add(showTextFormattingAction);
-
- /*
- * Create SHOW BUNDLE'S MESSAGES AS EL tool bar item
- */
- showBundleAsELAction = new Action(VpeUIMessages.SHOW_BUNDLES_AS_EL,
- IAction.AS_CHECK_BOX) {
- @Override
- public void run() {
- /*
- * Update bundle messages.
- */
- controller.getPageContext().getBundle().updateShowBundleUsageAsEL(this.isChecked());
- controller.visualRefresh();
- JspEditorPlugin.getDefault().getPreferenceStore().
- setValue(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, this.isChecked());
- }
- };
- showBundleAsELAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_BUNDLE_AS_EL));
- showBundleAsELAction.setToolTipText(VpeUIMessages.SHOW_BUNDLES_AS_EL);
- toolBarManager.add(showBundleAsELAction);
-
- /*
- * Create EXTERNALIZE STRINGS tool bar item
- */
-// externalizeStringsAction = new Action(JstUIMessages.EXTERNALIZE_STRINGS,
-// IAction.AS_PUSH_BUTTON) {
-// @Override
-// public void run() {
-// /*
-// * Externalize strings action.
-// * Show a dialog to add properties key and value.
-// * When selection is correct show the dialog
-// * otherwise the toolbar icon will be disabled.
-// */
-// ExternalizeStringsDialog dlg = new ExternalizeStringsDialog(
-// PlatformUI.getWorkbench().getDisplay().getActiveShell(),
-// new ExternalizeStringsWizard(controller.getSourceEditor(),
-// controller.getPageContext().getBundle()));
-// dlg.open();
-// }
-// };
-// externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
-// ICON_EXTERNALIZE_STRINGS));
-// externalizeStringsAction.setToolTipText(JstUIMessages.EXTERNALIZE_STRINGS);
-// toolBarManager.add(externalizeStringsAction);
-
- updateToolbarItemsAccordingToPreferences();
- toolBarManager.update(true);
-
- parent.addDisposeListener(new DisposeListener() {
-
- public void widgetDisposed(DisposeEvent e) {
- toolBarManager.dispose();
- toolBarManager.removeAll();
- openVPEPreferencesAction = null;
- visualRefreshAction = null;
- showResouceDialogAction = null;
- rotateEditorsAction = null;;
- showBorderAction = null;
- showNonVisualTagsAction = null;
- showTextFormattingAction = null;
- showBundleAsELAction = null;
-// externalizeStringsAction = null;
- }
- });
- return verBar;
- }
-
/*
* (non-Javadoc)
* @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
@@ -494,20 +156,14 @@
layoutEdTl.marginWidth = 0;
cmpEdTl.setLayout(layoutEdTl);
cmpEdTl.setLayoutData(new GridData(GridData.FILL_BOTH));
-
+
/*
- * https://jira.jboss.org/jira/browse/JBIDE-4429
- * Toolbar was moved to VpeEditorPart.
- * 'verBar' should be created in createVisualToolbar(..) in VpeEditorPart
- * and only after that MozillaEditor should be created itself.
+ * Create VPETextFormattingToolBar
*/
- if (null != verBar) {
- // Use vpeToolBarManager to create a horizontal toolbar.
- vpeToolBarManager = new VpeToolBarManager();
- if (vpeToolBarManager != null) {
- vpeToolBarManager.createToolBarComposite(cmpEdTl);
- vpeToolBarManager.addToolBar(new TextFormattingToolBar(formatControllerManager));
- }
+ vpeToolBarManager = new VpeToolBarManager();
+ if (vpeToolBarManager != null) {
+ vpeToolBarManager.createToolBarComposite(cmpEdTl);
+ vpeToolBarManager.addToolBar(new TextFormattingToolBar(formatControllerManager));
}
//Create a composite to the Editor
@@ -530,10 +186,7 @@
try {
xulRunnerEditor = new XulRunnerEditor2(cmpEd, this);
xulRunnerEditor.getBrowser().addProgressListener(new ProgressListener() {
-
- public void changed(ProgressEvent event) {
- }
-
+ public void changed(ProgressEvent event) {}
public void completed(ProgressEvent event) {
if (MozillaEditor.this.getXulRunnerEditor().getWebBrowser() != null) {
//process this code only in case when editor hasn't been disposed,
@@ -543,17 +196,9 @@
}
}
});
-
setInitialContent();
xulRunnerEditor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
} catch (Throwable t) {
- /*
- * Disable VPE toolbar
- */
- if (verBar != null) {
- verBar.setEnabled(false);
- }
showXulRunnerError(cmpEd, t);
}
}
@@ -642,7 +287,6 @@
BusyIndicator.showWhile(link.getDisplay(), new Runnable() {
public void run() {
URL theURL = null;
- ;
try {
theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
} catch (MalformedURLException e) {
@@ -657,11 +301,8 @@
}
});
}
-
- public void mouseDoubleClick(MouseEvent e) {
- }
- public void mouseUp(MouseEvent e) {
- }
+ public void mouseDoubleClick(MouseEvent e) {}
+ public void mouseUp(MouseEvent e) {}
});
}
@@ -785,7 +426,6 @@
if (node.getNodeType() != nsIDOMNode.ELEMENT_NODE) {
throw new RuntimeException("The content area node should by element node."); //$NON-NLS-1$
}
-
area = queryInterface(node, nsIDOMElement.class);
break;
}
@@ -795,11 +435,8 @@
area = xulRunnerEditor.getDOMDocument().createElement(HTML.TAG_BODY);
xulRunnerEditor.getDOMDocument().getDocumentElement().appendChild(area);
}
-
nsIDOMNode root = xulRunnerEditor.getDOMDocument().getDocumentElement();
-
headNode = findHeadNode(root);
-
return area;
}
@@ -908,9 +545,6 @@
return mozillaEventAdapter;
}
- /**
- *
- */
public void onReloadWindow() {
detachMozillaEventAdapter();
xulRunnerEditor.removeResizeListener();
@@ -920,16 +554,13 @@
controller.reinit();
}
- /**
- *
- */
public void reload() {
-
doctype = DocTypeUtil.getDoctype(getEditorInput());
- //coused page to be refreshed
+ //cause page to be refreshed
setRefreshPage(true);
setInitialContent();
}
+
/**
* Initialized design mode in visual refresh
*/
@@ -1006,41 +637,6 @@
return dropDownMenu;
}
- public void updateToolbarItemsAccordingToPreferences() {
- String prefsOrientation = JspEditorPlugin
- .getDefault().getPreferenceStore().getString(
- IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING);
- int prefsOrientationIndex = layoutValues.indexOf(prefsOrientation);
-
- boolean prefsShowBorderForUnknownTags = JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS);
- boolean prefsShowNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
- boolean prefsShowTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING);
- boolean prefsShowBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL);
-
- if (showBorderAction != null) {
- showBorderAction.setChecked(prefsShowBorderForUnknownTags);
- }
- if (showNonVisualTagsAction != null) {
- showNonVisualTagsAction.setChecked(prefsShowNonVisualTags);
- }
- if (showTextFormattingAction != null) {
- showTextFormattingAction.setChecked(prefsShowTextFormatting);
- }
- if (showBundleAsELAction != null) {
- showBundleAsELAction.setChecked(prefsShowBundlesAsEL);
- }
- if (rotateEditorsAction != null) {
- currentOrientationIndex = prefsOrientationIndex;
- rotateEditorsAction.setImageDescriptor(ImageDescriptor.createFromFile(
- MozillaEditor.class, layoutIcons.get(prefsOrientation)));
- rotateEditorsAction.setToolTipText(layoutNames.get(prefsOrientation));
- }
- }
-
public void setResizeListener(MozillaResizeListener resizeListener) {
this.resizeListener = resizeListener;
}
14 years
JBoss Tools SVN: r39441 - trunk/documentation/whatsnew/ws.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-03-12 10:34:38 -0400 (Mon, 12 Mar 2012)
New Revision: 39441
Modified:
trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
Log:
Removing duplicate hr
Modified: trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-03-12 14:32:23 UTC (rev 39440)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-03-12 14:34:38 UTC (rev 39441)
@@ -67,12 +67,6 @@
</tr>
</tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
-
<tr>
<td colspan="2">
<hr/>
14 years
JBoss Tools SVN: r39440 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-03-12 10:32:23 -0400 (Mon, 12 Mar 2012)
New Revision: 39440
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/3.2.helios.html
trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html
trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html
Log:
refactor view names (JBDE-2055)
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/3.2.helios.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/3.2.helios.html 2012-03-12 14:31:00 UTC (rev 39439)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/3.2.helios.html 2012-03-12 14:32:23 UTC (rev 39440)
@@ -46,10 +46,10 @@
href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.tests">Tests
build</a> (build + tests, no publish)</li>
<li><a style="color: red"
- href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Stable_B...">All
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_4.1.helios/">All
components' jobs, including JBT core + drools, teiid, pi4soa, savara</a>
(build, test, publish) :: <b><a style="color: red"
- href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Stable_B...">list
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_4.1.heli...">list
of unstable jobs</a></b> - <a href=swimlanes.txt>Interdependencies between jobs, aka "swimlanes"</a></li>
<ul>
<li><a style="color: red"
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html 2012-03-12 14:31:00 UTC (rev 39439)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/3.3.indigo.html 2012-03-12 14:32:23 UTC (rev 39440)
@@ -46,10 +46,10 @@
href="https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.tests">Tests
build</a> (build + tests, no publish)</li>
<li><a style="color: red"
- href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Stable_B...">All
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_5.0.indigo/">All
components' jobs, including JBT - Core, JBT - SOA Tooling, Drools, Teiid, pi4soa, Savara</a>
(build, test, publish) :: <b><a style="color: red"
- href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Stable_B...">list
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_5.0.indi...">list
of unstable jobs</a></b> - <a href=swimlanes.txt>Interdependencies between jobs, aka "swimlanes"</a></li>
<ul>
<li><a style="color: red"
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html 2012-03-12 14:31:00 UTC (rev 39439)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html 2012-03-12 14:32:23 UTC (rev 39440)
@@ -49,7 +49,7 @@
href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Trunk/">All
components' jobs, including JBT - Core, JBT - SOA Tooling, Drools, Teiid, pi4soa, Savara</a>
(build, test, publish) :: <b><a style="color: red"
- href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Trunk/po...">list
+ href="https://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Trunk/po...">list
of unstable jobs</a></b> - <a href=swimlanes.txt>Interdependencies between jobs, aka "swimlanes"</a></li>
<ul>
<li><a style="color: red"
14 years
JBoss Tools SVN: r39439 - in trunk: freemarker/features/org.jboss.ide.eclipse.freemarker.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-03-12 10:31:00 -0400 (Mon, 12 Mar 2012)
New Revision: 39439
Modified:
trunk/birt/features/org.jboss.tools.birt.feature/build.properties
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/build.properties
Log:
fix build.properties to make Tycho 0.14 happy (?) [JBIDE-11273, JBIDE-11274]
Modified: trunk/birt/features/org.jboss.tools.birt.feature/build.properties
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.feature/build.properties 2012-03-12 14:29:38 UTC (rev 39438)
+++ trunk/birt/features/org.jboss.tools.birt.feature/build.properties 2012-03-12 14:31:00 UTC (rev 39439)
@@ -1,2 +1,3 @@
-bin.includes = feature*.*,\
- license.html
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/build.properties
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/build.properties 2012-03-12 14:29:38 UTC (rev 39438)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/build.properties 2012-03-12 14:31:00 UTC (rev 39439)
@@ -1,2 +1,3 @@
-bin.includes = feature*.*,\
- license.html
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
14 years