JBoss Tools SVN: r33041 - 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: rob.stryker(a)jboss.com
Date: 2011-07-19 08:06:18 -0400 (Tue, 19 Jul 2011)
New Revision: 33041
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
Log:
Temporary fix to get rse to work
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-19 11:45:35 UTC (rev 33040)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-19 12:06:18 UTC (rev 33041)
@@ -169,6 +169,10 @@
String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
String currentVMArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
+ currentArgs = ArgsUtil.setArg(currentArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JBOSS_SERVER_HOME_URL,
+ "file:" + new Path(rseHome).append(IJBossRuntimeResourceConstants.SERVER).toOSString());
+
currentVMArgs = ArgsUtil.setArg(currentVMArgs, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
new Path(rseHome).append(
14 years, 9 months
JBoss Tools SVN: r33040 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-19 07:45:35 -0400 (Tue, 19 Jul 2011)
New Revision: 33040
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
Log:
replaced Collections.Empty_list with an actual list that can add stuff
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2011-07-19 11:42:15 UTC (rev 33039)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2011-07-19 11:45:35 UTC (rev 33040)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.launch.configuration;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -236,7 +236,7 @@
@SuppressWarnings("unchecked")
public static List<String> getClasspath(ILaunchConfiguration launchConfig) throws CoreException {
return (List<String>) launchConfig.getAttribute(
- IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, Collections.emptyList());
+ IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>());
}
private static boolean isSet(String value) {
14 years, 9 months
JBoss Tools SVN: r33039 - 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-19 07:42:15 -0400 (Tue, 19 Jul 2011)
New Revision: 33039
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
Log:
[JBIDE-9054] added @Override notations where they were missing
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-19 11:36:13 UTC (rev 33038)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-19 11:42:15 UTC (rev 33039)
@@ -33,6 +33,7 @@
public class RSEJBoss7StartLaunchDelegate extends AbstractRSELaunchDelegate {
+ @Override
public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
@@ -47,14 +48,17 @@
launchPingThread(beh);
}
+ @Override
public void preLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
}
+ @Override
public void postLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
}
+ @Override
public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server)
throws CoreException {
new RSELaunchConfigurator(getDefaultLaunchCommand(workingCopy), getDefaultStopCommand(server))
14 years, 9 months
JBoss Tools SVN: r33038 - 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-19 07:36:13 -0400 (Tue, 19 Jul 2011)
New Revision: 33038
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
Log:
[JBIDE-9054] added @Override notations where they were missing
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-19 08:46:48 UTC (rev 33037)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-19 11:36:13 UTC (rev 33038)
@@ -43,6 +43,8 @@
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
public class RSEJBossStartLaunchDelegate extends AbstractRSELaunchDelegate {
+
+ @Override
public void actualLaunch(
DelegatingStartLaunchConfiguration launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
@@ -100,6 +102,7 @@
}
}
+ @Override
public boolean preLaunchCheck(ILaunchConfiguration configuration,
String mode, IProgressMonitor monitor) throws CoreException {
// ping if up
@@ -114,14 +117,17 @@
return true;
}
+ @Override
public void preLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
}
+ @Override
public void postLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
}
+ @Override
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server)
throws CoreException {
14 years, 9 months
JBoss Tools SVN: r33037 - 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-19 04:46:48 -0400 (Tue, 19 Jul 2011)
New Revision: 33037
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
[JBIDE-9054] removed unneeded local var
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-19 08:35:26 UTC (rev 33036)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-19 08:46:48 UTC (rev 33037)
@@ -53,11 +53,9 @@
@Override
protected IStatus gracefullStop() {
IServer server = getServer();
- IJBoss7ManagerService service = null;
try {
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
- service = getService();
- service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
+ getService().stop(jbossServer.getHost(), jbossServer.getManagementPort());
return Status.OK_STATUS;
} catch (Exception e) {
return new Status(
14 years, 9 months
JBoss Tools SVN: r33036 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-19 04:35:26 -0400 (Tue, 19 Jul 2011)
New Revision: 33036
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-9349 - as7 select jre
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-19 08:35:26 UTC (rev 33036)
@@ -38,20 +38,7 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
- if( LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) {
- jbsBehavior.setServerStarting();
- jbsBehavior.setServerStarted();
- return false;
- }
- // TODO: use the configured poller
- boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
- if( started ) {
- jbsBehavior.setServerStarting();
- jbsBehavior.setServerStarted();
- return false;
- }
- return true;
+ return super.preLaunchCheck(configuration, mode, monitor);
}
public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-07-19 08:15:43 UTC (rev 33035)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-07-19 08:35:26 UTC (rev 33036)
@@ -6,6 +6,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
@@ -13,6 +14,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.TaskModel;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -26,7 +28,7 @@
@Override
protected void updateModels() {
- // Do nothing
+ updateJREs();
}
@Override
@@ -34,6 +36,7 @@
createExplanation(main);
createNameComposite(main);
createHomeComposite(main);
+ createJREComposite(main);
}
protected void fillWidgets() {
@@ -42,6 +45,7 @@
try {
fillNameWidgets(rt);
fillHomeDir(rt);
+ fillJREWidgets(getRuntime());
} catch (Exception e) {
IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui, rt.getName()), e);
JBossServerUIPlugin.getDefault().getLog().log(status);
@@ -51,7 +55,12 @@
@Override
protected void updatePage() {
- // Do Nothing
+ int sel = jreCombo.getSelectionIndex();
+ int offset = -1;
+ if( sel + offset >= 0 )
+ selectedVM = installedJREs.get(sel + offset);
+ else // if sel < 0 or sel == 0 and offset == -1
+ selectedVM = null;
updateErrorMessage();
}
@@ -108,6 +117,10 @@
runtimeWC.setName(name);
runtimeWC.setLocation(new Path(homeDir));
+ IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter(
+ IJBossServerRuntime.class, new NullProgressMonitor());
+ srt.setVM(selectedVM);
+
getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-19 08:15:43 UTC (rev 33035)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-19 08:35:26 UTC (rev 33036)
@@ -221,8 +221,9 @@
if (jbsrt.isUsingDefaultJRE()) {
jreCombo.select(0);
} else {
- IVMInstall install = jbsrt.getVM();
+ IVMInstall install = jbsrt.getHardVM();
if( install != null ) {
+ selectedVM = install;
String vmName = install.getName();
String[] jres = jreCombo.getItems();
for (int i = 0; i < jres.length; i++) {
14 years, 9 months
JBoss Tools SVN: r33035 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-19 04:15:43 -0400 (Tue, 19 Jul 2011)
New Revision: 33035
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/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
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/RSEBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
[JBIDE-9364] renamed #serverIsStarting to #onServerStarting and #serverIsStopping to #onServerStopping
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-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -48,10 +48,10 @@
protected abstract IStatus gracefullStop();
- public void serverIsStarting() {
+ public void onServerStarting() {
}
- public void serverIsStopping() {
+ public void onServerStopping() {
}
@Override
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-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -108,13 +108,13 @@
@Override
public void setServerStarting() {
super.setServerStarting();
- getDelegate().serverIsStarting();
+ getDelegate().onServerStarting();
}
@Override
public void setServerStopping() {
super.setServerStopping();
- getDelegate().serverIsStopping();
+ getDelegate().onServerStopping();
}
protected void publishStart(final IProgressMonitor monitor) throws CoreException {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -27,9 +27,9 @@
public void publishFinish(final IProgressMonitor monitor) throws CoreException;
- public void serverIsStarting();
+ public void onServerStarting();
- public void serverIsStopping();
+ public void onServerStopping();
public IStatus canChangeState(String launchMode);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -183,12 +183,12 @@
&& !process.isTerminated();
}
- public void serverIsStarting() {
+ public void onServerStarting() {
nextStopRequiresForce = false;
pollServer(IServerStatePoller.SERVER_UP);
}
- public void serverIsStopping() {
+ public void onServerStopping() {
pollServer(IServerStatePoller.SERVER_DOWN);
}
Modified: 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-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -45,19 +45,13 @@
protected abstract String getShutdownCommand(IServer server) throws CoreException;
- /**
- * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStarting()} instead.
- * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop.
- */
- public void serverIsStarting() {
+ @Override
+ public void onServerStarting() {
pollServer(IServerStatePoller.SERVER_UP);
}
- /**
- * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStopping()} instead.
- * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop.
- */
- public void serverIsStopping() {
+ @Override
+ public void onServerStopping() {
pollServer(IServerStatePoller.SERVER_DOWN);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -59,12 +59,12 @@
}
@Override
- public void serverIsStarting() {
+ public void onServerStarting() {
pollServer(IServerStatePoller.SERVER_UP);
}
@Override
- public void serverIsStopping() {
+ public void onServerStopping() {
pollServer(IServerStatePoller.SERVER_DOWN);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-19 00:29:48 UTC (rev 33034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035)
@@ -41,12 +41,12 @@
}
@Override
- public void serverIsStarting() {
+ public void onServerStarting() {
pollServer(IServerStatePoller.SERVER_UP);
}
@Override
- public void serverIsStopping() {
+ public void onServerStopping() {
pollServer(IServerStatePoller.SERVER_DOWN);
}
14 years, 9 months
JBoss Tools SVN: r33034 - in trunk/common/tests/org.jboss.tools.common.model.test: src/org/jboss/tools/common/model/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-18 20:29:48 -0400 (Mon, 18 Jul 2011)
New Revision: 33034
Added:
trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/y.properties
Modified:
trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/PropertiesLoaderTest.java
Log:
JBIDE-9357
https://issues.jboss.org/browse/JBIDE-9357
Added: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/y.properties
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/y.properties (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/y.properties 2011-07-19 00:29:48 UTC (rev 33034)
@@ -0,0 +1,4 @@
+foobar1=f�d�ral
+foobar2=f�d�ral
+foobar3= f�d�ral
+foobar4= f�d�ral
Property changes on: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/y.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/PropertiesLoaderTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/PropertiesLoaderTest.java 2011-07-19 00:06:28 UTC (rev 33033)
+++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/PropertiesLoaderTest.java 2011-07-19 00:29:48 UTC (rev 33034)
@@ -11,7 +11,9 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.TestProjectProvider;
@@ -74,4 +76,16 @@
assertEquals(p4.getAttributeValue("value"), "again first line \\again second line");
}
+ public void testLoadingPropertiesDoesNotModifyContent() throws CoreException {
+ IFile f = project.getFile(new Path("src/y.properties"));
+ String text = FileUtil.readStream(f);
+ System.out.println(text);
+ XModelObject p = EclipseResourceUtil.createObjectForResource(f);
+ assertNotNull(p);
+ String newText = ((FileAnyImpl)p).getAsText();
+ System.out.println(newText);
+ assertEquals(text, newText);
+
+ }
+
}
14 years, 9 months
JBoss Tools SVN: r33033 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-18 20:06:28 -0400 (Mon, 18 Jul 2011)
New Revision: 33033
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
Log:
Partial fix for
JBIDE-8359 VisualEditor throws exception and stays open for file from project that is being closed
JSPMultipageEditorPart should call setEditorPart on JSP Source editor
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2011-07-18 23:56:36 UTC (rev 33032)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2011-07-19 00:06:28 UTC (rev 33033)
@@ -429,62 +429,32 @@
protected void createPages() {
- // Sergey Vasilyev
- /*
- * TODO to author of this class VPE work on linux! this check not need
- * in future
- */
createPagesForVPE();
loadSelectedTab();
- // if (selectedPageIndex == sourceIndex) {
- // visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE);
- // // switchOutlineToJSPEditor();
- // }
- // if (selectedPageIndex == 2) {
- // setActivePage(0);
- // pageChange(0);
- // if (visualEditor != null)
- // visualEditor.maximizeSource();
- // selectedPageIndex=0;
- // } else if (selectedPageIndex == 1) {
- // setActivePage(0);
- // pageChange(0);
- // if (visualEditor != null)
- // visualEditor.maximizeVisual();
- // selectedPageIndex=0;
- // } else {
- // selectedPageIndex=0;
- // setActivePage(selectedPageIndex);
- // pageChange(selectedPageIndex);
- // }
switch (selectedPageIndex) {
-
- case 0: {
- // source/visual mode
- setActivePage(selectedPageIndex);
- pageChange(selectedPageIndex);
- break;
+ case 0: {
+ // source/visual mode
+ setActivePage(selectedPageIndex);
+ pageChange(selectedPageIndex);
+ break;
+ } case 1: {
+ // source mode
+ setActivePage(selectedPageIndex);
+ pageChange(selectedPageIndex);
+ break;
+ } case 2: {
+ // preview mode
+ setActivePage(selectedPageIndex);
+ pageChange(selectedPageIndex);
+ break;
+ } default: {
+ // by default we sets source/visual mode
+ setActivePage(0);
+ pageChange(0);
+ break;
+ }
}
- case 1: {
- // source mode
- setActivePage(selectedPageIndex);
- pageChange(selectedPageIndex);
- break;
- }
- case 2: {
- // preview mode
- setActivePage(selectedPageIndex);
- pageChange(selectedPageIndex);
- break;
- }
- default: {
- // by default we sets source/visual mode
- setActivePage(0);
- pageChange(0);
- break;
- }
- }
IFile f = getFile();
if (f != null && f.exists()) {
@@ -500,6 +470,8 @@
* Create Source Editor and BundleMap
*/
sourceEditor = new JSPTextEditor(this);
+ sourceEditor.setEditorPart(this);
+
/*
* Create Bundle Map here but Initialize it in the VpeController
* or here if there is only the source part.
14 years, 9 months
JBoss Tools SVN: r33032 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-18 19:56:36 -0400 (Mon, 18 Jul 2011)
New Revision: 33032
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
Log:
JBIDE-9357
https://issues.jboss.org/browse/JBIDE-9357
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2011-07-18 23:24:31 UTC (rev 33031)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2011-07-18 23:56:36 UTC (rev 33032)
@@ -193,10 +193,10 @@
appendComments(sb, cs[i].get("COMMENTS"), cs[i].get("SEPARATOR"), lineSeparator); //$NON-NLS-1$ //$NON-NLS-2$
if(XModelObjectConstants.NO.equals(cs[i].get("ENABLED"))) sb.append('#'); //$NON-NLS-1$
String dirtyname = cs[i].getAttributeValue("dirtyname"); //$NON-NLS-1$
- String name = EncodedProperties.saveConvert(cs[i].get(XModelObjectConstants.XML_ATTR_NAME), true); // convertName(cs[i].get(XModelObjectConstants.XML_ATTR_NAME));
+ String name = EncodedProperties.saveConvert(cs[i].get(XModelObjectConstants.XML_ATTR_NAME), true);
String value = cs[i].get("VALUE"); //$NON-NLS-1$
String dirtyvalue = cs[i].getAttributeValue("dirtyvalue"); //$NON-NLS-1$
- if(value == null || dirtyvalue == null || !value.equals(dirtyvalue.trim())) {
+ if(value == null || dirtyvalue == null || !value.equals(trimLeft(dirtyvalue))) {
value = EncodedProperties.saveConvert(value, false); // convertValue(value);
}
String resolved = resolveValue(value, dirtyvalue);
@@ -231,10 +231,16 @@
if(conclusion != null) sb.append(conclusion);
return sb.toString();
}
+
+ private String trimLeft(String s) {
+ int qq = 0;
+ while(qq < s.length() && s.charAt(qq) <= ' ') qq++;
+ return (qq > 0) ? s.substring(qq) : s;
+ }
String resolveValue(String value, String dirtyvalue) {
if(dirtyvalue == null) return value;
- if(dirtyvalue.trim().equals(value)) return dirtyvalue;
+ if(trimLeft(dirtyvalue).equals(value)) return dirtyvalue;
if(dirtyvalue.indexOf(INTERNAL_SEPARATOR) < 0) {
if(value.equals(convertDirtyValue(dirtyvalue))) {
return dirtyvalue;
@@ -349,21 +355,29 @@
String tr = s.trim();
if(tr.length() == 0 || tr.charAt(0) == '#' || tr.charAt(0) == '!') return -1;
boolean n = false;
+ boolean backslash = false;
int firstWhiteSpace = -1;
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
- if(Character.isWhitespace(c)) {
+ if(backslash && (c == ' ' || c == 't' || c == 'n')) {
+ // do nothing
+ } else if(Character.isWhitespace(c)) {
if(n) {
if(firstWhiteSpace < 0) firstWhiteSpace = i;
//return i;
}
continue;
} else if(c == '=' || c == ':') {
- return i;
+ if(!backslash) return i;
} else {
if(n && firstWhiteSpace >= 0) return firstWhiteSpace;
n = true;
}
+ if(c == '\\') {
+ backslash = !backslash;
+ } else {
+ backslash = false;
+ }
}
return s.length();
}
14 years, 9 months