JBoss Tools SVN: r19627 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-30 14:32:49 -0500 (Wed, 30 Dec 2009)
New Revision: 19627
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5383
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 19:31:52 UTC (rev 19626)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 19:32:49 UTC (rev 19627)
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core.test;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.cdi.core.test.tck.TCKTest;
-import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.JobUtils;
-import org.osgi.framework.Bundle;
-
-/**
- * @author Alexey Kazakov
- */
-public class CATest extends TCKTest {
-
- private IProject project;
- private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
- private static final String PAGE_NAME = "WebContent/test.jsp";
- private static final String RESOURCE_NAME = "/resources/CATest/test.jsp";
- private String[] beanProposals = new String[] {"example", "example.com", "fish", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefish", "wolf"};
- private String[] propertyProposals = new String[] {"game.value", "game.initialize"};
- private final static String UI_TEST_PLUGIN_ID = "org.jboss.tools.cdi.ui.test";
-
- public CATest() {
- super();
- try {
- project = importPreparedProject("/lookup");
- Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
- String projectPath = project.getLocation().toString();
- String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();
-
- File from = new File(resourcePath);
- File to = new File(projectPath, PAGE_NAME);
-
- FileUtil.copyFile(from, to);
- caTest.setProject(project);
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle(2000);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void testEL() {
- JobUtils.waitForIdle(2000);
- caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals, false);
- caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18, propertyProposals, false);
- }
-}
\ No newline at end of file
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-12-30 19:31:52 UTC (rev 19626)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-12-30 19:32:49 UTC (rev 19627)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Alexey Kazakov
- */
-public class CDIUIAllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("CDI UI Tests");
- suite.addTestSuite(CATest.class);
- return suite;
- }
-}
\ No newline at end of file
14 years, 4 months
JBoss Tools SVN: r19626 - in trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi: ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-30 14:31:52 -0500 (Wed, 30 Dec 2009)
New Revision: 19626
Added:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5383
Copied: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test (from rev 17565, trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test)
Copied: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java (from rev 19624, trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2009-12-30 19:31:52 UTC (rev 19626)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.ui.test;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class CATest extends TCKTest {
+
+ private IProject project;
+ private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
+ private static final String PAGE_NAME = "WebContent/test.jsp";
+ private static final String RESOURCE_NAME = "/resources/CATest/test.jsp";
+ private String[] beanProposals = new String[] {"example", "example.com", "fish", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefish", "wolf"};
+ private String[] propertyProposals = new String[] {"game.value", "game.initialize"};
+ private final static String UI_TEST_PLUGIN_ID = "org.jboss.tools.cdi.ui.test";
+
+ public CATest() {
+ super();
+ try {
+ project = importPreparedProject("/lookup");
+ Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
+ String projectPath = project.getLocation().toString();
+ String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();
+
+ File from = new File(resourcePath);
+ File to = new File(projectPath, PAGE_NAME);
+
+ FileUtil.copyFile(from, to);
+ caTest.setProject(project);
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle(2000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void testEL() {
+ JobUtils.waitForIdle(2000);
+ caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals, false);
+ caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18, propertyProposals, false);
+ }
+}
\ No newline at end of file
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-09-14 19:58:51 UTC (rev 17565)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2009-12-30 19:31:52 UTC (rev 19626)
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Alexey Kazakov
- */
-public class CDIUIAllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("CDI UI Tests");
- return suite;
- }
-}
\ No newline at end of file
Copied: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java (from rev 19623, trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2009-12-30 19:31:52 UTC (rev 19626)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.ui.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class CDIUIAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("CDI UI Tests");
+ suite.addTestSuite(CATest.class);
+ return suite;
+ }
+}
\ No newline at end of file
14 years, 4 months
JBoss Tools SVN: r19625 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-12-30 14:18:59 -0500 (Wed, 30 Dec 2009)
New Revision: 19625
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5588
'More Nodes' button is always shown in the Selection Bar of VPE on Linux
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-12-30 19:15:58 UTC (rev 19624)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-12-30 19:18:59 UTC (rev 19625)
@@ -550,6 +550,7 @@
private ToolItem item;
private Composite composite;
private Image emptyImage;
+ private Image image;
public ImageButton(Composite parent, Image image, String toolTip) {
composite = new Composite(parent, SWT.NONE);
@@ -566,6 +567,7 @@
layoutTl.horizontalSpacing = 0;
composite.setLayout(layoutTl);
+ this.image = image;
ToolBar toolBar = new ToolBar(composite, SWT.HORIZONTAL | SWT.FLAT);
item = new ToolItem(toolBar, SWT.FLAT);
item.setImage(image);
@@ -599,10 +601,18 @@
composite.dispose();
composite = null;
item = null;
+ image = null;
}
}
public void setEnabled (boolean enabled) {
item.setEnabled(enabled);
+
+ // fix for JBIDE-5588
+ if (enabled) {
+ item.setImage(image);
+ } else {
+ item.setImage(emptyImage);
+ }
}
public Rectangle getButtonBounds() {
14 years, 4 months
JBoss Tools SVN: r19624 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-30 14:15:58 -0500 (Wed, 30 Dec 2009)
New Revision: 19624
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5383
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30 18:20:47 UTC (rev 19623)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30 19:15:58 UTC (rev 19624)
@@ -6,7 +6,9 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JobUtils;
@@ -45,7 +47,8 @@
File webInfTo = new File(projectPath + WEB_CONTENT_SUFFIX + WEB_INF_SUFFIX);
FileUtil.copyDir(from, webInfTo, true, true, true, new XmlFileFilter());
- }
+ }
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
JobUtils.waitForIdle();
return project;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 18:20:47 UTC (rev 19623)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 19:15:58 UTC (rev 19624)
@@ -13,7 +13,9 @@
import java.io.File;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.common.util.FileUtil;
@@ -31,7 +33,7 @@
private static final String PAGE_NAME = "WebContent/test.jsp";
private static final String RESOURCE_NAME = "/resources/CATest/test.jsp";
private String[] beanProposals = new String[] {"example", "example.com", "fish", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefish", "wolf"};
- private String[] propertyProposals = new String[] {"value", "initialize"};
+ private String[] propertyProposals = new String[] {"game.value", "game.initialize"};
private final static String UI_TEST_PLUGIN_ID = "org.jboss.tools.cdi.ui.test";
public CATest() {
@@ -47,13 +49,15 @@
FileUtil.copyFile(from, to);
caTest.setProject(project);
- JobUtils.waitForIdle();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle(2000);
} catch (Exception e) {
e.printStackTrace();
}
}
public void testEL() {
+ JobUtils.waitForIdle(2000);
caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals, false);
caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18, propertyProposals, false);
}
14 years, 4 months
JBoss Tools SVN: r19623 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-30 13:20:47 -0500 (Wed, 30 Dec 2009)
New Revision: 19623
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5383
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30 18:13:39 UTC (rev 19622)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30 18:20:47 UTC (rev 19623)
@@ -9,6 +9,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
@@ -29,22 +30,24 @@
public IProject importPreparedProject(String packPath) throws Exception {
Bundle b = Platform.getBundle(PLUGIN_ID);
- String projectPath = FileLocator.resolve(b.getEntry(PROJECT_PATH)).getFile();
+
+ IProject project = ResourcesUtils.importProject(b, PROJECT_PATH);
+ String projectPath = project.getLocation().toOSString();
String resourcePath = FileLocator.resolve(b.getEntry(TCK_RESOURCES_PREFIX)).getFile();
File from = new File(resourcePath + packPath);
if(from.isDirectory()) {
File javaSourceTo = new File(projectPath + JAVA_SOURCE_SUFFIX + PACKAGE + packPath);
- FileUtil.copyDir(from, javaSourceTo, false, true, true, new JavaFileFilter());
+ FileUtil.copyDir(from, javaSourceTo, true, true, true, new JavaFileFilter());
File webContentTo = new File(projectPath + WEB_CONTENT_SUFFIX);
- FileUtil.copyDir(from, webContentTo, false, true, true, new PageFileFilter());
+ FileUtil.copyDir(from, webContentTo, true, true, true, new PageFileFilter());
File webInfTo = new File(projectPath + WEB_CONTENT_SUFFIX + WEB_INF_SUFFIX);
- FileUtil.copyDir(from, webInfTo, false, true, true, new XmlFileFilter());
+ FileUtil.copyDir(from, webInfTo, true, true, true, new XmlFileFilter());
}
-
- return ResourcesUtils.importProject(b, PROJECT_PATH);
+ JobUtils.waitForIdle();
+ return project;
}
class JavaFileFilter implements FileFilter {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 18:13:39 UTC (rev 19622)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 18:20:47 UTC (rev 19623)
@@ -18,6 +18,7 @@
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
import org.osgi.framework.Bundle;
/**
@@ -27,31 +28,33 @@
private IProject project;
private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
- private static final String PAGE_NAME = "/resources/CATest/test.jsp";
- private String[] beanProposals = new String[] {"sheep"};
- private String[] propertyProposals = new String[] {"sheep"};
+ private static final String PAGE_NAME = "WebContent/test.jsp";
+ private static final String RESOURCE_NAME = "/resources/CATest/test.jsp";
+ private String[] beanProposals = new String[] {"example", "example.com", "fish", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefish", "wolf"};
+ private String[] propertyProposals = new String[] {"value", "initialize"};
private final static String UI_TEST_PLUGIN_ID = "org.jboss.tools.cdi.ui.test";
public CATest() {
super();
try {
project = importPreparedProject("/lookup");
- Bundle core = Platform.getBundle(PLUGIN_ID);
Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
- String projectPath = FileLocator.resolve(core.getEntry(PROJECT_PATH)).getFile();
- String resourcePath = FileLocator.resolve(ui.getEntry(PAGE_NAME)).getFile();
+ String projectPath = project.getLocation().toString();
+ String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();
File from = new File(resourcePath);
- File to = new File(projectPath, "/WebContent");
+ File to = new File(projectPath, PAGE_NAME);
FileUtil.copyFile(from, to);
+ caTest.setProject(project);
+ JobUtils.waitForIdle();
} catch (Exception e) {
e.printStackTrace();
}
}
public void testEL() {
- caTest.checkProposals(PAGE_NAME, "value=\"#{", 0, beanProposals, false);
- caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 0, propertyProposals, false);
+ caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals, false);
+ caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18, propertyProposals, false);
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-12-30 18:13:39 UTC (rev 19622)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-12-30 18:20:47 UTC (rev 19623)
@@ -20,6 +20,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("CDI UI Tests");
+ suite.addTestSuite(CATest.class);
return suite;
}
}
\ No newline at end of file
14 years, 4 months
JBoss Tools SVN: r19622 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: src/org/jboss/tools/jst/jsp/test/ca and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-12-30 13:13:39 -0500 (Wed, 30 Dec 2009)
New Revision: 19622
Removed:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForCompositeComponentTest/.settings/org.eclipse.jst.common.project.facet.core.prefs
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java
Log:
JBIDE-5586: Fix JstJspAllTests CA-related issue
CAForCompositeComponentTest is fixed
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForCompositeComponentTest/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForCompositeComponentTest/.settings/org.eclipse.jst.common.project.facet.core.prefs 2009-12-30 16:52:23 UTC (rev 19621)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForCompositeComponentTest/.settings/org.eclipse.jst.common.project.facet.core.prefs 2009-12-30 18:13:39 UTC (rev 19622)
@@ -1,4 +0,0 @@
-#Wed Jan 30 17:08:50 MSK 2008
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_07/owners=jst.java\:5.0
-classpath.helper/org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.4
-eclipse.preferences.version=1
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java 2009-12-30 16:52:23 UTC (rev 19621)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java 2009-12-30 18:13:39 UTC (rev 19622)
@@ -4,7 +4,7 @@
public class CAForCompositeComponentTest extends ContentAssistantTestCase{
TestProjectProvider provider = null;
- boolean makeCopy = false;
+ boolean makeCopy = true;
private static final String PROJECT_NAME = "CAForCompositeComponentTest";
private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
14 years, 4 months
JBoss Tools SVN: r19621 - in trunk: cdi/tests/org.jboss.tools.cdi.ui.test and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-30 11:52:23 -0500 (Wed, 30 Dec 2009)
New Revision: 19621
Added:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/CATest/
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/CATest/test.jsp
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5383
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2009-12-30 16:35:04 UTC (rev 19620)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2009-12-30 16:52:23 UTC (rev 19621)
@@ -1,4 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ resources/,\
+ projects/
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2009-12-30 16:35:04 UTC (rev 19620)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2009-12-30 16:52:23 UTC (rev 19621)
@@ -9,4 +9,12 @@
org.jboss.tools.cdi.ui,
org.jboss.tools.tests,
org.jboss.tools.cdi.core.test,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.jboss.tools.jst.jsp.test,
+ org.eclipse.jface.text,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.sse.core,
+ org.eclipse.jface,
+ org.jboss.tools.common,
+ org.eclipse.osgi,
+ org.eclipse.core.runtime
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2009-12-30 16:35:04 UTC (rev 19620)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2009-12-30 16:52:23 UTC (rev 19621)
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ resources/
Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/CATest/test.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/CATest/test.jsp (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/CATest/test.jsp 2009-12-30 16:52:23 UTC (rev 19621)
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title>JSF Test Page</title>
+ </head>
+ <body>
+ <f:view>
+ <h1>
+ <h:outputText value="#{sheep.name}"
+ rendered="#{(game.value == 'foo' and game.value == 'foo') ? game.value == 'foo' : false}"/>
+ </h1>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/CATest/test.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 16:35:04 UTC (rev 19620)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30 16:52:23 UTC (rev 19621)
@@ -10,23 +10,48 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test;
+import java.io.File;
+
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.osgi.framework.Bundle;
/**
* @author Alexey Kazakov
*/
public class CATest extends TCKTest {
- protected void setUp() throws Exception {
- IProject p = importPreparedProject("/definition/qualifier");
- }
+ private IProject project;
+ private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
+ private static final String PAGE_NAME = "/resources/CATest/test.jsp";
+ private String[] beanProposals = new String[] {"sheep"};
+ private String[] propertyProposals = new String[] {"sheep"};
+ private final static String UI_TEST_PLUGIN_ID = "org.jboss.tools.cdi.ui.test";
- public void test1() {
-
+ public CATest() {
+ super();
+ try {
+ project = importPreparedProject("/lookup");
+ Bundle core = Platform.getBundle(PLUGIN_ID);
+ Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
+ String projectPath = FileLocator.resolve(core.getEntry(PROJECT_PATH)).getFile();
+ String resourcePath = FileLocator.resolve(ui.getEntry(PAGE_NAME)).getFile();
+
+ File from = new File(resourcePath);
+ File to = new File(projectPath, "/WebContent");
+
+ FileUtil.copyFile(from, to);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- protected void tearDown() throws Exception {
- cleanProject("/definition/qualifier");
+ public void testEL() {
+ caTest.checkProposals(PAGE_NAME, "value=\"#{", 0, beanProposals, false);
+ caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 0, propertyProposals, false);
}
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-12-30 16:35:04 UTC (rev 19620)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-12-30 16:52:23 UTC (rev 19621)
@@ -2,7 +2,6 @@
import junit.framework.TestCase;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -10,9 +9,7 @@
import org.eclipse.jface.text.contentassist.IContentAssistant;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.jboss.tools.common.text.ext.util.Utils;
@@ -20,7 +17,6 @@
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.WorkbenchUtils;
public class ContentAssistantTestCase extends TestCase {
@@ -31,7 +27,7 @@
protected IContentAssistant contentAssistant = null;
protected IDocument document = null;
- protected void openEditor(String fileName) {
+ public void openEditor(String fileName) {
IEditorPart editorPart = WorkbenchUtils.openEditor(project.getName()+"/"+ fileName);
// System.out.println("openEditor: " + project.getName()+"/"+ fileName);
if (editorPart instanceof JSPMultiPageEditor)
@@ -55,11 +51,11 @@
}
- protected ICompletionProposal[] checkProposals(String fileName, int offset, String[] proposals, boolean exactly) {
+ public ICompletionProposal[] checkProposals(String fileName, int offset, String[] proposals, boolean exactly) {
return checkProposals(fileName, null, offset, proposals, exactly);
}
- protected ICompletionProposal[] checkProposals(String fileName, String substring, int offset, String[] proposals, boolean exactly){
+ public ICompletionProposal[] checkProposals(String fileName, String substring, int offset, String[] proposals, boolean exactly){
openEditor(fileName);
int position = 0;
@@ -95,7 +91,7 @@
return result;
}
- protected boolean compareProposal(String proposalName, ICompletionProposal[] proposals){
+ public boolean compareProposal(String proposalName, ICompletionProposal[] proposals){
for (int i = 0; i < proposals.length; i++) {
if (proposals[i] instanceof AutoContentAssistantProposal) {
AutoContentAssistantProposal ap = (AutoContentAssistantProposal)proposals[i];
@@ -134,11 +130,95 @@
return false;
}
- protected void closeEditor() {
+ public void closeEditor() {
if (jspEditor != null) {
PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getActivePage().closeEditor(jspEditor, false);
jspEditor = null;
}
}
+
+ /**
+ * @return the project
+ */
+ public IProject getProject() {
+ return project;
+ }
+
+ /**
+ * @param project the project to set
+ */
+ public void setProject(IProject project) {
+ this.project = project;
+ }
+
+ /**
+ * @return the jspEditor
+ */
+ public JSPMultiPageEditor getJspEditor() {
+ return jspEditor;
+ }
+
+ /**
+ * @param jspEditor the jspEditor to set
+ */
+ public void setJspEditor(JSPMultiPageEditor jspEditor) {
+ this.jspEditor = jspEditor;
+ }
+
+ /**
+ * @return the jspTextEditor
+ */
+ public JSPTextEditor getJspTextEditor() {
+ return jspTextEditor;
+ }
+
+ /**
+ * @param jspTextEditor the jspTextEditor to set
+ */
+ public void setJspTextEditor(JSPTextEditor jspTextEditor) {
+ this.jspTextEditor = jspTextEditor;
+ }
+
+ /**
+ * @return the viewer
+ */
+ public StructuredTextViewer getViewer() {
+ return viewer;
+ }
+
+ /**
+ * @param viewer the viewer to set
+ */
+ public void setViewer(StructuredTextViewer viewer) {
+ this.viewer = viewer;
+ }
+
+ /**
+ * @return the contentAssistant
+ */
+ public IContentAssistant getContentAssistant() {
+ return contentAssistant;
+ }
+
+ /**
+ * @param contentAssistant the contentAssistant to set
+ */
+ public void setContentAssistant(IContentAssistant contentAssistant) {
+ this.contentAssistant = contentAssistant;
+ }
+
+ /**
+ * @return the document
+ */
+ public IDocument getDocument() {
+ return document;
+ }
+
+ /**
+ * @param document the document to set
+ */
+ public void setDocument(IDocument document) {
+ this.document = document;
+ }
}
\ No newline at end of file
14 years, 4 months
JBoss Tools SVN: r19620 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-12-30 11:35:04 -0500 (Wed, 30 Dec 2009)
New Revision: 19620
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.project.facet.core.xml
Log:
JBIDE-5586: Fix JstJspAllTests CA-related issue
CAForIDTest is fixed
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/.jsdtscope 2009-12-30 16:09:08 UTC (rev 19619)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/.jsdtscope 2009-12-30 16:35:04 UTC (rev 19620)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.jdt.core.prefs 2009-12-30 16:09:08 UTC (rev 19619)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.jdt.core.prefs 2009-12-30 16:35:04 UTC (rev 19620)
@@ -1,7 +1,7 @@
#Fri Aug 07 19:13:22 MSD 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.component 2009-12-30 16:09:08 UTC (rev 19619)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.component 2009-12-30 16:35:04 UTC (rev 19620)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CAForID">
+<wb-module deploy-name="CAForIDTest">
<wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
-<property name="context-root" value="CAForID"/>
+<property name="context-root" value="CAForIDTest"/>
<property name="java-output-path"/>
</wb-module>
</project-modules>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-12-30 16:09:08 UTC (rev 19619)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-12-30 16:35:04 UTC (rev 19620)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.web"/>
<fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="6.0"/>
+ <installed facet="jst.java" version="5.0"/>
<installed facet="jst.web" version="2.5"/>
</faceted-project>
14 years, 4 months
JBoss Tools SVN: r19619 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/icons/images and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-12-30 11:09:08 -0500 (Wed, 30 Dec 2009)
New Revision: 19619
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/pindown.png
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/pinup.png
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/StickResTabAction.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/JavaPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4451 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -118,6 +118,10 @@
public String getQueryString() {
return queryString; // cannot use query since it might be null because of an error!
}
+ public void setQueryString(String queryString) {
+ this.queryString = queryString;
+ list = null;
+ }
public List<String> getPathNames() {
List<String> l = Collections.emptyList();
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -125,4 +125,10 @@
public static final String RELOAD = "images/reload.gif"; //$NON-NLS-1$
public static final String ERROR = "images/error.gif"; //$NON-NLS-1$
+ public static final String PINUP = "PINUP"; //$NON-NLS-1$
+ public static final String PINUP_PATH = "images/pinup.png"; //$NON-NLS-1$
+
+ public static final String PINDOWN = "PINDOWN"; //$NON-NLS-1$
+ public static final String PINDOWN_PATH = "images/pindown.png"; //$NON-NLS-1$
+
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -75,6 +75,8 @@
declareRegistryImage(CHECKBOX_FULL, "images/xpl/complete_tsk.gif"); //$NON-NLS-1$
declareRegistryImage(RELOAD, "images/reload.gif"); //$NON-NLS-1$
declareRegistryImage(ERROR, "images/error.gif"); //$NON-NLS-1$
+ declareRegistryImage(PINUP, PINUP_PATH);
+ declareRegistryImage(PINDOWN, PINDOWN_PATH);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/JavaPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/JavaPage.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/JavaPage.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -151,6 +151,11 @@
public String getQueryString() {
return criteriaCode;
}
+ public void setQueryString(String queryString) {
+ this.criteriaCode = queryString;
+ list = null;
+ ip = null;
+ }
public void release() {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -60,6 +60,7 @@
* @return
*/
public abstract String getQueryString();
+ public abstract void setQueryString(String str);
/**
* @return
*/
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/pindown.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/pindown.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/pinup.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/pinup.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.hibernate.eclipse.console;
import java.io.File;
@@ -45,7 +55,6 @@
import org.eclipse.ui.dialogs.SaveAsDialog;
import org.eclipse.ui.editors.text.TextEditor;
import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
import org.eclipse.ui.internal.editors.text.NLSUtility;
import org.eclipse.ui.part.FileEditorInput;
@@ -55,6 +64,7 @@
import org.hibernate.console.QueryInputModel;
import org.hibernate.eclipse.console.actions.ClearAction;
import org.hibernate.eclipse.console.actions.ExecuteQueryAction;
+import org.hibernate.eclipse.console.actions.StickResTabAction;
public abstract class AbstractQueryEditor extends TextEditor implements
QueryEditor, IShowEditorInput {
@@ -62,6 +72,7 @@
private ToolBarManager tbm;
private ExecuteQueryAction execAction = null;
private ClearAction clearAction = null;
+ private StickResTabAction stickResTabAction = null;
final private QueryInputModel queryInputModel;
private String defPartName;
@@ -71,6 +82,8 @@
// to enable execution of queries from files - hack for HBX-744
private String consoleConfigurationName;
+ protected boolean pinToOneResTab = false;
+
public AbstractQueryEditor() {
queryInputModel = new QueryInputModel();
}
@@ -187,9 +200,9 @@
tbm = new ToolBarManager( bar );
execAction = new ExecuteQueryAction( this );
clearAction = new ClearAction( this );
+ stickResTabAction = new StickResTabAction( this );
ActionContributionItem item = new ActionContributionItem( execAction );
-
tbm.add( item );
item = new ActionContributionItem( clearAction );
@@ -270,6 +283,10 @@
};
tbm.add(cc);
+ tbm.add( new Separator() );
+ item = new ActionContributionItem( stickResTabAction );
+ tbm.add( item );
+
tbm.update( true );
}
@@ -313,6 +330,7 @@
* @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#performSaveAs(IProgressMonitor)
* the same method except line: "dialog.setOriginalName(getSaveAsFileExtension());"
*/
+ @SuppressWarnings("restriction")
protected void performSaveAs(IProgressMonitor progressMonitor) {
Shell shell= getSite().getShell();
final IEditorInput input= getEditorInput();
@@ -457,4 +475,12 @@
}
return false;
}
+
+ public boolean getPinToOneResTab() {
+ return pinToOneResTab;
+ }
+
+ public void setPinToOneResTab(boolean pinToOneResTab) {
+ this.pinToOneResTab = pinToOneResTab;
+ }
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -45,6 +45,7 @@
public static String BuildSessionFactoryAction_exception_while_start_hibernate;
public static String BuildSessionFactoryAction_start_hibernate_resulted;
public static String ClearAction_clear_editor;
+ public static String StickResTabAction_stick_editor;
public static String CloseQueryPageAction_close_query_page;
public static String ConsoleConfigurationBasedAction_problem_while_executing;
public static String CriteriaEditorAction_hibernate_criteria_editor;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-12-30 16:09:08 UTC (rev 19619)
@@ -38,6 +38,7 @@
BuildSessionFactoryAction_exception_while_start_hibernate=Exception while connecting/starting Hibernate
BuildSessionFactoryAction_start_hibernate_resulted=Starting Hibernate resulted in a UnsupportedClassVersionError.\nThis can occur if you are running eclipse with JDK 1.4 and your domain classes require JDK 1.5. \n\nResolution: Run eclipse with JDK 1.5.
ClearAction_clear_editor=Clear editor
+StickResTabAction_stick_editor=Stick results to one tab
CloseQueryPageAction_close_query_page=Close query page
ConsoleConfigurationBasedAction_problem_while_executing=Problem while executing {0} ({1})
CriteriaEditorAction_hibernate_criteria_editor=Hibernate Criteria Editor
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/StickResTabAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/StickResTabAction.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/StickResTabAction.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.hibernate.eclipse.console.actions;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.hibernate.console.ImageConstants;
+import org.hibernate.eclipse.console.AbstractQueryEditor;
+import org.hibernate.eclipse.console.HibernateConsoleMessages;
+import org.hibernate.eclipse.console.utils.EclipseImages;
+
+/**
+ * Actor to pin/unpin query results tab to the editor.
+ *
+ * @author Vitali Yemialyanchyk
+ */
+public class StickResTabAction extends Action {
+
+ private ITextViewer fViewer;
+ private ITextEditor fTextEditor;
+
+ public StickResTabAction(ITextViewer viewer) {
+ super(HibernateConsoleMessages.StickResTabAction_stick_editor, AS_CHECK_BOX);
+ fViewer = viewer;
+ setToolTipText(HibernateConsoleMessages.StickResTabAction_stick_editor);
+ AbstractQueryEditor queryEditor = getQueryEditor();
+ boolean checked = false;
+ if (queryEditor != null) {
+ checked = queryEditor.getPinToOneResTab();
+ }
+ setChecked(checked);
+ setImageDescriptor(EclipseImages.getImageDescriptor(
+ checked ? ImageConstants.PINDOWN : ImageConstants.PINUP));
+ }
+
+ public StickResTabAction(ITextEditor textEditor) {
+ super(HibernateConsoleMessages.StickResTabAction_stick_editor, AS_CHECK_BOX);
+ fTextEditor = textEditor;
+ setToolTipText(HibernateConsoleMessages.StickResTabAction_stick_editor);
+ AbstractQueryEditor queryEditor = getQueryEditor();
+ boolean checked = false;
+ if (queryEditor != null) {
+ checked = queryEditor.getPinToOneResTab();
+ }
+ setChecked(checked);
+ setImageDescriptor(EclipseImages.getImageDescriptor(
+ checked ? ImageConstants.PINDOWN : ImageConstants.PINUP));
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.IAction#run()
+ */
+ public void run() {
+ setImageDescriptor(EclipseImages.getImageDescriptor(
+ isChecked() ? ImageConstants.PINDOWN : ImageConstants.PINUP));
+ AbstractQueryEditor queryEditor = getQueryEditor();
+ if (queryEditor != null) {
+ queryEditor.setPinToOneResTab(isChecked());
+ }
+ }
+
+ public AbstractQueryEditor getQueryEditor() {
+ if (fTextEditor instanceof AbstractQueryEditor) {
+ return (AbstractQueryEditor)fTextEditor;
+ }
+ if (fViewer instanceof AbstractQueryEditor) {
+ return (AbstractQueryEditor)fViewer;
+ }
+ return null;
+ }
+}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -56,8 +56,12 @@
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
import org.eclipse.ui.texteditor.TextOperationAction;
+import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.console.QueryPage;
+import org.hibernate.console.execution.ExecutionContext.Command;
import org.hibernate.eclipse.console.AbstractQueryEditor;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
@@ -125,6 +129,8 @@
return docSetupParticipant;
}
+ protected QueryPage queryPage = null;
+
public void executeQuery(ConsoleConfiguration cfg) {
final IWorkbenchPage activePage = getEditorSite().getPage();
try {
@@ -133,7 +139,21 @@
// ignore
}
- cfg.executeBSHQuery(getQueryString(), getQueryInputModel().getCopyForQuery() );
+ if (queryPage == null || !getPinToOneResTab()) {
+ queryPage = cfg.executeBSHQuery(getQueryString(), getQueryInputModel().getCopyForQuery() );
+ } else {
+ final ConsoleConfiguration cfg0 = cfg;
+ cfg.execute(new Command() {
+ public Object execute() {
+ KnownConfigurations.getInstance().getQueryPageModel().remove(queryPage);
+ Session session = cfg0.getSessionFactory().openSession();
+ queryPage.setQueryString(getQueryString());
+ queryPage.setSession(session);
+ KnownConfigurations.getInstance().getQueryPageModel().add(queryPage);
+ return null;
+ }
+ });
+ }
}
protected IEvaluationContext getEvaluationContext(IJavaProject project) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2009-12-30 14:32:39 UTC (rev 19618)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2009-12-30 16:09:08 UTC (rev 19619)
@@ -53,7 +53,11 @@
import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
import org.eclipse.ui.texteditor.TextOperationAction;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.hibernate.Session;
import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.console.QueryPage;
+import org.hibernate.console.execution.ExecutionContext.Command;
import org.hibernate.eclipse.console.AbstractQueryEditor;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
@@ -406,19 +410,32 @@
return getSourceViewer();
}
+ protected QueryPage queryPage = null;
+ public void executeQuery(ConsoleConfiguration cfg) {
+ final IWorkbenchPage activePage = getEditorSite().getPage();
+ try {
+ activePage.showView(QueryPageTabView.ID);
+ } catch (PartInitException e) {
+ // ignore
+ }
+ if (queryPage == null || !getPinToOneResTab()) {
+ queryPage = cfg.executeHQLQuery(getQueryString(), getQueryInputModel().getCopyForQuery() );
+ } else {
+ final ConsoleConfiguration cfg0 = cfg;
+ cfg.execute(new Command() {
+ public Object execute() {
+ KnownConfigurations.getInstance().getQueryPageModel().remove(queryPage);
+ Session session = cfg0.getSessionFactory().openSession();
+ queryPage.setQueryString(getQueryString());
+ queryPage.setSession(session);
+ KnownConfigurations.getInstance().getQueryPageModel().add(queryPage);
+ return null;
+ }
+ });
+ }
+ }
- public void executeQuery(ConsoleConfiguration cfg) {
- final IWorkbenchPage activePage = getEditorSite().getPage();
- try {
- activePage.showView(QueryPageTabView.ID);
- } catch (PartInitException e) {
- // ignore
- }
-
- cfg.executeHQLQuery(getQueryString(), getQueryInputModel().getCopyForQuery() );
- }
-
@Override
protected String getConnectedImageFilePath() {
return "icons/images/hql_editor_connect.gif"; //$NON-NLS-1$
14 years, 4 months
JBoss Tools SVN: r19618 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-30 09:32:39 -0500 (Wed, 30 Dec 2009)
New Revision: 19618
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-12-30 14:31:46 UTC (rev 19617)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-12-30 14:32:39 UTC (rev 19618)
@@ -214,4 +214,40 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddNamespace") //$NON-NLS-1$
);
+ static IFormData ESB_NOTIFICATION_LIST_DEFINITION = new FormData(
+ "Notification Lists", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("type", 100)}, //$NON-NLS-1$
+ new String[]{ENT_ESB_NOTIFICATION, ENT_ESB_NOTIFICATION_120},
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddNotificationList") //$NON-NLS-1$
+ );
+
+ static String[] getTargetEntities(String targetsEntity) {
+ XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(targetsEntity);
+ if(entity == null) {
+ return new String[]{ENT_ESB_TARGET};
+ }
+ XChild[] cs = entity.getChildren();
+ List<String> list = new ArrayList<String>();
+ for (int i = 0; i < cs.length; i++) {
+ list.add(cs[i].getName());
+ }
+ return list.toArray(new String[0]);
+ }
+
+ static IFormData ESB_TARGET_LIST_DEFINITION = new FormData(
+ "Targets", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("class", 100)}, //$NON-NLS-1$
+ getTargetEntities(ENT_ESB_NOTIFICATION),
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateTarget") //$NON-NLS-1$
+ );
+ static IFormData ESB_TARGET_120_LIST_DEFINITION = new FormData(
+ "Targets", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("class", 100)}, //$NON-NLS-1$
+ getTargetEntities(ENT_ESB_NOTIFICATION_120),
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyTarget") //$NON-NLS-1$
+ );
+
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-12-30 14:31:46 UTC (rev 19617)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-12-30 14:32:39 UTC (rev 19618)
@@ -96,6 +96,10 @@
if(entity.getChild(ConverterConstants.ROUTER_NAMESPACE_ENTITY) != null) {
list.add(ESBListsFormLayoutData.ROUTER_NAMESPACE_LIST_DEFINITION);
}
+ if(entity.getChild(ENT_ESB_NOTIFICATION) != null
+ || entity.getChild(ENT_ESB_NOTIFICATION_120) != null) {
+ list.add(ESBListsFormLayoutData.ESB_NOTIFICATION_LIST_DEFINITION);
+ }
//do nothing; when specific children exist use specific forms
} else if(entity.getChild(ENT_ESB_PROPERTY) != null) {
list.add(ESBListsFormLayoutData.ESB_PROPERTY_LIST_DEFINITION);
@@ -119,6 +123,10 @@
list.add(ESBListsFormLayoutData.ESB_SERVICE_SUB_LIST_DEFINITION);
} else if(entityName.equals(ENT_ESB_PROPERTY)) {
list.add(ModelFormLayoutData.TAG_LIST);
+ } else if(entityName.equals(ENT_ESB_NOTIFICATION)) {
+ list.add(ESBListsFormLayoutData.ESB_TARGET_LIST_DEFINITION);
+ } else if(entityName.equals(ENT_ESB_NOTIFICATION_120)) {
+ list.add(ESBListsFormLayoutData.ESB_TARGET_120_LIST_DEFINITION);
}
if(entityName.equals(ENT_ESB_SCHEDULE_PROVIDER)) {
list.add(ESBListsFormLayoutData.ESB_SCHEDULE_LIST_DEFINITION);
14 years, 4 months