9416 more fully featured FMRI type (fix lint)
9417 BasicSmfProperties can't write to services (merge leftovers)
--- a/usr/src/java/build-common.xml Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/build-common.xml Thu Jun 11 14:59:29 2009 -0700
@@ -77,7 +77,10 @@
<presetdef name="javac.default">
<javac includeAntRuntime="no" sourcepathref="proj.srcroots"
srcdir="org" destdir="${proj.classes}" debug="on"
- classpathref="classpath.javac" />
+ classpathref="classpath.javac">
+ <compilerarg value="-Xlint" />
+ <compilerarg value="-Xlint:-serial" />
+ </javac>
</presetdef>
<target name="compile_project" />
--- a/usr/src/java/scf/common/org/opensolaris/os/scf/common/FMRI.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/scf/common/org/opensolaris/os/scf/common/FMRI.java Thu Jun 11 14:59:29 2009 -0700
@@ -83,7 +83,7 @@
String scheme = uri.getScheme();
scope_ = uri.getAuthority();
if (scope_ == null || scope_.isEmpty() ||
- scope_.equals(SCF_SCOPE_LOCAL));
+ scope_.equals(SCF_SCOPE_LOCAL))
scope_ = null;
canonicalStr_ = new URI(uri.getScheme(), scope_, uri.getPath(),
null, null).toString();
@@ -153,6 +153,7 @@
* Constucts an FMRI from its attributes. Needed for the class to be
* reconstructable.
*/
+ @SuppressWarnings({"fallthrough"})
@ConstructorProperties({"scheme", "svcType", "scope", "name", "service",
"instance", "propertyGroup", "property"})
public FMRI(FMRIScheme scheme, FMRIType type, String scope, String name,
@@ -162,7 +163,7 @@
scope_ = scope;
if (scope_ == null || scope_.isEmpty() ||
- scope_.equals(SCF_SCOPE_LOCAL));
+ scope_.equals(SCF_SCOPE_LOCAL))
scope_ = null;
String path;
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/App.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/App.java Thu Jun 11 14:59:29 2009 -0700
@@ -348,7 +348,7 @@
//
private UDSocketServer server;
- private List<AppInstance> instances = new ArrayList<AppInstance>();
+ private final List<AppInstance> instances = new ArrayList<AppInstance>();
private ConnectionManager connManager = new ConnectionManager();
//
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/DefaultControl.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/DefaultControl.java Thu Jun 11 14:59:29 2009 -0700
@@ -28,7 +28,6 @@
import java.net.*;
import java.util.*;
-import javax.help.HelpBroker;
import org.opensolaris.os.vp.panel.common.ClientContext;
import org.opensolaris.os.vp.panel.common.action.*;
import org.opensolaris.os.vp.panel.common.model.PanelDescriptor;
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/smf/AggregatedRefreshService.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/smf/AggregatedRefreshService.java Thu Jun 11 14:59:29 2009 -0700
@@ -319,6 +319,7 @@
}
this.service = service;
+ this.instance = null;
}
}
}
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/smf/SimpleSmfServiceInfo.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/smf/SimpleSmfServiceInfo.java Thu Jun 11 14:59:29 2009 -0700
@@ -34,7 +34,6 @@
//
private ServiceMXBean service;
- private boolean instance;
//
// Constructors
@@ -42,7 +41,6 @@
public SimpleSmfServiceInfo(ServiceMXBean service) {
this.service = service;
- this.instance = service.isInstance();
}
//
--- a/usr/src/java/vpanels/panels/smf/org/opensolaris/os/vp/panels/smf/client/swing/InstanceEditControl.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panels/smf/org/opensolaris/os/vp/panels/smf/client/swing/InstanceEditControl.java Thu Jun 11 14:59:29 2009 -0700
@@ -28,6 +28,7 @@
import java.awt.event.*;
import java.net.URL;
+import org.opensolaris.os.scf.common.FMRI;
import org.opensolaris.os.vp.panel.common.control.*;
public class InstanceEditControl extends SMFEditControl<InstanceManagedObject>
@@ -92,4 +93,21 @@
return panel;
}
+
+ //
+ // SMFEditControl methods
+ //
+
+ @Override
+ protected InstanceManagedObject lookupSMO(FMRI fmri)
+ throws InvalidParameterException {
+
+ String fmristr = fmri.toString();
+ SMFManagedObject smo = getPanelDescriptor().getSMO(fmristr);
+ if (smo == null || !(smo instanceof InstanceManagedObject)) {
+ throw (new InvalidParameterException(getId(), PARAM_FMRI, fmristr));
+ }
+
+ return (InstanceManagedObject)smo;
+ }
}
--- a/usr/src/java/vpanels/panels/smf/org/opensolaris/os/vp/panels/smf/client/swing/SMFEditControl.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panels/smf/org/opensolaris/os/vp/panels/smf/client/swing/SMFEditControl.java Thu Jun 11 14:59:29 2009 -0700
@@ -90,12 +90,7 @@
ex));
}
- T svc = (T)getPanelDescriptor().getSMO(fmri.toString());
- if (svc == null) {
- throw (new InvalidParameterException(getId(), PARAM_FMRI, param));
- }
-
- this.smo_ = svc;
+ this.smo_ = lookupSMO(fmri);
setName(smo_.getName());
super.start(navigator, parameters);
@@ -167,4 +162,6 @@
}
}
}
+
+ protected abstract T lookupSMO(FMRI fmri) throws InvalidParameterException;
}
--- a/usr/src/java/vpanels/panels/smf/org/opensolaris/os/vp/panels/smf/client/swing/ServiceEditControl.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panels/smf/org/opensolaris/os/vp/panels/smf/client/swing/ServiceEditControl.java Thu Jun 11 14:59:29 2009 -0700
@@ -27,6 +27,8 @@
package org.opensolaris.os.vp.panels.smf.client.swing;
import java.net.URL;
+import org.opensolaris.os.scf.common.FMRI;
+import org.opensolaris.os.vp.panel.common.control.InvalidParameterException;
public class ServiceEditControl extends SMFEditControl<ServiceManagedObject>
{
@@ -67,4 +69,21 @@
return panel;
}
+
+ //
+ // SMFEditControl methods
+ //
+
+ @Override
+ protected ServiceManagedObject lookupSMO(FMRI fmri)
+ throws InvalidParameterException {
+
+ String fmristr = fmri.toString();
+ SMFManagedObject smo = getPanelDescriptor().getSMO(fmristr);
+ if (smo == null || !(smo instanceof ServiceManagedObject)) {
+ throw (new InvalidParameterException(getId(), PARAM_FMRI, fmristr));
+ }
+
+ return (ServiceManagedObject)smo;
+ }
}
--- a/usr/src/java/vpanels/panels/time/nbproject/project.xml Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/panels/time/nbproject/project.xml Thu Jun 11 14:59:29 2009 -0700
@@ -103,7 +103,7 @@
<compilation-unit>
<package-root>.</package-root>
<package-root>build/gen</package-root>
- <classpath mode="compile">../../../scf/common/scf-common.jar:../../../util/vpanels-util.jar:../../common/vpanels-common.jar:../../panel/vpanels-panel.jar:../../server/vpanels-server.jar:/usr/lib/cacao/lib/cacao_cacao.jar</classpath>
+ <classpath mode="compile">../../../scf/common/scf-common.jar:../../../util/vpanels-util.jar:../../common/vpanels-common.jar:../../panel/vpanels-panel.jar:../../server/vpanels-server.jar:/usr/lib/cacao/lib/cacao_cacao.jar:../../../lib/swingx-0.9.3.jar</classpath>
<built-to>vpanels-panels-time.jar</built-to>
<source-level>1.5</source-level>
</compilation-unit>
--- a/usr/src/java/vpanels/server/org/opensolaris/os/vp/server/module/proxy/MBSCInterceptor.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/server/org/opensolaris/os/vp/server/module/proxy/MBSCInterceptor.java Thu Jun 11 14:59:29 2009 -0700
@@ -46,6 +46,7 @@
* This class is an MBeanServerInterceptor that forwards all
* forwardable requests to an MBeanServerConnection.
*/
+@SuppressWarnings("deprecation")
class MBSCInterceptor extends ProxyInstance implements MBeanServerInterceptor
{
private static final Logger logger = Logger.getLogger(
--- a/usr/src/java/vpanels/server/org/opensolaris/os/vp/server/module/proxy/ProxyInterceptor.java Thu Jun 11 11:35:06 2009 -0400
+++ b/usr/src/java/vpanels/server/org/opensolaris/os/vp/server/module/proxy/ProxyInterceptor.java Thu Jun 11 14:59:29 2009 -0700
@@ -44,6 +44,7 @@
* AccessController so that access control decisions can also be
* deferred to a proxy.
*/
+@SuppressWarnings("deprecation")
public class ProxyInterceptor implements MBeanServerInterceptor,
AccessController
{
@@ -82,6 +83,7 @@
!uprincipal.getName().equals("root"));
}
+ @SuppressWarnings("unchecked")
private <T extends Principal> T getClassPrincipal(Class<T> c)
{
java.security.AccessControlContext acc =