--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/control/SelectorControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/control/SelectorControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -37,7 +37,7 @@
@SuppressWarnings({"serial"})
public abstract class SelectorControl<P extends PanelDescriptor,
- C extends SelectorPanel, S> extends SwingSettingsControl<P, C> {
+ C extends SelectorPanel, S> extends SettingsControl<P, C> {
//
// Instance data
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/control/SettingsControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -0,0 +1,270 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
+package org.opensolaris.os.vp.panel.swing.control;
+
+import java.awt.event.*;
+import java.net.URL;
+import java.util.List;
+import org.opensolaris.os.vp.panel.common.ClientContext;
+import org.opensolaris.os.vp.panel.common.action.*;
+import org.opensolaris.os.vp.panel.common.control.*;
+import org.opensolaris.os.vp.panel.common.model.PanelDescriptor;
+import org.opensolaris.os.vp.util.misc.ChangeableAggregator;
+import org.opensolaris.os.vp.util.swing.SettingsPanel;
+
+/**
+ * {@code SettingsControl} extends class {@link SwingControl} to provide
+ * support for {@link SettingsPanel}s.
+ */
+public class SettingsControl<P extends PanelDescriptor,
+ C extends SettingsPanel> extends SwingControl<P, C> {
+
+ //
+ // Constructors
+ //
+
+ public SettingsControl(String id, String name, ClientContext context) {
+ super(id, name, context);
+ }
+
+ public SettingsControl(String id, String name, P descriptor) {
+ super(id, name, descriptor);
+ }
+
+ //
+ // SwingControl methods
+ //
+
+ /**
+ * Returns {@code getComponent().getChangeableAggregator()}.
+ */
+ @Override
+ public ChangeableAggregator getChangeableAggregator() {
+ C comp = getComponent();
+ if (comp != null) {
+ return comp.getChangeableAggregator();
+ }
+ return null;
+ }
+
+ //
+ // SettingsControl methods
+ //
+
+ /**
+ * Adds a listener to the <strong>Apply</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to invoke this {@link
+ * Control}'s save action.
+ */
+ protected void addDefaultApplyAction() {
+ getComponent().getButtonBar().getApplyButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ getSaveAction().asyncInvoke();
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Back</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to navigate up one level in
+ * the navigation stack.
+ */
+ protected void addDefaultBackAction() {
+ getComponent().getButtonBar().getBackButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ getNavigator().goToAsync(false, SettingsControl.this,
+ Navigator.PARENT_NAVIGABLE);
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Cancel</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to call {@link #doQuit}, if
+ * {@code quit} is {@code true}, or {@link #doCancel}, if {@code quit} is
+ * {@code false}.
+ */
+ protected void addDefaultCancelAction(final boolean quit) {
+ getComponent().getButtonBar().getCancelButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (quit) {
+ doQuit();
+ } else {
+ doCancel();
+ }
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Close</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to call {@link
+ * #doSaveAndQuit}, if {@code quit} is {@code true}, or {@link #doOkay}, if
+ * {@code quit} is {@code false}.
+ */
+ protected void addDefaultCloseAction(final boolean quit) {
+ getComponent().getButtonBar().getCloseButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (quit) {
+ doSaveAndQuit();
+ } else {
+ doOkay();
+ }
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Help</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to show this {@code
+ * DefaultControl}'s {@link DefaultControl#getHelpURL help}.
+ *
+ * @param topmost {@code false} to display the help from this {@link
+ * Control}, {@code true} to display the help from the topmost
+ * {@link Control} in the navigation stack
+ */
+ protected void addDefaultHelpAction(final boolean topmost) {
+ getComponent().getButtonBar().getHelpButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ URL url = null;
+
+ if (topmost) {
+ List<Control> controls = getNavigator().getPath();
+ for (int i = controls.size() - 1; i >= 0; i--) {
+ Control control = controls.get(i);
+ url = control.getHelpURL();
+ if (url != null) {
+ break;
+ }
+ }
+ } else {
+ url = getHelpURL();
+ }
+
+ if (url != null) {
+ ClientContext context = getClientContext();
+ context.getHelpBroker().setCurrentURL(url);
+ context.showHelp();
+ }
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Okay</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to call {@link
+ * #doSaveAndQuit}, if {@code quit} is {@code true}, or {@link #doOkay}, if
+ * {@code quit} is {@code false}.
+ */
+ protected void addDefaultOkayAction(final boolean quit) {
+ getComponent().getButtonBar().getOkayButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (quit) {
+ doSaveAndQuit();
+ } else {
+ doOkay();
+ }
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Quit</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to close this instance.
+ */
+ protected void addDefaultQuitAction() {
+ getComponent().getButtonBar().getQuitButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doQuit();
+ }
+ });
+ }
+
+ /**
+ * Adds a listener to the <strong>Reset</strong> button of this {@code
+ * SettingsControl}'s {@link SettingsPanel} to invoke this {@link
+ * Control}'s reset action.
+ */
+ protected void addDefaultResetAction() {
+ getComponent().getButtonBar().getResetButton().addActionListener(
+ new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ getResetAction().asyncInvoke();
+ }
+ });
+ }
+
+ /**
+ * Asynchronously closes this instance.
+ */
+ public void doQuit() {
+ final StructuredAction<?, ?, ?> resetAction = getResetAction();
+ resetAction.asyncExec(
+ new Runnable() {
+ @Override
+ public void run() {
+ try {
+ getClientContext().closeInstance(true);
+ } catch (ActionException ignore) {
+ }
+ }
+ });
+ }
+
+ /**
+ * Asynchronously invokes this {@link Control}'s save action, then closes
+ * this instance.
+ */
+ public void doSaveAndQuit() {
+ final StructuredAction<?, ?, ?> saveAction = getSaveAction();
+ saveAction.asyncExec(
+ new Runnable() {
+ @Override
+ public void run() {
+ try {
+ saveAction.invoke();
+ getClientContext().closeInstance(false);
+ } catch (ActionException ignore) {
+ }
+ }
+ });
+ }
+}
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/control/SwingSettingsControl.java Thu Jul 22 09:32:01 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-package org.opensolaris.os.vp.panel.swing.control;
-
-import java.awt.event.*;
-import java.net.URL;
-import java.util.List;
-import org.opensolaris.os.vp.panel.common.ClientContext;
-import org.opensolaris.os.vp.panel.common.action.*;
-import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.common.model.PanelDescriptor;
-import org.opensolaris.os.vp.util.misc.ChangeableAggregator;
-import org.opensolaris.os.vp.util.swing.SettingsPanel;
-
-/**
- * {@code SwingSettingsControl} extends class {@link SwingControl} to provide
- * support for {@link SettingsPanel}s.
- */
-public class SwingSettingsControl<P extends PanelDescriptor,
- C extends SettingsPanel> extends SwingControl<P, C> {
-
- //
- // Constructors
- //
-
- public SwingSettingsControl(String id, String name, ClientContext context) {
- super(id, name, context);
- }
-
- public SwingSettingsControl(String id, String name, P descriptor) {
- super(id, name, descriptor);
- }
-
- //
- // SwingControl methods
- //
-
- /**
- * Returns {@code getComponent().getChangeableAggregator()}.
- */
- @Override
- public ChangeableAggregator getChangeableAggregator() {
- C comp = getComponent();
- if (comp != null) {
- return comp.getChangeableAggregator();
- }
- return null;
- }
-
- //
- // SwingSettingsControl methods
- //
-
- /**
- * Adds a listener to the <strong>Apply</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to invoke this {@link
- * Control}'s save action.
- */
- protected void addDefaultApplyAction() {
- getComponent().getButtonBar().getApplyButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- getSaveAction().asyncInvoke();
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Back</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to navigate up one level in
- * the navigation stack.
- */
- protected void addDefaultBackAction() {
- getComponent().getButtonBar().getBackButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- getNavigator().goToAsync(false, SwingSettingsControl.this,
- Navigator.PARENT_NAVIGABLE);
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Cancel</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to call {@link #doQuit}, if
- * {@code quit} is {@code true}, or {@link #doCancel}, if {@code quit} is
- * {@code false}.
- */
- protected void addDefaultCancelAction(final boolean quit) {
- getComponent().getButtonBar().getCancelButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- if (quit) {
- doQuit();
- } else {
- doCancel();
- }
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Close</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to call {@link
- * #doSaveAndQuit}, if {@code quit} is {@code true}, or {@link #doOkay}, if
- * {@code quit} is {@code false}.
- */
- protected void addDefaultCloseAction(final boolean quit) {
- getComponent().getButtonBar().getCloseButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- if (quit) {
- doSaveAndQuit();
- } else {
- doOkay();
- }
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Help</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to show this {@code
- * DefaultControl}'s {@link DefaultControl#getHelpURL help}.
- *
- * @param topmost {@code false} to display the help from this {@link
- * Control}, {@code true} to display the help from the topmost
- * {@link Control} in the navigation stack
- */
- protected void addDefaultHelpAction(final boolean topmost) {
- getComponent().getButtonBar().getHelpButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- URL url = null;
-
- if (topmost) {
- List<Control> controls = getNavigator().getPath();
- for (int i = controls.size() - 1; i >= 0; i--) {
- Control control = controls.get(i);
- url = control.getHelpURL();
- if (url != null) {
- break;
- }
- }
- } else {
- url = getHelpURL();
- }
-
- if (url != null) {
- ClientContext context = getClientContext();
- context.getHelpBroker().setCurrentURL(url);
- context.showHelp();
- }
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Okay</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to call {@link
- * #doSaveAndQuit}, if {@code quit} is {@code true}, or {@link #doOkay}, if
- * {@code quit} is {@code false}.
- */
- protected void addDefaultOkayAction(final boolean quit) {
- getComponent().getButtonBar().getOkayButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- if (quit) {
- doSaveAndQuit();
- } else {
- doOkay();
- }
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Quit</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to close this instance.
- */
- protected void addDefaultQuitAction() {
- getComponent().getButtonBar().getQuitButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- doQuit();
- }
- });
- }
-
- /**
- * Adds a listener to the <strong>Reset</strong> button of this {@code
- * SwingSettingsControl}'s {@link SettingsPanel} to invoke this {@link
- * Control}'s reset action.
- */
- protected void addDefaultResetAction() {
- getComponent().getButtonBar().getResetButton().addActionListener(
- new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- getResetAction().asyncInvoke();
- }
- });
- }
-
- /**
- * Asynchronously closes this instance.
- */
- public void doQuit() {
- final StructuredAction<?, ?, ?> resetAction = getResetAction();
- resetAction.asyncExec(
- new Runnable() {
- @Override
- public void run() {
- try {
- getClientContext().closeInstance(true);
- } catch (ActionException ignore) {
- }
- }
- });
- }
-
- /**
- * Asynchronously invokes this {@link Control}'s save action, then closes
- * this instance.
- */
- public void doSaveAndQuit() {
- final StructuredAction<?, ?, ?> saveAction = getSaveAction();
- saveAction.asyncExec(
- new Runnable() {
- @Override
- public void run() {
- try {
- saveAction.invoke();
- getClientContext().closeInstance(false);
- } catch (ActionException ignore) {
- }
- }
- });
- }
-}
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/model/SimpleModelControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/model/SimpleModelControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panel.swing.model;
@@ -29,7 +28,7 @@
import java.net.URL;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.model.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.swing.SettingsPanel;
/**
@@ -41,7 +40,7 @@
*/
public class SimpleModelControl<M extends Model,
P extends PanelDescriptor, V extends SettingsPanel & View<M>>
- extends SwingSettingsControl<P, V> {
+ extends SettingsControl<P, V> {
//
// Instance data
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/smf/ServiceSettingsControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/smf/ServiceSettingsControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panel.swing.smf;
@@ -30,11 +29,11 @@
import org.opensolaris.os.scf.common.ScfException;
import org.opensolaris.os.vp.panel.common.action.ActionFailedException;
import org.opensolaris.os.vp.panel.common.smf.SmfMutableProperty;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.*;
public class ServiceSettingsControl extends
- SwingSettingsControl<ServiceSwingPanelDescriptor, ServiceSettingsPanel> {
+ SettingsControl<ServiceSwingPanelDescriptor, ServiceSettingsPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/smf/ServiceStatusControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/smf/ServiceStatusControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -31,11 +31,11 @@
import javax.management.InstanceNotFoundException;
import org.opensolaris.os.vp.panel.common.model.PanelDescriptor;
import org.opensolaris.os.vp.panel.common.smf.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class ServiceStatusControl<P extends PanelDescriptor>
- extends SwingSettingsControl<P, ServiceStatusPanel> {
+ extends SettingsControl<P, ServiceStatusPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/GlobalControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/GlobalControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.apache.client.swing;
@@ -38,7 +37,7 @@
import org.opensolaris.os.vp.util.misc.property.MutableProperty;
public class GlobalControl
- extends SwingSettingsControl<ApachePanelDescriptor, GlobalPanel>
+ extends SettingsControl<ApachePanelDescriptor, GlobalPanel>
implements PropertyChangeListener, HasMimeTypes, HasModules {
//
--- a/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/MimeTypeControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/MimeTypeControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.apache.client.swing;
@@ -29,11 +28,11 @@
import java.util.Map;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class MimeTypeControl
- extends SwingSettingsControl<ApachePanelDescriptor, MimeTypePanel> {
+ extends SettingsControl<ApachePanelDescriptor, MimeTypePanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/ModuleControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/ModuleControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.apache.client.swing;
@@ -29,11 +28,11 @@
import java.util.Map;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class ModuleControl
- extends SwingSettingsControl<ApachePanelDescriptor, ModulePanel> {
+ extends SettingsControl<ApachePanelDescriptor, ModulePanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/VirtualHostGeneralControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/VirtualHostGeneralControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.apache.client.swing;
@@ -36,7 +35,7 @@
import org.opensolaris.os.vp.util.misc.property.MutableProperty;
public class VirtualHostGeneralControl
- extends SwingSettingsControl<ApachePanelDescriptor, VirtualHostGeneralPanel>
+ extends SettingsControl<ApachePanelDescriptor, VirtualHostGeneralPanel>
implements HasMimeTypes {
//
--- a/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/VirtualHostSSLControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/apache/org/opensolaris/os/vp/panels/apache/client/swing/VirtualHostSSLControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -33,12 +33,12 @@
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
import org.opensolaris.os.vp.panel.common.network.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
import org.opensolaris.os.vp.util.misc.property.MutableProperty;
public class VirtualHostSSLControl
- extends SwingSettingsControl<ApachePanelDescriptor, VirtualHostSSLPanel> {
+ extends SettingsControl<ApachePanelDescriptor, VirtualHostSSLPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CoreAdmSettingsTab.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CoreAdmSettingsTab.java Thu Jul 22 10:10:18 2010 -0400
@@ -39,7 +39,7 @@
import org.opensolaris.os.vp.util.swing.ReplacingStackPanel;
public class CoreAdmSettingsTab
- extends SwingSettingsControl<CoreAdmPanelDescriptor, CoreAdmSettingsPanel>
+ extends SettingsControl<CoreAdmPanelDescriptor, CoreAdmSettingsPanel>
implements HasTabComponent {
//
--- a/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CoresTab.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CoresTab.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.coreadm.client.swing;
@@ -35,7 +34,7 @@
import org.opensolaris.os.vp.util.misc.Finder;
public class CoresTab
- extends SwingSettingsControl<CoreAdmPanelDescriptor, CoresPanel> {
+ extends SettingsControl<CoreAdmPanelDescriptor, CoresPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CustomCoreSchemeEditControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CustomCoreSchemeEditControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -29,12 +29,12 @@
import org.opensolaris.os.scf.common.ScfException;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.smf.SmfUtil;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
import org.opensolaris.os.vp.util.misc.property.MutableProperty;
public class CustomCoreSchemeEditControl extends
- SwingSettingsControl<CoreAdmPanelDescriptor, CustomCoreSchemeEditPanel> {
+ SettingsControl<CoreAdmPanelDescriptor, CustomCoreSchemeEditPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/examples/org/opensolaris/os/vp/panels/example/time2/client/swing/TimeControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/examples/org/opensolaris/os/vp/panels/example/time2/client/swing/TimeControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.example.time2.client.swing;
@@ -29,10 +28,10 @@
import java.util.Date;
import org.opensolaris.os.rad.ObjectException;
import org.opensolaris.os.vp.panel.common.action.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
public class TimeControl
- extends SwingSettingsControl<TimePanelDescriptor, TimePanel> {
+ extends SettingsControl<TimePanelDescriptor, TimePanel> {
//
// Instance data
--- a/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/FirewallDefaultTab.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/FirewallDefaultTab.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.firewall.client.swing;
@@ -31,13 +30,13 @@
import java.util.Map;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.panels.firewall.client.swing.AccessPolicy.Type;
import org.opensolaris.os.vp.util.misc.Finder;
import org.opensolaris.os.vp.util.misc.property.MutableProperty;
public class FirewallDefaultTab
- extends SwingSettingsControl<FirewallPanelDescriptor, FirewallSettingsPanel>
+ extends SettingsControl<FirewallPanelDescriptor, FirewallSettingsPanel>
{
//
--- a/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/FirewallOpenPortsTab.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/FirewallOpenPortsTab.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.firewall.client.swing;
@@ -31,12 +30,12 @@
import java.util.*;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
import org.opensolaris.os.vp.util.misc.property.BasicMutableProperty;
public class FirewallOpenPortsTab
- extends SwingSettingsControl<FirewallPanelDescriptor,
+ extends SettingsControl<FirewallPanelDescriptor,
FirewallOpenPortsPanel> {
//
--- a/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/FirewallOverrideTab.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/FirewallOverrideTab.java Thu Jul 22 10:10:18 2010 -0400
@@ -30,12 +30,12 @@
import java.util.Map;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.panels.firewall.client.swing.AccessPolicy.Type;
import org.opensolaris.os.vp.util.misc.Finder;
public class FirewallOverrideTab
- extends SwingSettingsControl<FirewallPanelDescriptor, FirewallSettingsPanel>
+ extends SettingsControl<FirewallPanelDescriptor, FirewallSettingsPanel>
{
//
--- a/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/GlobalControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/GlobalControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -70,7 +70,7 @@
super.childStarted(child);
ChangeableAggregator childAgg =
- ((SwingSettingsControl<?, ?>)child).getComponent().
+ ((SettingsControl<?, ?>)child).getComponent().
getChangeableAggregator();
if (changeableAggregator.getChangeables().contains(childAgg))
--- a/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/MainControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/MainControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -69,7 +69,7 @@
if (child instanceof ServiceEditControl) {
getComponent().getChangeableAggregator().addChangeables(
- ((SwingSettingsControl<?, ?>)child).getComponent().
+ ((SettingsControl<?, ?>)child).getComponent().
getChangeableAggregator());
} else {
getComponent().getChangeableAggregator().addChangeables(
@@ -83,7 +83,7 @@
if (child instanceof ServiceEditControl) {
getComponent().getChangeableAggregator().removeChangeable(
- ((SwingSettingsControl<?, ?>)child).getComponent().
+ ((SettingsControl<?, ?>)child).getComponent().
getChangeableAggregator());
} else {
getComponent().getChangeableAggregator().removeChangeable(
--- a/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/ServiceEditControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/firewall/org/opensolaris/os/vp/panels/firewall/client/swing/ServiceEditControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -32,11 +32,11 @@
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
import org.opensolaris.os.vp.panel.common.smf.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class ServiceEditControl
- extends SwingSettingsControl<FirewallPanelDescriptor, ServiceEditPanel> {
+ extends SettingsControl<FirewallPanelDescriptor, ServiceEditPanel> {
//
// Static data
@@ -123,7 +123,7 @@
}
//
- // SwingSettingsControl methods
+ // SettingsControl methods
//
@Override
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/HypervisorControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/HypervisorControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -31,11 +31,11 @@
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
import org.opensolaris.os.vp.panel.common.smf.SmfMutableProperty;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.property.*;
public class HypervisorControl
- extends SwingSettingsControl<HypervisorPanelDescriptor, HypervisorPanel> {
+ extends SettingsControl<HypervisorPanelDescriptor, HypervisorPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/sharemgr/org/opensolaris/os/vp/panels/sharemgr/client/swing/CommonGeneralControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/sharemgr/org/opensolaris/os/vp/panels/sharemgr/client/swing/CommonGeneralControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.sharemgr.client.swing;
@@ -31,13 +30,13 @@
import java.util.*;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.panels.sharemgr.client.common.*;
import org.opensolaris.os.vp.util.misc.Finder;
public abstract class CommonGeneralControl
<C extends CommonManagedObject<?>, P extends CommonGeneralPanel<C>>
- extends SwingSettingsControl<SharemgrPanelDescriptor, P> {
+ extends SettingsControl<SharemgrPanelDescriptor, P> {
//
// Static data
--- a/usr/src/java/vpanels/panels/sharemgr/org/opensolaris/os/vp/panels/sharemgr/client/swing/ProtocolControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/sharemgr/org/opensolaris/os/vp/panels/sharemgr/client/swing/ProtocolControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.sharemgr.client.swing;
@@ -38,7 +37,7 @@
import org.opensolaris.os.vp.util.misc.property.MutableProperty;
public class ProtocolControl
- extends SwingSettingsControl<SharemgrPanelDescriptor, ProtocolPanel> {
+ extends SettingsControl<SharemgrPanelDescriptor, ProtocolPanel> {
//
// Instance data
--- a/usr/src/java/vpanels/panels/sharemgr/org/opensolaris/os/vp/panels/sharemgr/client/swing/SecurityModeControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/sharemgr/org/opensolaris/os/vp/panels/sharemgr/client/swing/SecurityModeControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,20 +20,20 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.sharemgr.client.swing;
import java.util.Map;
import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
-import org.opensolaris.os.vp.panels.sharemgr.client.common.SharemgrPanelDescriptor;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
+import org.opensolaris.os.vp.panels.sharemgr.client.common.
+ SharemgrPanelDescriptor;
import org.opensolaris.os.vp.panels.sharemgr.common.SharemgrUtil;
public class SecurityModeControl
- extends SwingSettingsControl<SharemgrPanelDescriptor, SecurityModePanel> {
+ extends SettingsControl<SharemgrPanelDescriptor, SecurityModePanel> {
//
// Instance data
--- a/usr/src/java/vpanels/panels/svcs/org/opensolaris/os/vp/panels/svcs/client/swing/InstancesControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/svcs/org/opensolaris/os/vp/panels/svcs/client/swing/InstancesControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.svcs.client.swing;
@@ -37,7 +36,7 @@
import org.opensolaris.os.vp.util.misc.Finder;
public class InstancesControl
- extends SwingSettingsControl<SvcsPanelDescriptor, InstancesPanel> {
+ extends SettingsControl<SvcsPanelDescriptor, InstancesPanel> {
/*
* Static data
--- a/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/WelcomeControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/WelcomeControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,17 +20,16 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.sysid.client.swing;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class WelcomeControl
- extends SwingSettingsControl<SysIdPanelDescriptor, WelcomePanel> {
+ extends SettingsControl<SysIdPanelDescriptor, WelcomePanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/sysmon/org/opensolaris/os/vp/panels/sysmon/client/swing/SysMonListControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/sysmon/org/opensolaris/os/vp/panels/sysmon/client/swing/SysMonListControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.sysmon.client.swing;
@@ -38,7 +37,7 @@
import org.opensolaris.os.vp.util.misc.Finder;
public class SysMonListControl
- extends SwingSettingsControl<SysMonPanelDescriptor, SysMonListPanel> {
+ extends SettingsControl<SysMonPanelDescriptor, SysMonListPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/usermgr/org/opensolaris/os/vp/panels/usermgr/client/swing/UserMgrAdvancedControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/usermgr/org/opensolaris/os/vp/panels/usermgr/client/swing/UserMgrAdvancedControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -31,11 +31,11 @@
import org.opensolaris.os.vp.panel.common.action.ActionFailedException;
import org.opensolaris.os.vp.panel.common.action.ActionUnauthorizedException;
import org.opensolaris.os.vp.panel.common.usermgr.Group;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class UserMgrAdvancedControl
- extends SwingSettingsControl<UserMgrPanelDescriptor, UserMgrAdvancedPanel> {
+ extends SettingsControl<UserMgrPanelDescriptor, UserMgrAdvancedPanel> {
//
// Static data
--- a/usr/src/java/vpanels/panels/usermgr/org/opensolaris/os/vp/panels/usermgr/client/swing/UserMgrBasicControl.java Thu Jul 22 09:32:01 2010 -0400
+++ b/usr/src/java/vpanels/panels/usermgr/org/opensolaris/os/vp/panels/usermgr/client/swing/UserMgrBasicControl.java Thu Jul 22 10:10:18 2010 -0400
@@ -29,11 +29,11 @@
import org.opensolaris.os.vp.panel.common.action.ActionAbortedException;
import org.opensolaris.os.vp.panel.common.action.ActionFailedException;
import org.opensolaris.os.vp.panel.common.action.ActionUnauthorizedException;
-import org.opensolaris.os.vp.panel.swing.control.SwingSettingsControl;
+import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
import org.opensolaris.os.vp.util.misc.Finder;
public class UserMgrBasicControl
- extends SwingSettingsControl<UserMgrPanelDescriptor, UserMgrBasicPanel> {
+ extends SettingsControl<UserMgrPanelDescriptor, UserMgrBasicPanel> {
//
// Static data