JBoss Tools SVN: r12912 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-01-06 19:52:58 -0500 (Tue, 06 Jan 2009)
New Revision: 12912
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
Log:
JBIDE-3493 nautilus command in "explore" action fails
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-01-06 22:03:00 UTC (rev 12911)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-01-07 00:52:58 UTC (rev 12912)
@@ -35,6 +35,7 @@
public final static String EXPLORE = "Explore";
public final static String EXPLORE_DESCRIPTION = "Explore deploy directory";
private static String exploreFolderCommand;
+ private static String[] exploreFolderCommandArray;
private static String exploreFileCommand;
public static String getExploreCommand() {
@@ -62,11 +63,16 @@
exploreFileCommand = "cmd /C start explorer /select,/e,\""
+ PATH + "\"";
} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
+
if (new File("/usr/bin/nautilus").exists()) {
- exploreFolderCommand = "/usr/bin/nautilus --no-desktop \"" + PATH + "\"";
+ exploreFolderCommandArray = new String[3];
+ exploreFolderCommandArray[0]="/usr/bin/nautilus";
+ exploreFolderCommandArray[1]="--no-desktop";
+ exploreFolderCommand = "";
} else if (new File("/usr/bin/konqueror").exists()) {
- exploreFolderCommand = "/usr/bin/konqueror \"" + PATH
- + "\"";
+ exploreFolderCommandArray = new String[2];
+ exploreFolderCommandArray[0]="/usr/bin/konqueror";
+ exploreFolderCommand = "";
}
exploreFileCommand = exploreFolderCommand;
}
@@ -108,9 +114,16 @@
if (Platform.getOS().equals(Platform.OS_WIN32)) {
name = name.replace('/', '\\');
}
- command = command.replace(ExploreUtils.PATH, name);
+
try {
- Runtime.getRuntime().exec(command);
+ if (Platform.OS_LINUX.equals(Platform.getOS())) {
+ int len = exploreFolderCommandArray.length;
+ exploreFolderCommandArray[len-1] = name;
+ Runtime.getRuntime().exec(exploreFolderCommandArray);
+ } else {
+ command = command.replace(ExploreUtils.PATH, name);
+ Runtime.getRuntime().exec(command);
+ }
} catch (IOException e) {
JBossServerUIPlugin.log(e.getMessage(),e);
}
17 years, 3 months
JBoss Tools SVN: r12911 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-06 17:03:00 -0500 (Tue, 06 Jan 2009)
New Revision: 12911
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-3495
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-06 21:03:50 UTC (rev 12910)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-06 22:03:00 UTC (rev 12911)
@@ -10,7 +10,7 @@
rwf_Explanation=A JBoss Server runtime references a JBoss installation directory.\nIt can be used to set up classpaths for projects which depend on this runtime,\nas well as by a "server" which will be able to start and stop instances of JBoss.
rwf_BaseName=JBoss _VERSION_ Runtime
rwf_NameInUse=Runtime name already in use
-rwf_invalidDirectory=Invalid Directory
+rwf_invalidDirectory=The home directory does not exist, is missing key files, or is of the incorrect version.
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
swf_Title=Create a new JBoss Server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-01-06 21:03:50 UTC (rev 12910)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-01-06 22:03:00 UTC (rev 12911)
@@ -63,6 +63,8 @@
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.JBossServerType;
+import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -442,9 +444,13 @@
}
protected boolean isHomeValid() {
- return homeDir != null
- && new Path(homeDir).append("bin").append("run.jar").toFile()
- .exists();
+ if( homeDir == null || !(new File(homeDir).exists())) return false;
+ String version = new ServerBeanLoader().getFullServerVersion(new File(homeDir, JBossServerType.AS.getSystemJarPath()));
+ IRuntime rt = (IRuntime) getTaskModel().getObject(
+ TaskModel.TASK_RUNTIME);
+ String v = rt.getRuntimeType().getVersion();
+ return new Path(homeDir).append("bin").append("run.jar").toFile().exists()
+ && version.startsWith(v);
}
private void browseHomeDirClicked() {
17 years, 3 months
JBoss Tools SVN: r12909 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-01-06 15:11:46 -0500 (Tue, 06 Jan 2009)
New Revision: 12909
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
Log:
=https://jira.jboss.org/jira/browse/JBIDE-3484, size was adjusted for windows
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-06 19:59:21 UTC (rev 12908)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-06 20:11:46 UTC (rev 12909)
@@ -111,7 +111,7 @@
// http://jira.jboss.com/jira/browse/JBIDE-2010
String os_name = System.getProperty("os.name"); //$NON-NLS-1$
if (os_name != null && os_name.indexOf("Windows") >= 0) { //$NON-NLS-1$
- return new Point(800, 230);
+ return new Point(500, 230);
}
// changed by estherbin
// http://jira.jboss.com/jira/browse/JBIDE-2010
17 years, 3 months
JBoss Tools SVN: r12908 - in trunk/vpe/plugins: org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-01-06 14:59:21 -0500 (Tue, 06 Jan 2009)
New Revision: 12908
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
Log:
=https://jira.jboss.org/jira/browse/JBIDE-3484, size was adjusted for OSX
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-06 19:48:12 UTC (rev 12907)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-06 19:59:21 UTC (rev 12908)
@@ -115,7 +115,7 @@
}
// changed by estherbin
// http://jira.jboss.com/jira/browse/JBIDE-2010
- return new Point(400, 270);
+ return new Point(400, 285);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java 2009-01-06 19:48:12 UTC (rev 12907)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java 2009-01-06 19:59:21 UTC (rev 12908)
@@ -83,7 +83,7 @@
public Control createControl(Composite parent) {
Group g = new Group(parent, SWT.SHADOW_ETCHED_IN);
- GridData data = new GridData(GridData.FILL_BOTH);
+ GridData data = new GridData(GridData.FILL_HORIZONTAL);
GridLayout layout = new GridLayout(1, false);
g.setLayout(layout);
g.setLayoutData(data);
17 years, 3 months
JBoss Tools SVN: r12907 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-06 14:48:12 -0500 (Tue, 06 Jan 2009)
New Revision: 12907
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
Log:
JBIDE-3493
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-01-06 19:46:52 UTC (rev 12906)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-01-06 19:48:12 UTC (rev 12907)
@@ -63,7 +63,7 @@
+ PATH + "\"";
} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
if (new File("/usr/bin/nautilus").exists()) {
- exploreFolderCommand = "/usr/bin/nautilus \"" + PATH + "\"";
+ exploreFolderCommand = "/usr/bin/nautilus --no-desktop \"" + PATH + "\"";
} else if (new File("/usr/bin/konqueror").exists()) {
exploreFolderCommand = "/usr/bin/konqueror \"" + PATH
+ "\"";
17 years, 3 months
JBoss Tools SVN: r12906 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-01-06 14:46:52 -0500 (Tue, 06 Jan 2009)
New Revision: 12906
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
Log:
=https://jira.jboss.org/jira/browse/JBIDE-3484
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-06 18:59:33 UTC (rev 12905)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-06 19:46:52 UTC (rev 12906)
@@ -111,11 +111,11 @@
// http://jira.jboss.com/jira/browse/JBIDE-2010
String os_name = System.getProperty("os.name"); //$NON-NLS-1$
if (os_name != null && os_name.indexOf("Windows") >= 0) { //$NON-NLS-1$
- return new Point(800, 300);
+ return new Point(800, 230);
}
// changed by estherbin
// http://jira.jboss.com/jira/browse/JBIDE-2010
- return new Point(600, 350);
+ return new Point(400, 270);
}
}
17 years, 3 months
JBoss Tools SVN: r12905 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-01-06 13:59:33 -0500 (Tue, 06 Jan 2009)
New Revision: 12905
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3482
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java 2009-01-06 18:59:33 UTC (rev 12905)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
+import org.mozilla.interfaces.nsIDOMElement;
+
+
+/**
+ * @author mareshkau
+ * Test case for https://jira.jboss.org/jira/browse/JBIDE-3482
+ */
+public class JBIDE3482Test extends ComponentContentTest{
+
+ public JBIDE3482Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE3482() throws Throwable {
+ performContentTest("JBIDE/3482/jbide3482.xhtml"); //$NON-NLS-1$
+ }
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+ @Override
+ protected nsIDOMElement findElementById(VpeController controller,
+ String elementId){
+ return controller.getXulRunnerEditor().getDOMDocument().getElementById(elementId);
+ }
+
+}
17 years, 3 months
JBoss Tools SVN: r12904 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144 and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-01-06 13:40:45 -0500 (Tue, 06 Jan 2009)
New Revision: 12904
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/body.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/footer.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/template.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/title.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3482
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml 2009-01-06 18:12:02 UTC (rev 12903)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -1,4 +1,4 @@
-<!1DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
@@ -15,9 +15,7 @@
<rich:scrollableDataTable style="#{test.scrolable}" width="100px;" height="100px;" >
<rich:columns style="#{test.columnsColor}"> </rich:columns>
</rich:scrollableDataTable>
-<rich:dataGrid style="#{test.richDataGrid}">
-ssssssssss
-</rich:dataGrid>
+<h:outputText style="#{test.richDataGrid}" value="ssssssssss "/>
</div>
</ui:define>
-<ui:composition>
+</ui:composition>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-06 18:12:02 UTC (rev 12903)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -45,12 +45,9 @@
</TR>
</TABLE>
</DIV>
-<TABLE STYLE="background-color: pink;" CLASS="dr-table rich-table">
-<COLGROUP SPAN="1">
-</COLGROUP>
-<TBODY>
-</TBODY>
-</TABLE>
+<SPAN STYLE="background-color: pink;">
+ssssssssss
+</SPAN>
</DIV>
</test>
</tests>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/body.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/body.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/body.xhtml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ This text should be ignored
+ <ui:composition>JBIDE-3482 Body</ui:composition>
+ This Text should be ignored
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/footer.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/footer.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/footer.xhtml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -0,0 +1 @@
+<span style="background-color: green;">JBIDE-3482</span><span style="background-color: blue;">Footer</span>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ This text should be ignored
+ <ui:composition template="/pages/JBIDE/3482/template.xhtml">
+ <ui:define name="title"><ui:include src="/pages/JBIDE/3482/title.xhtml"/></ui:define>
+ <ui:define name="body"><ui:include src="/pages/JBIDE/3482/body.xhtml" /></ui:define>
+ <ui:define name="footer"><ui:include src="/pages/JBIDE/3482/footer.xhtml" /></ui:define>
+ </ui:composition>
+ This text should be ignored
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/jbide3482.xhtml.xml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -0,0 +1,30 @@
+<tests>
+ <test id="jbide3482Test">
+<DIV ID="jbide3482Test" STYLE="-moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-only;">
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+JBIDE-3482 Header
+</SPAN>
+</DIV>
+</H1>
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+JBIDE-3482 Body
+</SPAN>
+</DIV>
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+<SPAN STYLE="background-color: green; -moz-user-modify: read-only;">
+<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+JBIDE-3482
+</SPAN>
+</SPAN>
+<SPAN STYLE="background-color: blue; -moz-user-modify: read-only;">
+<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+Footer
+</SPAN>
+</SPAN>
+</DIV>
+</DIV>
+</test>
+</tests>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/template.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/template.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/template.xhtml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title><ui:insert name="title">Default Title</ui:insert></title>
+</head>
+
+<body>
+<div id="jbide3482Test">
+<h1>
+ <ui:insert name="title">Default Title</ui:insert>
+</h1>
+ <ui:insert name="body">Default Body</ui:insert>
+ <ui:insert name="footer">Default Footer</ui:insert>
+ </div>
+</body>
+
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/title.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/title.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3482/title.xhtml 2009-01-06 18:40:45 UTC (rev 12904)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ This text should be ignored
+<ui:component>
+ JBIDE-3482 Header
+</ui:component>
+ This Text should be ignored
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-06 18:12:02 UTC (rev 12903)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-06 18:40:45 UTC (rev 12904)
@@ -47,6 +47,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3376Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3396Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3441Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3482Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -119,6 +120,7 @@
suite.addTestSuite(JBIDE3163Test.class);
suite.addTestSuite(JBIDE3376Test.class);
suite.addTestSuite(JBIDE3396Test.class);
+ suite.addTestSuite(JBIDE3482Test.class);
// $JUnit-END$
// added by Max Areshkau
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-01-06 18:12:02 UTC (rev 12903)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-01-06 18:40:45 UTC (rev 12904)
@@ -24,7 +24,6 @@
import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Point;
@@ -37,13 +36,8 @@
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
import org.eclipse.wst.xml.core.internal.document.NodeImpl;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.project.IModelNature;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
-import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
import org.jboss.tools.vpe.VpeDebug;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.dnd.VpeDnD;
@@ -58,7 +52,6 @@
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
import org.jboss.tools.vpe.editor.template.VpeDefaultPseudoContentCreator;
-import org.jboss.tools.vpe.editor.template.VpeHtmlTemplate;
import org.jboss.tools.vpe.editor.template.VpeTagDescription;
import org.jboss.tools.vpe.editor.template.VpeTemplate;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
@@ -71,6 +64,7 @@
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.TextUtil;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
+import org.jboss.tools.vpe.editor.util.VpeDebugUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.jboss.tools.vpe.resref.core.CSSReferenceList;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
@@ -124,8 +118,6 @@
// TODO Max Areshkau JBIDE-1457
// boolean rebuildFlag = false;
- /** faceletFile */
- private boolean faceletFile = false;
private static final String ATTR_VPE = "vpe"; //$NON-NLS-1$
private static final String ATTR_VPE_INLINE_LINK_VALUE = "inlinelink"; //$NON-NLS-1$
@@ -184,11 +176,11 @@
dropper = new VpeDnd();
dropper.setDndData(false, true);
- if (isFacelet()) {
- faceletFile = true;
- } else {
- faceletFile = false;
- }
+// if (isFacelet()) {
+// faceletFile = true;
+// } else {
+// faceletFile = false;
+// }
this.showInvisibleTags = Constants.YES_STRING
.equals(VpePreference.SHOW_INVISIBLE_TAGS.getValue());
@@ -213,11 +205,10 @@
pageContext.refreshConnector();
pageContext.installIncludeElements();
- if (isFacelet()) {
- Element root = FaceletUtil.getRootFaceletElement(sourceDocument);
- if (root != null) {
+// if (isFacelet()) {
+ Element root = FaceletUtil.findComponentElement(sourceDocument.getDocumentElement());
+ if (root != null) {
addNode(root, null, getContentArea());
- }
} else {
addChildren(null, sourceDocument, getContentArea());
}
@@ -2264,40 +2255,40 @@
return visualEditor.getDomDocument();
}
- /**
- * Check this file is facelet
- *
- * @return this if file is facelet, otherwize false
- */
- private boolean isFacelet() {
- boolean isFacelet = false;
+// /**
+// * Check this file is facelet
+// *
+// * @return this if file is facelet, otherwize false
+// */
+// private boolean isFacelet() {
+// boolean isFacelet = false;
+//
+// IEditorInput iEditorInput = pageContext.getEditPart().getEditorInput();
+// if (iEditorInput instanceof IFileEditorInput) {
+// IFileEditorInput iFileEditorInput = (IFileEditorInput) iEditorInput;
+//
+// IFile iFile = iFileEditorInput.getFile();
+//
+// IProject project = iFile.getProject();
+// IModelNature nature = EclipseResourceUtil.getModelNature(project);
+// if (nature != null) {
+// XModel model = nature.getModel();
+// XModelObject webXML = WebAppHelper.getWebApp(model);
+// XModelObject param = WebAppHelper.findWebAppContextParam(
+// webXML, "javax.faces.DEFAULT_SUFFIX"); //$NON-NLS-1$
+// if (param != null) {
+// String value = param.getAttributeValue("param-value"); //$NON-NLS-1$
+//
+// if (value.length() != 0 && iFile.getName().endsWith(value)) {
+// isFacelet = true;
+// }
+// }
+// }
+// }
+//
+// return isFacelet;
+// }
- IEditorInput iEditorInput = pageContext.getEditPart().getEditorInput();
- if (iEditorInput instanceof IFileEditorInput) {
- IFileEditorInput iFileEditorInput = (IFileEditorInput) iEditorInput;
-
- IFile iFile = iFileEditorInput.getFile();
-
- IProject project = iFile.getProject();
- IModelNature nature = EclipseResourceUtil.getModelNature(project);
- if (nature != null) {
- XModel model = nature.getModel();
- XModelObject webXML = WebAppHelper.getWebApp(model);
- XModelObject param = WebAppHelper.findWebAppContextParam(
- webXML, "javax.faces.DEFAULT_SUFFIX"); //$NON-NLS-1$
- if (param != null) {
- String value = param.getAttributeValue("param-value"); //$NON-NLS-1$
-
- if (value.length() != 0 && iFile.getName().endsWith(value)) {
- isFacelet = true;
- }
- }
- }
- }
-
- return isFacelet;
- }
-
/**
* @return the xulRunnerEditor
*/
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2009-01-06 18:12:02 UTC (rev 12903)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2009-01-06 18:40:45 UTC (rev 12904)
@@ -20,6 +20,7 @@
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException;
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
import org.jboss.tools.vpe.editor.template.expression.VpeValue;
+import org.jboss.tools.vpe.editor.util.FaceletUtil;
import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -118,7 +119,14 @@
VpeCreationData creationData = new VpeCreationData(visualNewElement);
if (children) {
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualNewElement);
- NodeList sourceChildren = sourceDocument.getChildNodes();
+ Element root = FaceletUtil.findComponentElement(sourceDocument.getDocumentElement());
+ NodeList sourceChildren=null;
+ //fix for JBIDE-3482
+ if(root==null) {
+ sourceChildren = sourceDocument.getChildNodes();
+ } else {
+ sourceChildren = root.getChildNodes();
+ }
int len = sourceChildren.getLength();
for (int i = 0; i < len; i++) {
childrenInfo.addSourceChild(sourceChildren.item(i));
17 years, 3 months
JBoss Tools SVN: r12903 - trunk/as/docs/reference/en.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-01-06 13:12:02 -0500 (Tue, 06 Jan 2009)
New Revision: 12903
Modified:
trunk/as/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-400
Modified: trunk/as/docs/reference/en/master.xml
===================================================================
--- trunk/as/docs/reference/en/master.xml 2009-01-06 18:11:11 UTC (rev 12902)
+++ trunk/as/docs/reference/en/master.xml 2009-01-06 18:12:02 UTC (rev 12903)
@@ -22,7 +22,7 @@
<!ENTITY strutstutoriallink "../../struts_tools_tutorial/html_single/index.html">
-]>
+]>
<book>
17 years, 3 months
JBoss Tools SVN: r12902 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-01-06 13:11:11 -0500 (Tue, 06 Jan 2009)
New Revision: 12902
Modified:
trunk/as/docs/reference/en/modules/perspective.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-400
Modified: trunk/as/docs/reference/en/modules/perspective.xml
===================================================================
--- trunk/as/docs/reference/en/modules/perspective.xml 2009-01-06 18:09:49 UTC (rev 12901)
+++ trunk/as/docs/reference/en/modules/perspective.xml 2009-01-06 18:11:11 UTC (rev 12902)
@@ -696,8 +696,8 @@
</mediaobject>
</figure>
- <para>The page is pretty simple. First it asks is setting the name of your new archive
- and a destination.</para>
+ <para>The page is pretty simple. First it asks to set the name of your new archive
+ and a destination.</para>
<para>The destination of an archive can be anywhere on the file system, anywhere in the
workspace, inside some other archive, or inside a folder declared inside an archive.
@@ -727,6 +727,16 @@
proper chechbox in the <emphasis>
<property>Archive type</property>
</emphasis> section.</para>
+ <para>If a build or incremental update fails Project Archives will show an error dialog:</para>
+ <figure>
+ <title>Selecting the destination in the workspace</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/projectarchives_error.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click in <emphasis><property>Details</property></emphasis> to see detailed information about what caused the error.</para>
<para>In the <property>Package Explorer</property> you can observe the created
archive.</para>
17 years, 3 months