JBoss Tools SVN: r32660 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:55:04 -0400 (Wed, 06 Jul 2011)
New Revision: 32660
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
Log:
[JBIDE-9215] removed abstract base class for RSEBehaviorDelegate that should not have been committed yet
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-06 14:53:18 UTC (rev 32659)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-06 14:55:04 UTC (rev 32660)
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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
- *
- * TODO: Logging and Progress Monitors
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.rse.core;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
-import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate;
-import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
-import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
-import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
-import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
-
-public abstract class AbstractRSEBehaviourDelegate extends AbstractJBossBehaviourDelegate {
- private PollThread pollThread = null;
- public String getBehaviourTypeId() {
- return RSEPublishMethod.RSE_ID;
- }
-
- @Override
- public void stop(boolean force) {
- if( force ) {
- forceStop();
- }
-
- if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
- setServerStopping();
- serverStopped();
- return;
- }
-
- setServerStopping();
- if (!gracefullStop().isOK()) {
- serverStarted();
- } else {
- serverStopped();
- }
- }
-
- @Override
- protected abstract void forceStop();
-
- @Override
- protected abstract IStatus gracefullStop();
-
- public void setServerStarting() {
- pollServer(IServerStatePoller.SERVER_UP);
- }
-
- public void serverStarted() {
- getActualBehavior().setServerStarted();
- }
-
- public void setServerStopping() {
- getActualBehavior().setServerStopping();
- pollServer(IServerStatePoller.SERVER_DOWN);
- }
-
- public void serverStopped() {
- getActualBehavior().setServerStopped();
- }
-
- protected void pollServer(final boolean expectedState) {
- IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer());
- this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, getActualBehavior()); }
-}
14 years, 9 months
JBoss Tools SVN: r32659 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-06 10:53:18 -0400 (Wed, 06 Jul 2011)
New Revision: 32659
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9082: If project name contains spaces, VPE does not display images from CSS
- now URLs from CSS are URL-encoded
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-07-06 14:52:51 UTC (rev 32658)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-07-06 14:53:18 UTC (rev 32659)
@@ -13,10 +13,12 @@
import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface;
import java.io.File;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.Map;
import org.eclipse.core.resources.IFile;
@@ -590,14 +592,14 @@
public static String addFullPathToImgSrc(String path,
VpePageContext pageContext, boolean showUnresolvedImage) {
- if (path == null) {
- if (showUnresolvedImage) {
- return FILE_PROTOCOL + SLASH + SLASH
- + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/');
- } else {
- return EMPTY_STRING;
- }
- }
+ if (path == null) {
+ if (showUnresolvedImage) {
+ return FILE_PROTOCOL + SLASH + SLASH
+ + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/');
+ } else {
+ return EMPTY_STRING;
+ }
+ }
IPath tagPath = new Path(path);
if (tagPath.isEmpty()) {
@@ -817,79 +819,62 @@
public static String processUrl(String url, IFile file) {
- String resolvedValue = url
+ String resolvedUrl = url
.replaceFirst(
"^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}", Constants.EMPTY); //$NON-NLS-1$
-
- resolvedValue = ElService.getInstance().replaceEl(file, resolvedValue);
+ resolvedUrl = ElService.getInstance().replaceEl(file, resolvedUrl);
URI uri = null;
try {
- uri = new URI(resolvedValue);
+ uri = new URI(resolvedUrl);
} catch (URISyntaxException e) {
// here we process user input, and when user enter url, there possible that we will not be able parse it.
// so we just ignore this.
// VpePlugin.getDefault().logWarning("Error in parsiong URI string", e); //$NON-NLS-1$
}
- if ((uri != null) && (uri.isAbsolute()))
- return resolvedValue;
-
- Path path = new Path(resolvedValue);
-
- if (resolvedValue.startsWith("/") //$NON-NLS-1$
+ if ((uri != null) && (uri.isAbsolute())) {
+ return resolvedUrl;
+ }
+
+ String decodedUrl = decodeUrl(resolvedUrl);
+
+ Path path = new Path(decodedUrl);
+ if (decodedUrl.startsWith("/") //$NON-NLS-1$
&& path.segment(0).equals(file.getProject().getName())) {
- resolvedValue = "/" //$NON-NLS-1$
+ decodedUrl = "/" //$NON-NLS-1$
+ path.removeFirstSegments(1).toPortableString();
-
}
- return Constants.FILE_PREFIX
- + FileUtil.getFile(resolvedValue, file).getLocation()
- .toPortableString();
+ IPath location = FileUtil.getFile(decodedUrl, file).getLocation();
+ if (location != null) {
+ return pathToUrl(location);
+ } else {
+ return resolvedUrl;
+ }
}
-
- /**
- * Gets the absolute workspace path.
- *
- * @param resourcePathInWorkspace the relative path in workspace
- *
- * @return the absolute workspace path
- */
- public static String getAbsoluteWorkspacePath(
- String resourcePathInWorkspace, VpePageContext pageContext) {
- String resolvedValue = resourcePathInWorkspace
- .replaceFirst(
- "^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}", Constants.EMPTY); //$NON-NLS-1$
-
- IFile file = null;
- if ( (pageContext.getVisualBuilder().getCurrentIncludeInfo() != null)
- &&(pageContext.getVisualBuilder().getCurrentIncludeInfo()
- .getStorage() instanceof IFile) ) {
- file = (IFile) pageContext.getVisualBuilder().getCurrentIncludeInfo()
- .getStorage();
- }
- if (file == null)
- return resolvedValue;
-
- resolvedValue = ElService.getInstance().replaceEl(file, resolvedValue);
-
- URI uri = null;
+ private static String pathToUrl(IPath location) {
+ String fullFilePath = location.toPortableString();
try {
- uri = new URI(resolvedValue);
+ return new URI("file", "", "/" + fullFilePath, null).toASCIIString(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
} catch (URISyntaxException e) {
+ VpePlugin.getPluginLog().logError(e);
+ return Constants.FILE_PREFIX + fullFilePath;
}
+ }
- if ((uri != null)
- && (uri.isAbsolute() || (new File(resolvedValue)).exists()))
- return resolvedValue;
-
- return Constants.FILE_PREFIX
- + FileUtil.getFile(resolvedValue, file).getLocation()
- .toPortableString();
+ private static String decodeUrl(String url) {
+ String decodedUrl;
+ try {
+ decodedUrl = URLDecoder.decode(url, "UTF-8"); //$NON-NLS-1$
+ } catch (UnsupportedEncodingException e) {
+ VpePlugin.getPluginLog().logError(e);
+ decodedUrl = url;
+ }
+ return decodedUrl;
}
/**
14 years, 9 months
JBoss Tools SVN: r32658 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:52:51 -0400 (Wed, 06 Jul 2011)
New Revision: 32658
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
Log:
[JBIDE-9215] added @Override to methods that implement the interface
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:50:26 UTC (rev 32657)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:52:51 UTC (rev 32658)
@@ -25,6 +25,7 @@
private DelegatingServerBehavior actualBehavior;
+ @Override
public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
this.actualBehavior = actualBehaviour;
}
@@ -41,9 +42,11 @@
protected abstract IStatus gracefullStop();
+ @Override
public void publishStart(IProgressMonitor monitor) throws CoreException {
}
+ @Override
public void publishFinish(IProgressMonitor monitor) throws CoreException {
}
@@ -52,6 +55,7 @@
setServerStarting();
}
+ @Override
public void setServerStarting() {
actualBehavior.setServerStarting();
}
@@ -61,10 +65,12 @@
setServerStopping();
}
+ @Override
public void setServerStopping() {
actualBehavior.setServerStopping();
}
+ @Override
public IStatus canChangeState(String launchMode) {
return Status.OK_STATUS;
}
14 years, 9 months
JBoss Tools SVN: r32657 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:50:26 -0400 (Wed, 06 Jul 2011)
New Revision: 32657
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
Log:
[JBIDE-9215] removed unneeded abstract #stop(force) method which is already covered by interface
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:41:51 UTC (rev 32656)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:50:26 UTC (rev 32657)
@@ -24,6 +24,7 @@
public abstract class AbstractJBossBehaviourDelegate implements JBossBehaviourDelegate {
private DelegatingServerBehavior actualBehavior;
+
public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
this.actualBehavior = actualBehaviour;
}
@@ -36,8 +37,6 @@
return actualBehavior.getServer();
}
- public abstract void stop(boolean force);
-
protected abstract void forceStop();
protected abstract IStatus gracefullStop();
14 years, 9 months
JBoss Tools SVN: r32656 - 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: adietish
Date: 2011-07-06 10:41:51 -0400 (Wed, 06 Jul 2011)
New Revision: 32656
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
Log:
[JBIDE-9215] deprecated #getPoller(String pollerId, boolean expectedState, IServer server) since expected state and server is not used (!)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-06 14:37:55 UTC (rev 32655)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-06 14:41:51 UTC (rev 32656)
@@ -30,7 +30,7 @@
// IF shutting down a process started OUTSIDE of eclipse, force use the web poller,
// since there's no process watch for shutdowns
if( !expectedState && process == null )
- poller = PollThreadUtils.getPoller(WebPortPoller.WEB_POLLER_ID, false, getServer());
+ poller = PollThreadUtils.getPoller(WebPortPoller.WEB_POLLER_ID);
this.pollThread = new PollThread(expectedState, poller, getActualBehavior());
pollThread.start();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-06 14:37:55 UTC (rev 32655)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-06 14:41:51 UTC (rev 32656)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.util;
import org.eclipse.wst.server.core.IServer;
@@ -25,24 +25,58 @@
*/
public class PollThreadUtils {
+ /**
+ * Returns the poller id of the poller that is currently used in the given server and
+ * that is waiting for the given state.
+ *
+ * @param expectedState
+ * @param server
+ * @return
+ */
public static String getPollerId(boolean expectedState, IServer server) {
JBossServer s = ServerConverter.getJBossServer(server);
ServerAttributeHelper helper = s.getAttributeHelper();
String key = expectedState == IServerStatePoller.SERVER_UP ?
- IJBossToolingConstants.STARTUP_POLLER_KEY
+ IJBossToolingConstants.STARTUP_POLLER_KEY
: IJBossToolingConstants.SHUTDOWN_POLLER_KEY;
String defaultPoller = expectedState == IServerStatePoller.SERVER_UP ?
- IJBossToolingConstants.DEFAULT_STARTUP_POLLER
+ IJBossToolingConstants.DEFAULT_STARTUP_POLLER
: IJBossToolingConstants.DEFAULT_SHUTDOWN_POLLER;
String pollerId = helper.getAttribute(key, defaultPoller);
return pollerId;
}
+ /**
+ * Returns the poller that is current used in the given server for the expected state.
+ *
+ * @param expectedState the state that the poller waits for
+ * @param server the server that is using the poller
+ * @return
+ */
public static IServerStatePoller getPoller(boolean expectedState, IServer server) {
- return getPoller(getPollerId(expectedState, server), expectedState, server);
+ return getPoller(getPollerId(expectedState, server));
}
+ /**
+ * Returns the poller for the given poller id.
+ *
+ * @param pollerId the id of the poller to use
+ * @param expectedState
+ * @param server
+ * @return
+ */
+ @Deprecated
public static IServerStatePoller getPoller(String pollerId, boolean expectedState, IServer server) {
+ return getPoller(pollerId);
+ }
+
+ /**
+ * Returns the poller for the given poller id.
+ *
+ * @param pollerId the id of the poller to use
+ * @return the poller for the given id
+ */
+ public static IServerStatePoller getPoller(String pollerId) {
ServerStatePollerType type = ExtensionManager.getDefault().getPollerType(pollerId);
if (type != null) {
IServerStatePoller tempPoller = type.createPoller();
@@ -52,10 +86,21 @@
return null;
}
+ /**
+ * Stops the given poll thread.
+ *
+ * @param pollThread the poll thread to stop
+ */
public static void stopPolling(PollThread pollThread) {
cancelPolling(null, pollThread);
}
+ /**
+ * Cancels the given poll thread with the given message (that tells about the reason to cancel polling).
+ *
+ * @param message the reason to cancel the poll thread
+ * @param pollThread the poll thread to cancel
+ */
public static void cancelPolling(String message, PollThread pollThread) {
if (pollThread != null) {
if (message != null) {
@@ -66,13 +111,34 @@
}
}
- protected void pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour, IServer server) {
+ /**
+ * Stops the given poll thread and creates a new poll thread for the given
+ * expected state and server behavior.
+ *
+ * @param expectedState the state to wait for
+ * @param poller the poller to use to wait for the expected state
+ * @param pollThread the poll thread to stop
+ * @param behaviour the server behavior to use.
+ * @return the new poll thread
+ */
+ public static void pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour,
+ IServer server) {
IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, server);
pollServer(expectedState, poller, pollThread, behaviour);
}
-
- public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread pollThread, DelegatingServerBehavior behaviour) {
+ /**
+ * Stops the given poll thread and creates a new poll thread for the given
+ * expected state, poller and server behavior.
+ *
+ * @param expectedState the state to wait for
+ * @param poller the poller to use to wait for the expected state
+ * @param pollThread the poll thread to stop
+ * @param behaviour the server behavior to use.
+ * @return the new poll thread
+ */
+ public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread pollThread,
+ DelegatingServerBehavior behaviour) {
stopPolling(pollThread);
PollThread newPollThread = new PollThread(expectedState, poller, behaviour);
newPollThread.start();
14 years, 9 months
JBoss Tools SVN: r32655 - trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-07-06 10:37:55 -0400 (Wed, 06 Jul 2011)
New Revision: 32655
Modified:
trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
Log:
JBIDE-9302 : fixed typo that caused the bug
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2011-07-06 14:25:20 UTC (rev 32654)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2011-07-06 14:37:55 UTC (rev 32655)
@@ -137,7 +137,7 @@
IProjectFacetVersion currentEjbVersion = fproj.getProjectFacetVersion(ejbFacet);
if ((currentWebVersion != null && currentWebVersion.compareTo(dynamicWebVersion)> -1)
- || (currentEjbVersion != null && currentEjbVersion.compareTo(dynamicWebVersion)> -1)) {
+ || (currentEjbVersion != null && currentEjbVersion.compareTo(ejbVersion)> -1)) {
installCDIFacet(fproj, cdiVersion, monitor);
} else {
String name = "";
14 years, 9 months
JBoss Tools SVN: r32654 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:25:20 -0400 (Wed, 06 Jul 2011)
New Revision: 32654
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
Log:
[JBIDE-9215] added @Override to overriding methods
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-06 14:17:15 UTC (rev 32653)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-06 14:25:20 UTC (rev 32654)
@@ -115,11 +115,13 @@
setMode(mode);
}
+ @Override
public void setServerStarting() {
setServerStarting();
getDelegate().setServerStarting();
}
+ @Override
public void setServerStopping() {
setServerStopping();
getDelegate().setServerStopping();
@@ -142,18 +144,25 @@
}
// Can start / stop / restart etc
+ @Override
public IStatus canStart(String launchMode) {
return canChangeState(launchMode);
}
+
+ @Override
public IStatus canRestart(String launchMode) {
return canChangeState(launchMode);
}
+
+ @Override
public IStatus canStop() {
return canChangeState(null);
}
+
public IStatus canStop(String launchMode) {
return canChangeState(launchMode);
}
+
protected IStatus canChangeState(String launchMode) {
if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
return Status.CANCEL_STATUS;
14 years, 9 months
JBoss Tools SVN: r32653 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:17:15 -0400 (Wed, 06 Jul 2011)
New Revision: 32653
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
Log:
[JBIDE-9215] set #setPublishData and #getPublishData to protected (was: public)
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 2011-07-06 14:12:14 UTC (rev 32652)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-07-06 14:17:15 UTC (rev 32653)
@@ -71,12 +71,12 @@
method = null;
}
- public void setPublishData(String key, Object val) {
+ protected void setPublishData(String key, Object val) {
if( publishTaskModel != null )
publishTaskModel.put(key, val);
}
- public Object getPublishData(String key) {
+ protected Object getPublishData(String key) {
if( publishTaskModel != null )
return publishTaskModel.get(key);
return null;
14 years, 9 months
JBoss Tools SVN: r32652 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: launch and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:12:14 -0400 (Wed, 06 Jul 2011)
New Revision: 32652
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java
Log:
[JBIDE-9215] renamed #serverStarting and #serverStopping to #setServerStarting and #setServerStopping
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-06 14:08:38 UTC (rev 32651)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-06 14:12:14 UTC (rev 32652)
@@ -115,12 +115,12 @@
setMode(mode);
}
- public void serverStarting() {
+ public void setServerStarting() {
setServerStarting();
getDelegate().setServerStarting();
}
- public void serverStopping() {
+ public void setServerStopping() {
setServerStopping();
getDelegate().setServerStopping();
}
@@ -135,7 +135,7 @@
super.publishFinish(monitor);
}
- public boolean shouldSuspendScanner() {
+ protected boolean shouldSuspendScanner() {
if( getServer().getServerState() != IServer.STATE_STARTED)
return false;
return true;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-07-06 14:08:38 UTC (rev 32651)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-07-06 14:12:14 UTC (rev 32652)
@@ -128,7 +128,7 @@
try {
DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
- jbsBehavior.serverStarting();
+ jbsBehavior.setServerStarting();
} catch (CoreException ce) {
// report it
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-06 14:08:38 UTC (rev 32651)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-06 14:12:14 UTC (rev 32652)
@@ -82,7 +82,7 @@
try {
DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
- jbsBehavior.serverStarting();
+ jbsBehavior.setServerStarting();
} catch (CoreException ce) {
// report it
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-06 14:08:38 UTC (rev 32651)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-06 14:12:14 UTC (rev 32652)
@@ -158,7 +158,7 @@
if( serverProcess != null )
serverProcess.terminate();
} else {
- serverStopping();
+ setServerStopping();
String host = getServer().getHost();
JBoss7Server server = ServerConverter.checkedGetJBossServer(getServer(), JBoss7Server.class);
int mgmtPort = server.getManagementPort();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java 2011-07-06 14:08:38 UTC (rev 32651)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java 2011-07-06 14:12:14 UTC (rev 32652)
@@ -57,7 +57,7 @@
try {
DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
- jbsBehavior.serverStarting();
+ jbsBehavior.setServerStarting();
} catch (CoreException ce) {
// report it
}
14 years, 9 months
JBoss Tools SVN: r32651 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 10:08:38 -0400 (Wed, 06 Jul 2011)
New Revision: 32651
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
Log:
[JBIDE-9215] renamed JBossServerBehaviour to DelegatingServerBehaviour
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 14:07:39 UTC (rev 32650)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 14:08:38 UTC (rev 32651)
@@ -41,6 +41,7 @@
* @author Rob Stryker
*
*/
+@Deprecated
public class JBossServerBehavior extends DeployableServerBehavior {
/**
14 years, 9 months