[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages ...
Robert Stryker
rawblem at gmail.com
Thu Nov 9 19:30:21 EST 2006
User: rawb
Date: 06/11/09 19:30:21
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages
JBossServersPreferencePage.java
ViewProviderPreferenceComposite.java
ViewPreferencePage.java
Log:
Rewrote ui entirely
Revision Changes Path
1.6 +29 -11 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServersPreferencePage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- JBossServersPreferencePage.java 10 Oct 2006 04:28:43 -0000 1.5
+++ JBossServersPreferencePage.java 10 Nov 2006 00:30:21 -0000 1.6
@@ -62,6 +62,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCore;
import org.jboss.ide.eclipse.as.core.server.JBossServer;
import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper;
+import org.jboss.ide.eclipse.as.core.server.attributes.IServerPollingAttributes;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -269,12 +270,12 @@
startSpinner.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- getSelectedWC().setStartTimeout(startSpinner.getSelection());
+ getSelectedWC().setAttribute(IServerPollingAttributes.START_TIMEOUT, startSpinner.getSelection());
}
});
stopSpinner.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- getSelectedWC().setStopTimeout(stopSpinner.getSelection());
+ getSelectedWC().setAttribute(IServerPollingAttributes.STOP_TIMEOUT, stopSpinner.getSelection());
}
});
@@ -283,7 +284,7 @@
}
public void widgetSelected(SelectionEvent e) {
if( getSelectedWC() != null )
- getSelectedWC().setTimeoutBehavior(ServerAttributeHelper.TIMEOUT_ABORT);
+ getSelectedWC().setAttribute(IServerPollingAttributes.TIMEOUT_BEHAVIOR, IServerPollingAttributes.TIMEOUT_ABORT);
}
});
ignoreOnTimeout.addSelectionListener(new SelectionListener() {
@@ -291,7 +292,7 @@
}
public void widgetSelected(SelectionEvent e) {
if( getSelectedWC() != null )
- getSelectedWC().setTimeoutBehavior(ServerAttributeHelper.TIMEOUT_IGNORE);
+ getSelectedWC().setAttribute(IServerPollingAttributes.TIMEOUT_BEHAVIOR, IServerPollingAttributes.TIMEOUT_IGNORE);
}
});
@@ -304,11 +305,11 @@
/* Handle spinners */
startSpinner.setMaximum(((ServerType)server.getServer().getServerType()).getStartTimeout());
stopSpinner.setMaximum(((ServerType)server.getServer().getServerType()).getStopTimeout());
- startSpinner.setSelection(wcHelper.getStartTimeout());
- stopSpinner.setSelection(wcHelper.getStopTimeout());
+ startSpinner.setSelection(getStartTimeout(wcHelper));
+ stopSpinner.setSelection(getStopTimeout(wcHelper));
- boolean currentVal = wcHelper.getTimeoutBehavior();
- if( currentVal == ServerAttributeHelper.TIMEOUT_ABORT) {
+ boolean currentVal = wcHelper.getAttribute(IServerPollingAttributes.TIMEOUT_BEHAVIOR, IServerPollingAttributes.TIMEOUT_IGNORE);
+ if( currentVal == IServerPollingAttributes.TIMEOUT_ABORT) {
abortOnTimeout.setSelection(true);
ignoreOnTimeout.setSelection(false);
} else {
@@ -317,6 +318,21 @@
}
}
+ public int getStartTimeout(ServerAttributeHelper helper) {
+ int prop = helper.getAttribute(IServerPollingAttributes.START_TIMEOUT, -1);
+ int max = ((ServerType)helper.getServer().getServerType()).getStartTimeout();
+
+ if( prop <= 0 || prop > max ) return max;
+ return prop;
+ }
+ public int getStopTimeout(ServerAttributeHelper helper) {
+ int prop = helper.getAttribute(IServerPollingAttributes.STOP_TIMEOUT, -1);
+ int max = ((ServerType)helper.getServer().getServerType()).getStopTimeout();
+
+ if( prop <= 0 || prop > max ) return max;
+ return prop;
+ }
+
private ServerAttributeHelper getWCHelper(JBossServer server) {
if( workingCoppies.get(server) == null ) {
@@ -349,6 +365,8 @@
}
+
+
public boolean performOk() {
super.performOk();
saveDirtyWorkingCoppies();
@@ -364,10 +382,10 @@
while(i.hasNext()) {
o = i.next();
if( o instanceof ServerAttributeHelper) {
- copy = ((ServerAttributeHelper)o).getServer();
- if( copy.isDirty()) {
+ ServerAttributeHelper o2 = (ServerAttributeHelper)o;
+ if( o2.isDirty() ) {
try {
- copy.save(true, new NullProgressMonitor());
+ o2.save(true, new NullProgressMonitor());
} catch( CoreException ce) {
ce.printStackTrace();
}
1.3 +0 -21 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewProviderPreferenceComposite.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ViewProviderPreferenceComposite.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewProviderPreferenceComposite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ViewProviderPreferenceComposite.java 31 Jul 2006 19:43:42 -0000 1.2
+++ ViewProviderPreferenceComposite.java 10 Nov 2006 00:30:21 -0000 1.3
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
package org.jboss.ide.eclipse.as.ui.preferencepages;
import org.eclipse.swt.widgets.Composite;
1.5 +3 -3 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ViewPreferencePage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ViewPreferencePage.java 20 Sep 2006 21:03:42 -0000 1.4
+++ ViewPreferencePage.java 10 Nov 2006 00:30:21 -0000 1.5
@@ -51,8 +51,8 @@
import org.eclipse.ui.part.PageBook;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider;
-import org.jboss.ide.eclipse.as.ui.views.JBossServerView;
+import org.jboss.ide.eclipse.as.ui.views.server.JBossServerView;
+import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
public class ViewPreferencePage extends PreferencePage implements
IWorkbenchPreferencePage {
@@ -65,7 +65,7 @@
private ArrayList preferenceComposites;
private PageBook book;
private Composite mainComposite;
- ServerViewProvider[] providers;
+ private ServerViewProvider[] providers;
public ViewPreferencePage() {
More information about the jboss-cvs-commits
mailing list