September 2012 - jbosstools-commits

JBoss Tools SVN: r43687 - in trunk/documentation/whatsnew/vpe: images/4.0.0.Alpha1 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2012-09-14 06:39:07 -0400 (Fri, 14 Sep 2012) New Revision: 43687 Added: trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/ChooseVPEColors.png Modified: trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html Log: https://issues.jboss.org/browse/JBIDE-12610 - n&n for vpe Added: trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/ChooseVPEColors.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/ChooseVPEColors.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html 2012-09-14 09:29:49 UTC (rev 43686) +++ trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html 2012-09-14 10:39:07 UTC (rev 43687) @@ -1,83 +1,83 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!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"> -<head> -<meta http-equiv="Content-Language" content="en-us" /> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> -<link rel="stylesheet" href="../whatsnew.css" /> -<title>What's New Visual Page Editor 3.3.0.Beta1</title> -<script type="text/javascript"> - - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-17645367-5']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - -</script></head> -<body> -<h1>What's New Visual Page Editor 3.3.0.Beta1</h1> - -<p align="right"> -<a href="../index.html">< Main Index</a> -<a href="../hibernate/hibernate-news-3.5.0.Beta1.html">Hibernate Tools ></a> -</p> - -<table border="0" cellpadding="10" cellspacing="0"> - <tr> - <td colspan="2"> - <hr /> - <h3>Editor</h3> - <hr /> - </td> - </tr> - <tr> - <td valign="top" align="left"> - <b><p> - TODO - <p></b> - </td> - <td valign="top"> - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> - <p><img src="images/4.0.0.Alpha1/TODO.png" alt="TODO" /></p> - <p><small> - <a href="https://issues.jboss.org/browse/JBIDE-8631">Related Jira</a> - </small></p> - </td> - </tr> - <tr> - <td colspan="2"> - <hr /> - </td> - </tr> - - <tr> - <td colspan="2"> - <hr /> - <h3>BrowserSim</h3> - <hr /> - </td> - </tr> - <tr> - <td valign="top" align="left"> - <b><p> - New scrollbars (Windows only) - <p></b> - </td> - <td valign="top"> - <p>BrowserSim got new thinner and nicer tollbars (Windows only).</p> - <p><img src="images/4.0.0.Alpha1/browsersim-new-scrollbars.png" height='727' width='384' alt='New scrollbars'></p> - - <p><small> - <a href="https://issues.jboss.org/browse/JBIDE-12191">Related Jira</a> - </small></p> - </td> - </tr> -</table> -</body> -</html> \ No newline at end of file +<?xml version="1.0" encoding="iso-8859-1"?> +<!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"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>What's New Visual Page Editor 3.3.0.Beta1</title> +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-17645367-5']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + +</script></head> +<body> +<h1>What's New Visual Page Editor 3.3.0.Beta1</h1> + +<p align="right"> +<a href="../index.html">< Main Index</a> +<a href="../hibernate/hibernate-news-3.5.0.Beta1.html">Hibernate Tools ></a> +</p> + +<table border="0" cellpadding="10" cellspacing="0"> + <tr> + <td colspan="2"> + <hr /> + <h3>Editor</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <b><p> + Selection colors in visual part could be changed + <p></b> + </td> + <td valign="top"> + <p>Selection colors for visual elements could be changed on the Preferences Page</p> + <p><img src="images/4.0.0.Alpha1/ChooseVPEColors.png" alt="Choose VPE Colors" /></p> + <p><small> + <a href="https://issues.jboss.org/browse/JBIDE-8631">Related Jira</a> + </small></p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> + <h3>BrowserSim</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <b><p> + New scrollbars (Windows only) + <p></b> + </td> + <td valign="top"> + <p>BrowserSim got new thinner and nicer tollbars (Windows only).</p> + <p><img src="images/4.0.0.Alpha1/browsersim-new-scrollbars.png" height='727' width='384' alt='New scrollbars'></p> + + <p><small> + <a href="https://issues.jboss.org/browse/JBIDE-12191">Related Jira</a> + </small></p> + </td> + </tr> +</table> +</body> +</html>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43686 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2012-09-14 05:29:49 -0400 (Fri, 14 Sep 2012) New Revision: 43686 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java Log: JBIDE-12609 NPE when validating EL which uses java.util.Map Issue is fixed Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-09-14 09:25:38 UTC (rev 43685) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-09-14 09:29:49 UTC (rev 43686) @@ -642,6 +642,7 @@ if (left != expr) { // inside expression JavaMemberELSegmentImpl lastSegment = segment; segment = new JavaMemberELSegmentImpl(left.getLastToken()); + boolean skipSegment = false; if(left instanceof ELArgumentInvocation) { List<MemberInfo> ms = new ArrayList<MemberInfo>(members); members.clear(); @@ -654,6 +655,7 @@ if(type!=null) { try { if(TypeInfoCollector.isInstanceofType(type, "java.util.Map")) { //$NON-NLS-1$ + skipSegment = true; String s = "#{" + left.getLeft().toString() + ".values().iterator().next()}"; //$NON-NLS-1$ //$NON-NLS-2$ if(getParserFactory()!=null) { ELParser p = getParserFactory().createParser(); @@ -665,7 +667,9 @@ resolution.setLastResolvedToken(left); } } + segment = lastSegment; } else if(TypeInfoCollector.isInstanceofType(type, "java.util.Collection")) { //$NON-NLS-1$ + skipSegment = true; String s = "#{" + left.getLeft().toString() + collectionAdditionForCollectionDataModel + "}"; //$NON-NLS-1$ //$NON-NLS-2$ if(getParserFactory()!=null) { ELParser p = getParserFactory().createParser(); @@ -676,6 +680,7 @@ resolution.setLastResolvedToken(left); } } + segment = lastSegment; } } catch (JavaModelException e) { log(e); @@ -705,7 +710,8 @@ segment.setResolved(true); segment.setMemberInfo(members.get(0)); // TODO: This is a buggy way to select a member to setup in a segment } - resolution.addSegment(segment); + if (!skipSegment) + resolution.addSegment(segment); } else { // Last segment resolveLastSegment((ELInvocationExpression)operand, members, resolution, returnEqualedVariablesOnly, varIsUsed); break;

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43685 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-09-14 05:25:38 -0400 (Fri, 14 Sep 2012) New Revision: 43685 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPageModel.java Log: [JBIDE-11912] checking for password in UserDelegate, listing keys in table Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-09-14 08:24:02 UTC (rev 43684) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-09-14 09:25:38 UTC (rev 43685) @@ -310,7 +310,10 @@ } public List<IOpenShiftSSHKey> getSSHKeys() { - return delegate.getSSHKeys(); + if(checkForPassword()) { + return delegate.getSSHKeys(); + } + return null; } public IOpenShiftSSHKey getSSHKeyByPublicKey(String publicKey) throws OpenShiftUnknonwSSHKeyTypeException, OpenShiftException { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java 2012-09-14 08:24:02 UTC (rev 43684) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java 2012-09-14 09:25:38 UTC (rev 43685) @@ -14,12 +14,10 @@ import java.util.Collection; import org.eclipse.core.databinding.DataBindingContext; -import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.databinding.viewers.ViewerSupport; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.layout.TableColumnLayout; @@ -42,7 +40,6 @@ import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import com.openshift.client.IEmbeddableCartridge; import com.openshift.client.IOpenShiftSSHKey; /** @@ -74,11 +71,7 @@ this.viewer = createTable(tableContainer); GridDataFactory.fillDefaults() .span(1, 4).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(tableContainer); - ViewerSupport.bind( - viewer, - BeanProperties.list(ManageSSHKeysWizardPageModel.PROPERTY_SSH_KEYS).observe(pageModel), - BeanProperties.values(new String[]{"name", "keyType", "publicKey"})); - + Button addButton = new Button(sshKeysGroup, SWT.PUSH); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.FILL).applyTo(addButton); @@ -111,7 +104,7 @@ public int compare(Viewer viewer, Object thisKey, Object thatKey) { if (thisKey instanceof IOpenShiftSSHKey && thatKey instanceof IOpenShiftSSHKey) { - return ((IOpenShiftSSHKey) thisKey).getName().compareTo(((IEmbeddableCartridge) thatKey).getName()); + return ((IOpenShiftSSHKey) thisKey).getName().compareTo(((IOpenShiftSSHKey) thatKey).getName()); } return super.compare(viewer, thisKey, thatKey); } @@ -131,7 +124,7 @@ @Override public void update(ViewerCell cell) { IOpenShiftSSHKey key = (IOpenShiftSSHKey) cell.getElement(); - cell.setText(key.getName()); + cell.setText(key.getKeyType().getTypeId()); } }, viewer, tableLayout); createTableColumn("Public Key", 1, new CellLabelProvider() { @@ -161,7 +154,7 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { -// setViewerInput(pageModel.loadSSHKeys()); + setViewerInput(pageModel.loadSSHKeys()); pageModel.loadSSHKeys(); return Status.OK_STATUS; } catch (Exception e) { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPageModel.java 2012-09-14 08:24:02 UTC (rev 43684) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPageModel.java 2012-09-14 09:25:38 UTC (rev 43685) @@ -23,7 +23,7 @@ */ public class ManageSSHKeysWizardPageModel extends ObservableUIPojo { - public static final String PROPERTY_SSH_KEYS = "sshKeys"; + public static final String PROPERTY_SSH_KEYS = "SSHKeys"; private UserDelegate user; private List<IOpenShiftSSHKey> keys = new ArrayList<IOpenShiftSSHKey>(); @@ -41,6 +41,7 @@ } public List<IOpenShiftSSHKey> setSSHKeys(List<IOpenShiftSSHKey> keys) { + this.keys = keys; firePropertyChange(PROPERTY_SSH_KEYS, this.keys, this.keys = keys); return this.keys; }

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43684 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-09-14 04:24:02 -0400 (Fri, 14 Sep 2012) New Revision: 43684 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java Log: JBIDE-12613 prep work Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java 2012-09-14 08:24:02 UTC (rev 43684) @@ -0,0 +1,7 @@ +package org.jboss.ide.eclipse.as.core.server; + +import org.eclipse.wst.server.core.model.IModuleFile; + +public interface IDeployableServerBehaviour { + public boolean changedFileRequiresModuleRestart(IModuleFile mf); +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java 2012-09-14 08:24:02 UTC (rev 43684) @@ -0,0 +1,5 @@ +package org.jboss.ide.eclipse.as.core.server; + +public interface IJBossServer extends IDeployableServer { + public IJBossServerRuntime getRuntime(); +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java 2012-09-14 08:24:02 UTC (rev 43684) @@ -0,0 +1,29 @@ +package org.jboss.ide.eclipse.as.core.util; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.SubProgressMonitor; + +public class ProgressMonitorUtil { + + public static class CustomSubProgress extends SubProgressMonitor { + public CustomSubProgress(IProgressMonitor monitor, int ticks, int style) { + super(monitor, ticks, style); + } + public void beginTask(String name, int totalWork) { + super.beginTask(null, totalWork); + setTaskName(name); + } + } + + public static IProgressMonitor getSubMon(IProgressMonitor parent, int ticks) { + IProgressMonitor subMon = new CustomSubProgress(parent, ticks, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK); + return subMon; + } + + public static IProgressMonitor getMonitorFor(IProgressMonitor monitor) { + if (monitor == null) + return new NullProgressMonitor(); + return monitor; + } +}

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43683 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-09-14 04:23:17 -0400 (Fri, 14 Sep 2012) New Revision: 43683 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java Log: JBIDE-12613 prep work Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.extensions.events; -import org.eclipse.core.runtime.IStatus; public interface IEventCodes { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -45,6 +44,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; @@ -80,19 +80,8 @@ this.publishState = state; } - public static class CustomSubProgress extends SubProgressMonitor { - public CustomSubProgress(IProgressMonitor monitor, int ticks, int style) { - super(monitor, ticks, style); - } - public void beginTask(String name, int totalWork) { - super.beginTask(null, totalWork); - setTaskName(name); - } - } - public static IProgressMonitor getSubMon(IProgressMonitor parent, int ticks) { - IProgressMonitor subMon = new CustomSubProgress(parent, ticks, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK); - return subMon; + return ProgressMonitorUtil.getSubMon(parent, ticks); } public IStatus publishModule(IJBossServerPublishMethod method, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -75,7 +75,7 @@ */ public static String getDeployRootFolder(IModule[] moduleTree, IDeployableServer server, String defaultFolder, String moduleProperty) { - return getDeployRootFolder(moduleTree, LocalPublishMethod.LOCAL_PUBLISH_METHOD, + return getDeployRootFolder(moduleTree, "local", //$NON-NLS-1$ server, defaultFolder, moduleProperty); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -31,6 +31,7 @@ import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; @@ -41,7 +42,8 @@ /** * @author Rob Stryker */ -public class DeployableServerBehavior extends ServerBehaviourDelegate { +public class DeployableServerBehavior extends ServerBehaviourDelegate + implements IDeployableServerBehaviour { public DeployableServerBehavior() { } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -45,6 +45,7 @@ import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; @@ -60,7 +61,7 @@ * */ public class JBossServer extends DeployableServer - implements IDeployableServer, IURLProvider { + implements IJBossServer, IURLProvider { public static final String AUTOMATICALLY_UPDATE_LAUNCH = "org.jboss.ide.eclipse.as.core.server.internal.AUTOMATICALLY_UPDATE_LAUNCH"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -23,11 +23,12 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.IModuleFile; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; -import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour; import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.util.FileUtil; +import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.StreamUtils; @@ -54,8 +55,8 @@ public IStatus[] copyFile(IModuleFile mf, IPath relativePath, IProgressMonitor monitor) throws CoreException { monitor.beginTask("Copying " + relativePath.toString(), 100); //$NON-NLS-1$ File file = PublishUtil.getFile(mf); - DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server); - shouldRestartModule |= beh.changedFileRequiresModuleRestart(mf); + IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server); + shouldRestartModule |= beh != null && beh.changedFileRequiresModuleRestart(mf); if( file != null ) { if( !file.exists()) { return new IStatus[] {new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, @@ -215,12 +216,15 @@ File f = null; if( tmpDeployRootFolder != null ) { f = tmpDeployRootFolder.toFile(); - } else if( server != null ){ - String path = ServerConverter.getDeployableServer(server).getTempDeployFolder(); - f = new File(path); - } else { + } else if( server == null ) { return tempDir; + } + IDeployableServer ds = ServerConverter.getDeployableServer(server); + if( ds == null ) { + return tempDir; } + String path = ds.getTempDeployFolder(); + f = new File(path); if( !f.exists() ) f.mkdirs(); return f; @@ -274,7 +278,7 @@ } else if (current.isDirectory()) { monitor.subTask(NLS.bind(Messages.deletingTask, new String[] {current.getAbsolutePath()})); IStatus[] stat = deleteDirectory(current, - AbstractServerToolsPublisher.getSubMon(monitor, 10)); + ProgressMonitorUtil.getSubMon(monitor, 10)); if (stat != null && stat.length > 0) { deleteCurrent = false; PublishCopyUtil.addArrayToList(status, stat); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -22,7 +22,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.internal.Messages; -import org.eclipse.wst.server.core.internal.ProgressUtil; import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.IModuleFile; import org.eclipse.wst.server.core.model.IModuleFolder; @@ -31,9 +30,9 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil; -import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil; /** * Utility class with an assortment of useful file methods. * <p> @@ -92,7 +91,7 @@ if (delta == null) return EMPTY_STATUS; - monitor = ProgressUtil.getMonitorFor(monitor); + monitor = ProgressMonitorUtil.getMonitorFor(monitor); List<IStatus> status = new ArrayList<IStatus>(2); int size2 = delta.length; @@ -192,11 +191,11 @@ */ public IStatus[] initFullPublish(IModuleResource[] resources, IModulePathFilter filter, IProgressMonitor monitor) throws CoreException { int count = ResourceModuleResourceUtil.countMembers(resources); - monitor = ProgressUtil.getMonitorFor(monitor); + monitor = ProgressMonitorUtil.getMonitorFor(monitor); monitor.beginTask("Publishing " + count + " resources", //$NON-NLS-1$ //$NON-NLS-2$ (100 * (count)) + 200); handler.makeDirectoryIfRequired(new Path("/"), //$NON-NLS-1$ - AbstractServerToolsPublisher.getSubMon(monitor, 100)); + ProgressMonitorUtil.getSubMon(monitor, 100)); if( monitor.isCanceled()) return canceledStatus(); IStatus[] results = publishFull(resources, new Path("/"), filter, monitor); //$NON-NLS-1$ @@ -222,7 +221,6 @@ } - @Deprecated protected IStatus[] publishFull(IModuleResource[] resources, IPath relative, IProgressMonitor monitor) throws CoreException { return publishFull(resources, relative, null, monitor); @@ -237,7 +235,7 @@ IModuleResource[] children = folder.members(); if( children.length == 0 ) handler.makeDirectoryIfRequired(folder.getModuleRelativePath().append(folder.getName()), - AbstractServerToolsPublisher.getSubMon(monitor, 5)); + ProgressMonitorUtil.getSubMon(monitor, 5)); else { IStatus[] stat = publishFull(children, path, filter, monitor); addArrayToList(status, stat); @@ -250,7 +248,7 @@ if( stats != null && stats.length > 0 && !stats[0].isOK()) addArrayToList(status, stats); addArrayToList(status, handler.copyFile(mf, path, - AbstractServerToolsPublisher.getSubMon(monitor, 100))); + ProgressMonitorUtil.getSubMon(monitor, 100))); } } return status.toArray(new IStatus[status.size()]); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -13,7 +13,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -29,7 +28,6 @@ import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.internal.Server; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel; @@ -65,20 +63,6 @@ return server.getAttribute(IDeployableServer.SERVER_MODE, defaultType); } - @Deprecated - public static DeploymentPreferences loadPreferencesFromFile(IServer server) { - File f = getFile(server); - if( f.exists()) { - try { - InputStream is = new FileInputStream(f); - return new DeploymentPreferences(is); - } catch(IOException ioe) { - // Intentionally fall through and return null - } - } - return null; - } - public static DeploymentPreferences loadPreferencesFromServer(IServerAttributes server) { String xml = ((Server)server).getAttribute(DEPLOYMENT_PREFERENCES_KEY, (String)null); ByteArrayInputStream bis = null; @@ -88,21 +72,10 @@ return new DeploymentPreferences(bis); } - @Deprecated - public static void savePreferences(IServer server, DeploymentPreferences prefs) throws IOException { - File f = getFile(server); - prefs.getMemento().saveToFile(f.getAbsolutePath()); - } - public static void savePreferences(OutputStream os, DeploymentPreferences prefs) throws IOException { prefs.getMemento().save(os); } - protected static File getFile(IServer server) { - IPath loc = ServerUtil.getServerStateLocation(server); - return loc.append("deploymentPreferences.xml").toFile(); //$NON-NLS-1$ - } - public static class DeploymentPreferences { private HashMap<String, DeploymentTypePrefs> children; private XMLMemento memento; @@ -125,8 +98,10 @@ } // prefs are all in "local" now, even for rse stuff. + public static final String LOCAL_PUBLISH_METHOD = "local"; //$NON-NLS-1$ + public DeploymentTypePrefs getOrCreatePreferences() { - return getOrCreatePreferences(LocalPublishMethod.LOCAL_PUBLISH_METHOD); + return getOrCreatePreferences(LOCAL_PUBLISH_METHOD); } public DeploymentTypePrefs getOrCreatePreferences(String deploymentType) { Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -21,7 +21,6 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.internal.core.JavaProject; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; @@ -46,10 +45,9 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.eclipse.wst.server.core.model.IModuleResource; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; -import org.jboss.tools.test.util.TestProjectProvider; import org.jboss.tools.esb.core.ESBProjectConstant; import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; import org.jboss.tools.esb.core.facet.JBossClassPathCommand; @@ -57,6 +55,7 @@ import org.jboss.tools.esb.core.runtime.JBossESBRuntime; import org.jboss.tools.esb.core.runtime.JBossRuntimeClassPathInitializer; import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; +import org.jboss.tools.test.util.TestProjectProvider; public class ESBProjectDeploymentTest extends TestCase { private static final String SOAP_HOME_5_0_PROP_NAME = "jbosstools.test.soap.home.5.0"; @@ -365,7 +364,7 @@ IPath path = new Path(location).append("server").append("default") .append("deploy"); ((ServerWorkingCopy) serverWC).setAttribute( - DeployableServer.DEPLOY_DIRECTORY, path.toOSString()); + IDeployableServer.DEPLOY_DIRECTORY, path.toOSString()); currentServer = serverWC.save(true, new NullProgressMonitor()); } Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -43,7 +43,7 @@ import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; import org.jboss.ide.eclipse.as.core.server.bean.ServerBean; import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServer; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -80,7 +80,7 @@ throws CoreException { IServer server = ServerUtil.getServer(configuration); if (server != null) { - JBossServer jbossServer = ServerConverter + IJBossServer jbossServer = ServerConverter .checkedGetJBossServer(server); if (jbossServer != null) { IJBossServerRuntime runtime = jbossServer.getRuntime(); Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -40,7 +40,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServer; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.tools.maven.sourcelookup.ui.SourceLookupUIActivator; @@ -68,7 +68,7 @@ List<IJBossServerRuntime> runtimes = new ArrayList<IJBossServerRuntime>(); if (servers != null) { for (IServer server : servers) { - JBossServer jbossServer = null; + IJBossServer jbossServer = null; try { jbossServer = ServerConverter.checkedGetJBossServer(server); } catch (CoreException e) { Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -20,6 +20,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.model.ServerDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.test.ASTest; @@ -149,7 +150,7 @@ protected void undeployWebProject() throws CoreException { IModule[] modules = ServerUtil.getModules(currentServer.getServerType() .getRuntimeType().getModuleTypes()); - JBossServer ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor()); + ServerDelegate ds = (ServerDelegate)currentServer.loadAdapter(ServerDelegate.class, new NullProgressMonitor()); IServerWorkingCopy serverWC = ds.getServerWorkingCopy(); serverWC.modifyModules(null, modules, null); serverWC.save(true, null).publish(IServer.PUBLISH_FULL, null);

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43682 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-09-14 04:15:04 -0400 (Fri, 14 Sep 2012) New Revision: 43682 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java Log: Changed waiting condition for Progress Information dialog Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-09-14 08:09:04 UTC (rev 43681) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-09-14 08:15:04 UTC (rev 43682) @@ -1,13 +1,13 @@ package org.jboss.tools.ui.bot.ext; import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses; +import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JBossToolsProjectExamples; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -82,9 +82,7 @@ private SWTBot existsExample() { SWTBot wiz = open.newObject(JBossToolsProjectExamples.LABEL); // wait for progress shell (downloading & parsing example xml) - SWTBotShell shell = bot.shell("Progress Information"); - shell.activate(); - bot.waitUntil(shellCloses(shell),Timing.time100S()); + bot.waitWhile(shellIsActive("Progress Information"), Timing.time100S()); try { open.selectTreeNode(wiz,ActionItem.create(getExampleCategory(),getExampleName())); return wiz;

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43681 - trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: jpeterka Date: 2012-09-14 04:09:04 -0400 (Fri, 14 Sep 2012) New Revision: 43681 Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml Log: Dummy bot test fix for MacOSX with JDK 1.7 update1 Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml =================================================================== --- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-09-14 07:37:41 UTC (rev 43680) +++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-09-14 08:09:04 UTC (rev 43681) @@ -73,10 +73,10 @@ <profile> <id>mac17</id> <activation> - <jdk>1.7</jdk> <os> - <name>Mac OS X</name> + <family>mac</family> </os> + <jdk>1.7</jdk> </activation> <properties> <systemProperties>-Dawt.toolkit=sun.lwawt.macosx.LWCToolkit</systemProperties>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43680 - trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: jpeterka Date: 2012-09-14 03:37:41 -0400 (Fri, 14 Sep 2012) New Revision: 43680 Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml Log: Dummy bot test fix for MacOSX with JDK 1.7 Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml =================================================================== --- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-09-14 06:58:22 UTC (rev 43679) +++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-09-14 07:37:41 UTC (rev 43680) @@ -66,14 +66,26 @@ </environments> </configuration> </plugin> - </plugins> </build> + <profiles> <profile> + <id>mac17</id> + <activation> + <jdk>1.7</jdk> + <os> + <name>Mac OS X</name> + </os> + </activation> + <properties> + <systemProperties>-Dawt.toolkit=sun.lwawt.macosx.LWCToolkit</systemProperties> + </properties> + </profile> + <profile> <id>mvn-debug</id> <properties> -  +  <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</systemProperties> </properties> </profile>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43679 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-09-14 02:58:22 -0400 (Fri, 14 Sep 2012) New Revision: 43679 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7Deployment.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF Log: JBIDE-12612 to trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -184,7 +184,7 @@ } - public static ArrayList<String> moduleCoreFactories = new ArrayList<String>(); + private static ArrayList<String> moduleCoreFactories = new ArrayList<String>(); static { moduleCoreFactories.add("org.eclipse.jst.j2ee.server"); //$NON-NLS-1$ moduleCoreFactories.add("org.eclipse.jst.jee.server"); //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -11,10 +11,8 @@ package org.jboss.ide.eclipse.as.core.server; import java.util.ArrayList; -import java.util.Iterator; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IPublishListener; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeLifecycleListener; @@ -60,7 +58,6 @@ return (UnitedServerListener[]) list.toArray(new UnitedServerListener[list.size()]); } - @Deprecated public static boolean isJBossServer(IServer server) { return ServerConverter.getJBossServer(server) != null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7Deployment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7Deployment.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7Deployment.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -11,7 +11,11 @@ package org.jboss.ide.eclipse.as.core.server.internal.v7; /** - * A marker interface for any app server which supports jb7 style deployment + * A marker interface for any app server which supports + * jb7 style deployment with marker files. + * + * To be used on the server delegate. + * ex: see JBoss7Server * */ public interface IJBoss7Deployment { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -2,11 +2,6 @@ import java.io.File; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; - /** * This class coppied from JBoss's DMR project, ExpressionValue.java * Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -23,7 +23,6 @@ import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; -import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -1,226 +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.ide.eclipse.as.wtp.core; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.resources.IResourceDeltaVisitor; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jst.j2ee.application.internal.operations.IModuleExtensions; -import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; -import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.jst.j2ee.project.EarUtilities; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.resources.IVirtualResource; - -/** - * This file is here as a clone to J2EEDependencyListener, but that class - * has bugs that will only be fixed in WTP 3.1.2 or WTP 3.2.0. - * - * This class MUST BE REMOVED at that point - * @author rob - * - */ - -public class WTP31DependencyListener { //implements IResourceChangeListener, IResourceDeltaVisitor { - /* - - - public static WTP31DependencyListener INSTANCE = new WTP31DependencyListener(); - - private WTP31DependencyListener() { - } - - // private List<IProject> cachedEARModuleDependencies = new - // ArrayList<IProject>(); - // - // private void cacheModuleDependencies(IProject earProject) { - // if (EarUtilities.isEARProject(earProject)) { - // IVirtualReference[] refs = - // EarUtilities.getComponentReferences(ComponentCore.createComponent(earProject)); - // IVirtualComponent comp = null; - // for (int j = 0; j < refs.length; j++) { - // comp = refs[j].getReferencedComponent(); - // if (!comp.isBinary()) { - // cachedEARModuleDependencies.add(comp.getProject()); - // } - // } - // } - // } - // - // private void updateModuleDependencies() { - // if (!cachedEARModuleDependencies.isEmpty()) { - // for (Iterator<IProject> iterator = - // cachedEARModuleDependencies.iterator(); iterator.hasNext();) { - // IDependencyGraph.INSTANCE.update(iterator.next()); - // } - // cachedEARModuleDependencies.clear(); - // } - // } - - public void resourceChanged(IResourceChangeEvent event) { - try { - IDependencyGraph.INSTANCE.preUpdate(); - switch (event.getType()) { - case IResourceChangeEvent.PRE_CLOSE: - case IResourceChangeEvent.PRE_DELETE: - // IResource resource = event.getResource(); - // if (resource.getType() == IResource.PROJECT) { - // cacheModuleDependencies((IProject) resource); - // } - break; - case IResourceChangeEvent.POST_CHANGE: - event.getDelta().accept(this); - } - } catch (CoreException e) { - J2EEPlugin.logError(e); - } finally { - IDependencyGraph.INSTANCE.postUpdate(); - } - } - - public boolean visit(IResourceDelta delta) throws CoreException { - IResource resource = delta.getResource(); - switch (resource.getType()) { - case IResource.ROOT: - return true; - case IResource.PROJECT: - int kind = delta.getKind(); - // if ((IResourceDelta.ADDED & kind) != 0) { - // // if an EAR project is added then all dependent modules must be - // // updated - // if (EarUtilities.isEARProject((IProject) resource)) { - // cacheModuleDependencies((IProject) resource); - // updateModuleDependencies(); - // } - // return false; - // } else if ((IResourceDelta.REMOVED & kind) != 0) { - // updateModuleDependencies(); - // return false; - // } else - if ((IResourceDelta.CHANGED & kind) != 0) { - // int flags = delta.getFlags(); - // if ((IResourceDelta.OPEN & flags) != 0) { - // boolean isOpen = ((IProject) resource).isOpen(); - // if (isOpen) { - // // if an EAR project is open all dependent modules must - // // be updated - // cacheModuleDependencies((IProject) resource); - // } - // // this will also pickup both close and open events - // // if the EAR project is closed, the cached dependent - // // modules will already - // updateModuleDependencies(); - // } - return true; - } - return false; - case IResource.FOLDER: - return true; - case IResource.FILE: - String name = resource.getName(); - // MANIFEST.MF must be all caps per spec - // if (name.equals(J2EEConstants.MANIFEST_SHORT_NAME)) { - // IFile manifestFile = - // J2EEProjectUtilities.getManifestFile(resource.getProject(), - // false); - // if (null == manifestFile || resource.equals(manifestFile)) { - // IDependencyGraph.INSTANCE.update(resource.getProject(), - // IDependencyGraph.MODIFIED); - // } - // } else if - // (name.equals(WTPModulesResourceFactory.WTP_MODULES_SHORT_NAME)) { - // if (EarUtilities.isEARProject(resource.getProject())) { - // // unfortunately, in this case, the only easy way to update - // // is to force the update of all projects - // IProject[] allProjects = - // ResourcesPlugin.getWorkspace().getRoot().getProjects(); - // for (IProject sourceProject : allProjects) { - // IDependencyGraph.INSTANCE.update(sourceProject, - // IDependencyGraph.MODIFIED); - // } - // } - // } else - if (endsWithIgnoreCase(name, IModuleExtensions.DOT_JAR) - || endsWithIgnoreCase(name, IModuleExtensions.DOT_WAR) - || endsWithIgnoreCase(name, IModuleExtensions.DOT_RAR)) { - if (EarUtilities.isEARProject(resource.getProject())) { - IVirtualComponent comp = ComponentCore - .createComponent(resource.getProject()); - // if (isFolder(resource.getParent(), comp.getRootFolder())) - // { - if (!isFolder(resource.getParent(), comp.getRootFolder())) { - if( isInTree((IFile)resource, comp.getRootFolder())) { - IVirtualReference[] refs = comp.getReferences(); - for (IVirtualReference ref : refs) { - IDependencyGraph.INSTANCE.update(ref - .getReferencedComponent().getProject(), - IDependencyGraph.MODIFIED); - } - IDependencyGraph.INSTANCE.update(resource.getProject(), - IDependencyGraph.MODIFIED); - } - } - - } - } - default: - return false; - } - } - - public static boolean isInTree(IFile file, IVirtualFolder folder) { - // If we are the folder, return true - if (isFolder(file.getParent(), folder)) - return true; - - // if resource is any level under current VF's underlying folders, - // return true - IContainer[] underlying = folder.getUnderlyingFolders(); - for (int i = 0; i < underlying.length; i++) { - if (underlying[i].getFullPath().isPrefixOf(file.getFullPath())) - return true; - } - - // continue to peruse in case there's some odd mapping, such as - // /EarConten5 -> /my/secret/location/wherever/it/goes - boolean found = false; - try { - IVirtualResource[] children = folder.members(); - for (int i = 0; i < children.length && !found; i++) { - if (children[i].getType() == IVirtualResource.FOLDER) { - found |= isInTree(file, (IVirtualFolder) children[i]); - } - } - } catch (CoreException ce) { - J2EEPlugin.logError(ce); - } - return found; - } - - public static boolean endsWithIgnoreCase(String str, String sfx) { - return J2EEComponentClasspathUpdater.endsWithIgnoreCase(str, sfx); - - } - - public static boolean isFolder(IResource resource, IVirtualFolder folder) { - return J2EEComponentClasspathUpdater.isFolder(resource, folder); - } - */ -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -1,91 +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.ide.eclipse.as.wtp.core.vcf; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.emf.common.util.URI; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.UnresolveableURIException; -import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage; -import org.eclipse.wst.common.componentcore.internal.DependencyType; -import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; -import org.eclipse.wst.common.componentcore.internal.StructureEdit; -import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; - -public class DefaultReferenceResolver implements IReferenceResolver { - // Does not need to implement, - // default is always called as last resort - public boolean canResolve(IVirtualComponent context, - ReferencedComponent referencedComponent) { - return false; - } - - // Does not need to implement, - // default is always called as last resort - public boolean canResolve(IVirtualReference reference) { - return false; - } - - public IVirtualReference resolve(IVirtualComponent context, - ReferencedComponent referencedComponent) { - IVirtualComponent targetComponent = null; - IProject targetProject = null; - URI uri = referencedComponent.getHandle(); - if (uri == null) - return null; - boolean isClassPathURI = ModuleURIUtil.isClassPathURI(uri); - if( !isClassPathURI ){ - try { - targetProject = StructureEdit.getContainingProject(uri); - } catch(UnresolveableURIException uurie) { - //Ignore - } - // if the project cannot be resolved, assume it's local - really it probably deleted - - targetComponent = ComponentCore.createComponent(targetProject); - - - }else{ - String archiveType = ""; //$NON-NLS-1$ - String archiveName = ""; //$NON-NLS-1$ - try { - archiveType = ModuleURIUtil.getArchiveType(uri); - archiveName = ModuleURIUtil.getArchiveName(uri); - - } catch (UnresolveableURIException e) { - //Ignore - } - targetComponent = ComponentCore.createArchiveComponent(context.getProject(), archiveType + IPath.SEPARATOR + archiveName ); - } - return new VirtualReference(context, targetComponent, referencedComponent.getRuntimePath(), referencedComponent.getDependencyType().getValue()); - } - - public ReferencedComponent resolve(IVirtualReference reference) { - IVirtualComponent referencedComponent = reference.getReferencedComponent(); - ReferencedComponent refComp = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent(); - refComp.setRuntimePath(reference.getRuntimePath()); - refComp.setDependencyType(DependencyType.get(reference.getDependencyType())); - refComp.setArchiveName(reference.getArchiveName()); - if( referencedComponent != null ) { - if( !referencedComponent.isBinary()) - refComp.setHandle(ModuleURIUtil.fullyQualifyURI(referencedComponent.getProject())); - else - refComp.setHandle(ModuleURIUtil.archiveComponentfullyQualifyURI(referencedComponent.getName())); - } - return refComp; - } - - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java 2012-09-14 06:58:22 UTC (rev 43679) @@ -1,22 +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.ide.eclipse.as.wtp.core.vcf; - -import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; - -public interface IReferenceResolver { - public boolean canResolve(IVirtualComponent context, ReferencedComponent referencedComponent); - public IVirtualReference resolve(IVirtualComponent context, ReferencedComponent referencedComponent); - public boolean canResolve(IVirtualReference reference); - public ReferencedComponent resolve(IVirtualReference reference); -} Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2012-09-14 05:11:40 UTC (rev 43678) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2012-09-14 06:58:22 UTC (rev 43679) @@ -32,7 +32,6 @@ org.eclipse.jface.text, org.jboss.ide.eclipse.as.classpath.core, org.jboss.ide.eclipse.as.ui, - org.jboss.ide.eclipse.as.wtp.core, org.jboss.ide.eclipse.as.test Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core.test,

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43678 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui: src/org/jboss/ide/eclipse/as/wtp/ui and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-09-14 01:11:40 -0400 (Fri, 14 Sep 2012) New Revision: 43678 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/icons/folder.gif trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/icons/prj_obj.gif trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/vcf/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties Log: JBIDE-12612 deleting cruft Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/icons/folder.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/icons/prj_obj.gif =================================================================== (Binary files differ) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2012-09-14 05:02:07 UTC (rev 43677) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2012-09-14 05:11:40 UTC (rev 43678) @@ -4,14 +4,6 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.wtp.ui.messages"; //$NON-NLS-1$ - public static String ModuleDependencyDescription; - public static String AddModuleDependenciesPropertiesPage_AddProjectButton; - public static String AddModuleDependenciesPropertiesPage_DeployPathColumn; - public static String AddModuleDependenciesPropertiesPage_RemoveSelectedButton; - public static String AddModuleDependenciesPropertiesPage_SelectAProjectTitle; - public static String AddModuleDependenciesPropertiesPage_SourceColumn; - public static String J2EEDependenciesPage_Description; - public static String J2EEDependenciesPage_ErrorCheckingFacets; public static String MODULE_EXISTS_ERROR; public static String DESTINATION_INVALID; public static String DESTINATION_ARCHIVE_SHOULD_END_WITH; @@ -24,7 +16,6 @@ public static String Export_LabelProject; public static String Export_LabelBrowse; public static String Export_OverwriteCheckbox; - public static String OutputFolders; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java 2012-09-14 05:02:07 UTC (rev 43677) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java 2012-09-14 05:11:40 UTC (rev 43678) @@ -23,15 +23,6 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.ui"; //$NON-NLS-1$ - public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$ - "icons/full/cview16", //$NON-NLS-1$ - "icons/full/ctool16", //$NON-NLS-1$ - "icons/full/clcl16", //$NON-NLS-1$ - "icons/full/ovr16", //$NON-NLS-1$ - "icons/full/extra", //$NON-NLS-1$ - "icons/full/wizban", //$NON-NLS-1$ - "icons", //$NON-NLS-1$ - ""}; //$NON-NLS-1$ // The shared instance private static WTPOveridePlugin plugin; @@ -61,53 +52,6 @@ } /** - * Get a .gif from the image registry. - */ - public Image getImage(String key) { - ImageRegistry imageRegistry = getImageRegistry(); - Image image = imageRegistry.get(key); - if (image == null || image.isDisposed()) { - ImageDescriptor descriptor = getImageDescriptor(key); - if (descriptor != null) { - image = descriptor.createImage(); - imageRegistry.put(key, image); - } - } - return image; - } - - /** - * This gets a .gif from the icons folder. - */ - public ImageDescriptor getImageDescriptor(String key) { - ImageDescriptor imageDescriptor = null; - URL gifImageURL = getImageURL(key,getBundle()); - if (gifImageURL != null) - imageDescriptor = ImageDescriptor.createFromURL(gifImageURL); - return imageDescriptor; - } - - /** - * This gets a .gif from the icons folder. - */ - public URL getImageURL(String key, Bundle bundle) { - String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$ - IPath path = null; - for (int i = 0; i < ICON_DIRS.length; i++) { - path = new Path(ICON_DIRS[i]).append(gif); - if (Platform.find(bundle,path) == null) - continue; - try { - return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$ - } catch (MalformedURLException exception) { - logError(exception); - continue; - } - } - return null; - } - - /** * Returns the shared instance * * @return the shared instance Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties 2012-09-14 05:02:07 UTC (rev 43677) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties 2012-09-14 05:11:40 UTC (rev 43678) @@ -1,11 +1,3 @@ -ModuleDependencyDescription=Adjust the project's module assembly structure -AddModuleDependenciesPropertiesPage_AddProjectButton=Add Project... -AddModuleDependenciesPropertiesPage_DeployPathColumn=Deploy Path -AddModuleDependenciesPropertiesPage_RemoveSelectedButton=Remove selected... -AddModuleDependenciesPropertiesPage_SelectAProjectTitle=Select a Project -AddModuleDependenciesPropertiesPage_SourceColumn=Source -J2EEDependenciesPage_Description=ModuleDependency Page Description -J2EEDependenciesPage_ErrorCheckingFacets=Error Checking Project Facets Export_WizardTitle=Export a Project Module Export_PageTitle=Export a Project Module Export_PageDescription=Export a project according to it's "module" structure. @@ -17,5 +9,4 @@ DESTINATION_INVALID=Destination archive is invalid. DESTINATION_ARCHIVE_SHOULD_END_WITH=Destination archive should end with {0}. RESOURCE_EXISTS_ERROR=Resource {0} already exists. If you wish to overwrite select the "Overwrite Existing file" option. -IS_READ_ONLY=Destination location is read only. -OutputFolders=\u0020output folders \ No newline at end of file +IS_READ_ONLY=Destination location is read only. \ No newline at end of file

13 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2012