JBoss Tools SVN: r43430 - in trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui: src/org/jboss/tools/openshift/egit and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-05 14:34:38 -0400 (Wed, 05 Sep 2012)
New Revision: 43430
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/core/
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/internal/test/util/
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/ui/commands/
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/plugin.xml
Log:
[JBIDE-12543] removed 'push and commit' command, handler, menu
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/plugin.xml 2012-09-05 17:55:09 UTC (rev 43429)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/plugin.xml 2012-09-05 18:34:38 UTC (rev 43430)
@@ -1,80 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension
- point="org.eclipse.ui.commands">
- <command
- description="psuhes and commits"
- id="org.jboss.ide.eclipse.as.egit.ui.commands.CommitAndPushCommand"
- name="pushAndCommit">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.jboss.tools.openshift.egit.ui.commands.CommitAndPushHandler"
- commandId="org.jboss.ide.eclipse.as.egit.ui.commands.CommitAndPushCommand">
- <activeWhen>
- <and>
- <count
- value="+">
- </count>
- <iterate>
- <or>
- <adapt
- type="org.eclipse.core.resources.IResource">
- </adapt>
- <adapt
- type="org.eclipse.core.resources.mapping.ResourceMapping">
- </adapt>
- <adapt
- type="org.eclipse.ui.IContributorResourceAdapter">
- </adapt>
- </or>
- </iterate>
- </and>
- </activeWhen>
- </handler>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="true"
- locationURI="popup:team.main?after=group1">
- <command
- commandId="org.jboss.ide.eclipse.as.egit.ui.commands.CommitAndPushCommand"
- label="Commit and Push..."
- style="push"
- tooltip="Commit And Push...">
- <visibleWhen
- checkEnabled="false">
- <and>
- <count
- value="1">
- </count>
- <iterate>
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- property="GitResource.isShared">
- </test>
- </adapt>
- </and>
- </iterate>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.jboss.tools.openshift.egit.ui.commands.ResourcePropertyTester"
- id="org.eclipse.egit.ui.ResourceTester"
- namespace="GitResource"
- properties="isShared,isSafe,isContainer"
- type="org.eclipse.core.resources.IResource">
- </propertyTester>
- </extension>
</plugin>
11 years, 9 months
JBoss Tools SVN: r43429 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-05 13:55:09 -0400 (Wed, 05 Sep 2012)
New Revision: 43429
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-12418 Sometimes As-You-Type validation isn't invoked after a Java-String that contains EL is Copy-Pasted in Java editor
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-09-05 17:48:27 UTC (rev 43428)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-09-05 17:55:09 UTC (rev 43429)
@@ -111,6 +111,7 @@
import org.jboss.tools.common.validation.IJavaElementValidator;
import org.jboss.tools.common.validation.IProjectValidationContext;
import org.jboss.tools.common.validation.IStringValidator;
+import org.jboss.tools.common.validation.ITypedReporter;
import org.jboss.tools.common.validation.IValidatingProjectSet;
import org.jboss.tools.common.validation.IValidatingProjectTree;
import org.jboss.tools.common.validation.ValidationUtil;
@@ -506,6 +507,9 @@
this.document = validationContext.getDocument();
rootCdiProject = new CDIProjectAsYouType(rootCdiProject, file);
validateResource(file);
+ if(reporter instanceof ITypedReporter) {
+ ((ITypedReporter)reporter).addTypeForFile(getMarkerType());
+ }
disableProblemAnnotations(new ITextSourceReference() {
@Override
public int getStartPosition() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-05 17:48:27 UTC (rev 43428)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-05 17:55:09 UTC (rev 43429)
@@ -66,6 +66,7 @@
import org.jboss.tools.common.validation.IELValidationDelegate;
import org.jboss.tools.common.validation.IProjectValidationContext;
import org.jboss.tools.common.validation.IStringValidator;
+import org.jboss.tools.common.validation.ITypedReporter;
import org.jboss.tools.common.validation.IValidatingProjectTree;
import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.jst.web.kb.PageContextFactory;
@@ -268,6 +269,9 @@
for (ELReference elReference : references) {
validateEL(elReference, true, elContext);
}
+ if(reporter instanceof ITypedReporter) {
+ ((ITypedReporter)reporter).addTypeForRegion(getMarkerType());
+ }
}
private int markers;
11 years, 9 months
JBoss Tools SVN: r43428 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-05 13:48:27 -0400 (Wed, 05 Sep 2012)
New Revision: 43428
Added:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ITypedReporter.java
Log:
JBIDE-12418
Sometimes As-You-Type validation isn't invoked after a Java-String that contains EL is Copy-Pasted in Java editor
ITypedReported interface is added
Added: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ITypedReporter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ITypedReporter.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ITypedReporter.java 2012-09-05 17:48:27 UTC (rev 43428)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.common.validation;
+
+import java.util.Collection;
+/**
+ * Validatior-Type dependent reporter
+ *
+ * @author Victor V. Rubezhny
+ */
+public interface ITypedReporter {
+
+ /**
+ * If a validator processes whole file at once it adds types of its messages using this method
+ *
+ * @param type
+ */
+ void addTypeForFile(String type);
+
+ /**
+ * Returns the types of messages from a 'file'-validators
+ *
+ * @return
+ */
+ Collection<String> getTypesForFile();
+
+ /**
+ * If a validator processes text regions one by one it adds types of its messages using this method
+ *
+ * @param type
+ */
+ void addTypeForRegion(String type);
+
+ /**
+ * Returns the types of messages from a 'region'-validators
+ *
+ * @return
+ */
+ Collection<String> getTypesForRegion();
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ITypedReporter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
11 years, 9 months
JBoss Tools SVN: r43427 - in trunk/download.jboss.org/jbosstools/updates/requirements: juno and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 13:45:06 -0400 (Wed, 05 Sep 2012)
New Revision: 43427
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
Log:
update reqs builds for juno, eclipse, wtp from latest SR1 CR2 builds (2012-09-05)
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-09-05 17:44:56 UTC (rev 43426)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-09-05 17:45:06 UTC (rev 43427)
@@ -16,14 +16,14 @@
-f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo
-->
<target name="mirror">
- <property name="URL1" value="http://download.eclipse.org/eclipse/updates/4.2/R-4.2-201206081400/"/>
- <property name="URL2" value="http://download.eclipse.org/eclipse/updates/3.8/R-3.8-201206081200/"/>
+ <property name="URL1" value="http://download.eclipse.org/eclipse/updates/4.2-M-builds/M20120829-1200/"/>
+ <property name="URL2" value="http://download.eclipse.org/eclipse/updates/3.8-M-builds/M20120829-1000/"/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/R-4.2-201206081400/" name="Eclipse R-4.2-201206081400" />
+ <repository location="file:${destination}/M20120829-1200/" name="Eclipse M20120829-1200" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -32,6 +32,6 @@
<slicingOptions includeFeatures="true" followStrict="true" latestversiononly="false"/>
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/R-4.2-201206081400/" artifactRepository="file:${destination}/R-4.2-201206081400/" publishartifacts="true" source="${destination}/R-4.2-201206081400/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/M20120829-1200/" artifactRepository="file:${destination}/M20120829-1200/" publishartifacts="true" source="${destination}/M20120829-1200/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml 2012-09-05 17:44:56 UTC (rev 43426)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml 2012-09-05 17:45:06 UTC (rev 43427)
@@ -17,12 +17,13 @@
-->
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/juno/" />
<property name="compress" value="true" />
- <property name="URL1" value="http://download.eclipse.org/releases/juno/201206270900/" />
+ <property name="URL1" value="http://download.eclipse.org/releases/staging/" />
+ <!-- <property name="URL1" value="http://download.eclipse.org/releases/juno/201206270900/" /> -->
<target name="run" depends="mirror,regen"/>
<target name="mirror">
<p2.mirror>
- <repository location="file:${destination}/201206270900-R/" name="Juno 201206270900-R" />
+ <repository location="file:${destination}/201209031953-M/" name="Juno 201209031953-M" />
<source>
<repository location="${URL1}" />
</source>
@@ -34,8 +35,8 @@
<!-- remove OTDT patched version of o.e.jdt.core, and all other o.e.ot.otdt features/plugins -->
<delete>
- <fileset dir="${destination}/201206270900-R/" includes="**/org.eclipse.jdt.core_*OTDT*.jar*, **/org.eclipse.objectteams.otdt*.jar*"/>
+ <fileset dir="${destination}/201209031953-M/" includes="**/org.eclipse.jdt.core_*OTDT*.jar*, **/org.eclipse.objectteams.otdt*.jar*"/>
</delete>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201206270900-R/" artifactRepository="file:${destination}/201206270900-R/" publishartifacts="true" source="${destination}/201206270900-R/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201209031953-M/" artifactRepository="file:${destination}/201209031953-M/" publishartifacts="true" source="${destination}/201209031953-M/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-09-05 17:44:56 UTC (rev 43426)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-09-05 17:45:06 UTC (rev 43427)
@@ -23,13 +23,13 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.4.0/R-3.4.0-20120..."/>
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.4.1/M-3.4.1-20120..."/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/R-3.4.0-20120612174739/" name="Web Tools R-3.4.0-20120612174739" />
+ <repository location="file:${destination}/M-3.4.1-20120831042944/" name="Web Tools M-3.4.1-20120831042944" />
<source>
<repository location="${URL}" />
</source>
@@ -38,6 +38,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/R-3.4.0-20120612174739/" artifactRepository="file:${destination}/R-3.4.0-20120612174739/" publishartifacts="true" source="${destination}/R-3.4.0-20120612174739/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/M-3.4.1-20120831042944/" artifactRepository="file:${destination}/M-3.4.1-20120831042944/" publishartifacts="true" source="${destination}/M-3.4.1-20120831042944/" compress="${compress}" />
</target>
</project>
11 years, 9 months
JBoss Tools SVN: r43425 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: explorer and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-05 13:40:53 -0400 (Wed, 05 Sep 2012)
New Revision: 43425
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
Log:
fixing archive bot tests - should be stable now
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java 2012-09-05 17:20:50 UTC (rev 43424)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java 2012-09-05 17:40:53 UTC (rev 43425)
@@ -35,7 +35,6 @@
protected ProjectArchivesView openProjectArchivesView() {
ProjectArchivesView view = new ProjectArchivesView();
- view.show();
return view;
}
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-09-05 17:20:50 UTC (rev 43424)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-09-05 17:40:53 UTC (rev 43425)
@@ -12,7 +12,6 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu;
import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog;
@@ -22,6 +21,7 @@
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.condition.TreeItemContainsNode;
import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
@@ -43,62 +43,54 @@
}
public NewJarDialog createNewJarArchive() {
- SWTBotTree tree = this.bot().tree();
- return contextTool.createNewJarArchive(tree, explorer);
+ return contextTool.createNewJarArchive(
+ this.bot().tree(), explorer);
}
public void buildProjectFull() {
- SWTBotTree tree = this.bot().tree();
- contextTool.buildProjectFull(tree, explorer);
+ contextTool.buildProjectFull(
+ this.bot().tree(), explorer);
}
public void buildArchiveFull(String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- contextTool.buildArchiveFull(tree, treeItem);
+ contextTool.buildArchiveFull(
+ this.bot().tree(), getArchive(archive));
}
public FolderCreatingDialog createFolder(String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- return contextTool.createFolder(tree, treeItem);
+ return contextTool.createFolder(
+ this.bot().tree(), getArchive(archive));
}
public FilesetDialog createFileset(String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- return contextTool.createFileset(tree, treeItem);
+ return contextTool.createFileset(
+ this.bot().tree(), getArchive(archive));
}
public UserLibrariesFilesetDialog createUserLibraryFileset(String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- return contextTool.createUserLibraryFileset(tree, treeItem);
+ return contextTool.createUserLibraryFileset(
+ this.bot().tree(), getArchive(archive));
}
public EditArchiveDialog editArchive(String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- return contextTool.editArchive(tree, treeItem);
+ return contextTool.editArchive(
+ this.bot().tree(), getArchive(archive));
}
public void deleteArchive(boolean withContextMenu, String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- contextTool.deleteArchive(tree, treeItem, withContextMenu);
+ contextTool.deleteArchive(
+ this.bot().tree(), getArchive(archive), withContextMenu);
}
public ArchivePublishSettingsDialog publishToServer(
boolean returnDialog, String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- return contextTool.publishToServer(tree, treeItem, returnDialog);
+ return contextTool.publishToServer(
+ this.bot().tree(), getArchive(archive), returnDialog);
}
public ArchivePublishSettingsDialog editPublishSettings(String archive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = explorer.getNode(archive);
- return contextTool.editPublishSettings(tree, treeItem);
+ return contextTool.editPublishSettings(
+ this.bot().tree(), getArchive(archive));
}
public boolean itemExists(String... path) {
@@ -115,6 +107,11 @@
}
}
+ private SWTBotTreeItem getArchive(String archive) {
+ bot.waitUntil(new TreeItemContainsNode(explorer, archive));
+ return explorer.getNode(archive);
+ }
+
private SWTBot bot() {
return bot;
}
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-09-05 17:20:50 UTC (rev 43424)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-09-05 17:40:53 UTC (rev 43425)
@@ -24,6 +24,7 @@
import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog;
+import org.jboss.tools.ui.bot.ext.condition.TreeContainsNode;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.JBossToolsProjectarchives;
import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -38,77 +39,71 @@
private ArchiveContextMenu contextTool = null;
+ private SWTBotTree viewTree = null;
+
public ProjectArchivesView() {
super();
viewObject = JBossToolsProjectarchives.LABEL;
+ show();
contextTool = new ArchiveContextMenu();
+ viewTree = this.bot().tree();
}
public void buildArchiveNode(String... path) {
+ show();
open.selectTreeNode(this.bot(), path);
- show();
toolbarButton(IDELabel.ArchivesView.BUTTON_BUILD_ARCHIVE_NODE).click();
}
public NewJarDialog createNewJarArchive(String project) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = tree.getTreeItem(project);
- return contextTool.createNewJarArchive(tree, treeItem);
+ return contextTool.createNewJarArchive(
+ viewTree, getArchive(project));
}
public void buildProjectFull(String project) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = tree.getTreeItem(project);
- contextTool.buildProjectFull(tree, treeItem);
+ contextTool.buildProjectFull(
+ viewTree, getArchive(project));
}
public void buildArchiveFull(String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- contextTool.buildArchiveFull(tree, treeItem);
+ contextTool.buildArchiveFull(
+ viewTree, getArchive(pathToArchive));
}
public FolderCreatingDialog createFolder(String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- return contextTool.createFolder(tree, treeItem);
+ return contextTool.createFolder(
+ viewTree, getArchive(pathToArchive));
}
public FilesetDialog createFileset(String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- return contextTool.createFileset(tree, treeItem);
+ return contextTool.createFileset(
+ viewTree, getArchive(pathToArchive));
}
public UserLibrariesFilesetDialog createUserLibraryFileset(String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- return contextTool.createUserLibraryFileset(tree, treeItem);
+ return contextTool.createUserLibraryFileset(
+ viewTree, getArchive(pathToArchive));
}
public EditArchiveDialog editArchive(String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- return contextTool.editArchive(tree, treeItem);
+ return contextTool.editArchive(
+ viewTree, getArchive(pathToArchive));
}
public void deleteArchive(boolean withContextMenu, String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- contextTool.deleteArchive(tree, treeItem, withContextMenu);
+ contextTool.deleteArchive(
+ viewTree, getArchive(pathToArchive), withContextMenu);
}
public ArchivePublishSettingsDialog publishToServer(boolean returnDialog,
String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- return contextTool.publishToServer(tree, treeItem, returnDialog);
+ return contextTool.publishToServer(
+ viewTree, getArchive(pathToArchive), returnDialog);
}
public ArchivePublishSettingsDialog editPublishSettings(String... pathToArchive) {
- SWTBotTree tree = this.bot().tree();
- SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
- return contextTool.editPublishSettings(tree, treeItem);
+ return contextTool.editPublishSettings(
+ viewTree, getArchive(pathToArchive));
}
public boolean itemExists(String... path) {
@@ -121,6 +116,11 @@
}
}
+ private SWTBotTreeItem getArchive(String... pathToArchive) {
+ bot.waitUntil(new TreeContainsNode(viewTree, pathToArchive));
+ return TreeHelper.expandNode(this.bot(), pathToArchive);
+ }
+
private SWTBotToolbarButton toolbarButton(String toolbarToolTip) {
List<SWTBotToolbarButton> toolbarButtons = getToolbarButtons();
for (SWTBotToolbarButton button : toolbarButtons) {
11 years, 9 months
JBoss Tools SVN: r43424 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 13:20:50 -0400 (Wed, 05 Sep 2012)
New Revision: 43424
Modified:
trunk/build/target-platform/jbds.target
Log:
jbds.target is now identical to multiple.target... maybe multiple.target can be purged and we can just use the jbds.target file from now on\?
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-09-05 16:32:39 UTC (rev 43423)
+++ trunk/build/target-platform/jbds.target 2012-09-05 17:20:50 UTC (rev 43424)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
<target includeMode="feature" name="e42-wtp34-jbds6">
- <!-- Pro tip: to convert
- from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
- to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
- using vi, apply this transform:
- :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
- -->
+ <!-- Pro tip: to convert
+ from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
+ using vi, apply this transform:
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
+ -->
<locations>
- <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0a/"/>
11 years, 9 months