diff options
39 files changed, 315 insertions, 472 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index d77f0d951c..f49e00269b 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -560,7 +560,7 @@ CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \ $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include CPPFLAGS= $(CPPFLAGS.master) AS_CPPFLAGS= $(CPPFLAGS.master) -JAVAFLAGS= -deprecation +JAVAFLAGS= -source 1.6 -target 1.6 -Xlint:deprecation,-options # # For source message catalogue diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index f54e0f9c4b..20f2e02dbc 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -215,7 +215,6 @@ COMMON_SUBDIRS= \ iscsitsvc \ isns \ itadm \ - java \ kbd \ keyserv \ killall \ diff --git a/usr/src/cmd/cmd-inet/usr.lib/slpd/slp b/usr/src/cmd/cmd-inet/usr.lib/slpd/slp index 9ae3027621..77ea78e3b8 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/slpd/slp +++ b/usr/src/cmd/cmd-inet/usr.lib/slpd/slp @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # # Service Method Support Script for the SLP service # @@ -35,7 +34,7 @@ . /lib/svc/share/smf_include.sh CONF=/etc/inet/slp.conf -JAVA_BIN=/usr/j2se/bin/java +JAVA_BIN=/usr/java/bin/java CLASSPATH=/usr/share/lib/slp/slpd.jar MAIN_CLASS=com.sun.slp.slpd SLPD_HOME=/usr/lib/inet diff --git a/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile b/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile index 99a571bee8..66479e77bc 100644 --- a/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile +++ b/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" PROG = jdtrace SRCS = jdtrace.c @@ -75,9 +74,8 @@ $(PROG): $(SRCS) $(LINK.c) -o $@ $(SRCS) $(LDLIBS) $(POST_PROCESS) ; $(STRIP_STABS) -JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -deprecation -JFLAGS += -target 1.5 -JFLAGS += -Xlint +JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) +JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options COMPILE.java=$(JAVAC) $(JFLAGS) JAVASRC= JDTrace.java Getopt.java diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile b/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile index fe213dd22a..43daede8e8 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include $(SRC)/Makefile.master @@ -60,9 +59,8 @@ lint: install: all $(PROTO_TEST_JAR) -JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -deprecation -JFLAGS += -target 1.5 -JFLAGS += -Xlint +JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) +JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options,-rawtypes COMPILE.java=$(JAVAC) $(JFLAGS) $(TEST_JAR): $(SRCDIR)/*.java diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java index 310dd184a7..099dbd64c9 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java @@ -22,8 +22,6 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ import org.opensolaris.os.dtrace.*; @@ -49,7 +47,7 @@ public class TestAbort { consumer.enable(); consumer.go(); try { - Thread.currentThread().sleep(1000); + Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); System.exit(1); @@ -77,7 +75,7 @@ public class TestAbort { consumer.enable(); consumer.go(); try { - Thread.currentThread().sleep(1000); + Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); System.exit(1); @@ -129,7 +127,7 @@ public class TestAbort { consumer.enable(); consumer.go(); try { - Thread.currentThread().sleep(1000); + Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); System.exit(1); diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestClose.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestClose.java index c7a9e89d03..8dee29e461 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestClose.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestClose.java @@ -22,8 +22,6 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ import org.opensolaris.os.dtrace.*; @@ -44,7 +42,7 @@ public class TestClose { consumer.enable(); consumer.go(); try { - Thread.currentThread().sleep(1000); + Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); System.exit(1); @@ -64,7 +62,7 @@ public class TestClose { consumer.enable(); consumer.go(); try { - Thread.currentThread().sleep(1000); + Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); System.exit(1); diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java index b5ace25bdb..87c9f86cb5 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java @@ -22,8 +22,6 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ import java.util.*; import java.util.concurrent.atomic.*; @@ -63,7 +61,7 @@ public class TestDrop { { while (consumer.isRunning() && !done.get()) { try { - Thread.currentThread().sleep(50); + Thread.sleep(50); } catch (InterruptedException e) { } diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java index 2bc43ea6f1..406f3af5d1 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java @@ -56,7 +56,7 @@ public class TestFunctionLookup { String f; boolean done = false; for (int i = 0; (i < 20) && !done; ++i) { - Thread.currentThread().sleep(100); + Thread.sleep(100); a = consumer.getAggregate(); for (Aggregation agg : a.getAggregations()) { for (Tuple tuple : agg.asMap().keySet()) { @@ -88,7 +88,7 @@ public class TestFunctionLookup { consumer.compile(userLookupProgram); consumer.enable(); consumer.go(); - Thread.currentThread().sleep(500); + Thread.sleep(500); Aggregate a = consumer.getAggregate(); Number address; String f; diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java index 8875d0665a..00bd2ff388 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java @@ -22,8 +22,6 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ import org.opensolaris.os.dtrace.*; @@ -609,7 +607,7 @@ public class TestStateMachine { consumer.go(); // Avoid race, call afterGo() in ConsumerListener try { - Thread.currentThread().sleep(300); + Thread.sleep(300); } catch (InterruptedException e) { e.printStackTrace(); exit(1); diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java index f37c9cf1eb..b2d524698e 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java @@ -22,8 +22,6 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ import org.opensolaris.os.dtrace.*; @@ -51,7 +49,7 @@ public class TestStopLock { consumer.enable(); consumer.go(); try { - Thread.currentThread().sleep(500); + Thread.sleep(500); } catch (InterruptedException e) { e.printStackTrace(); System.exit(1); diff --git a/usr/src/cmd/java/Makefile b/usr/src/cmd/java/Makefile deleted file mode 100644 index ead561c3d4..0000000000 --- a/usr/src/cmd/java/Makefile +++ /dev/null @@ -1,61 +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 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# Despite the name, this directory doesn't contain the Java Virtual Machine. -# It only contains base OS/Solaris files for improved integration of a -# Java Virtual Machine. -# - -include ../Makefile.cmd - -ADMINFILES= default_java - -DIRMODE= 755 -FILEMODE= 444 - -SADM_DIR= $(ROOT)/var/sadm -SYSTEM_DIR= $(SADM_DIR)/system -ADMIN_DIR= $(SYSTEM_DIR)/admin - -ROOTDIRS= $(SADM_DIR) $(SYSTEM_DIR) $(ADMIN_DIR) - -ROOTADMINFILES= $(ADMINFILES:%=$(ADMIN_DIR)/%) - -.KEEP_STATE: - -all: - -install: all $(ROOTDIRS) $(ROOTADMINFILES) - -clean: - -lint: - -$(ROOTDIRS): - $(INS.dir) - -$(ADMIN_DIR)/%: % - $(INS.file) - -include ../Makefile.targ diff --git a/usr/src/cmd/java/default_java b/usr/src/cmd/java/default_java deleted file mode 100644 index b80dbfed3c..0000000000 --- a/usr/src/cmd/java/default_java +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 -# -#ident "%Z%%M% %I% %E% SMI" -# -# Java system configuration file. Do not edit. -# -# Shell syntax. -# -DEFAULT_MIN=1.6 -DEFAULT_MAX=1.6 diff --git a/usr/src/cmd/krb5/kadmin/gui/Makefile b/usr/src/cmd/krb5/kadmin/gui/Makefile index 5a11f53dcd..ad85b75dbb 100644 --- a/usr/src/cmd/krb5/kadmin/gui/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/Makefile @@ -23,13 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/Makefile.master include $(SRC)/cmd/Makefile.cmd -JAVAFLAGS= -nowarn -O GUIDIR=$(SRC)/cmd/krb5/kadmin/gui TOGETHER= KdcGui KdcGuiMain KdcGuiOps KdcGuiRoot diff --git a/usr/src/cmd/krb5/kadmin/gui/dataclasses/Makefile b/usr/src/cmd/krb5/kadmin/gui/dataclasses/Makefile index 6d28e00660..d6a35b79bc 100644 --- a/usr/src/cmd/krb5/kadmin/gui/dataclasses/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/dataclasses/Makefile @@ -23,13 +23,10 @@ # Copyright (c) 1999-2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../../../Makefile.master include ../../../../Makefile.cmd -JAVAFLAGS= -nowarn -O GUIDIR=$(SRC)/cmd/krb5/kadmin/gui diff --git a/usr/src/cmd/krb5/kadmin/gui/dchanger/DCPanel.java b/usr/src/cmd/krb5/kadmin/gui/dchanger/DCPanel.java index b37f1c9dfe..61bc4064db 100644 --- a/usr/src/cmd/krb5/kadmin/gui/dchanger/DCPanel.java +++ b/usr/src/cmd/krb5/kadmin/gui/dchanger/DCPanel.java @@ -20,8 +20,6 @@ * CDDL HEADER END */ /* - * ident "%Z%%M% %I% %E% SMI" - * * Copyright (c) 1999-2000 by Sun Microsystems, Inc. * All rights reserved. */ @@ -41,7 +39,7 @@ * increments/decrements. (It is up to the listener to decide the * increment/decrement corresponding to large/small.) Moreover, these * notifications will be sent out much faster if the button is kept - * pressed. + * pressed. */ // The panel waits for a period of BIG_SLEEP_TIME before the faster @@ -52,30 +50,30 @@ // every time it wakes up. public class DCPanel extends Panel { - + private Button plusButton; private Button minusButton; - + private DCListener listener = null; private Timer bigTimer; private Timer smallTimer; - private static int BIG_SLEEP_TIME = 1000; + private static int BIG_SLEEP_TIME = 1000; private static int SMALL_SLEEP_TIME = 100; - + private boolean incrementFlag; public DCPanel() { setLayout(new GridLayout(1, 2)); - - bigTimer = new BigTimer(); - smallTimer = new SmallTimer(); - + + bigTimer = new BigTimer(); + smallTimer = new SmallTimer(); + bigTimer.start(); smallTimer.start(); - + plusButton = new DCButton("+"); minusButton = new DCButton("-"); @@ -90,7 +88,7 @@ * of going to a text field. * @return false always. */ - public boolean isFocusTraversable() { + public boolean isFocusable() { return false; } @@ -138,29 +136,29 @@ private void informListener(boolean bigFlag) { // System.out.println("DCPanel.informListener: " + bigFlag); - if (listener != null) { + if (listener != null) { - if (bigFlag) { + if (bigFlag) { // request a big change if (incrementFlag) - listener.bigIncrement(); - else - listener.bigDecrement(); - } else { + listener.bigIncrement(); + else + listener.bigDecrement(); + } else { // request a small change if (incrementFlag) - listener.increment(); - else - listener.decrement(); - } + listener.increment(); + else + listener.decrement(); + } + + } - } - } // informListener // *********************************************** - // I N N E R C L A S S E S F O L L O W + // I N N E R C L A S S E S F O L L O W // *********************************************** /** @@ -175,7 +173,7 @@ * loops forever like this. */ public void run() { - while (true) { + while (true) { try { synchronized (this) { running = false; @@ -185,7 +183,7 @@ } doTask(); } catch (InterruptedException e) {} - } // while loop + } // while loop } // run method protected void doTask() {} // bug in java workshop @@ -194,16 +192,16 @@ * Wakes up the timer. */ public synchronized void request() { - notify(); + notify(); } /** * Cancels the timer if it is running. */ public void cancel() { - if (running) { + if (running) { interrupt(); - } + } } }// class Timer @@ -220,13 +218,13 @@ * done, schedule the smaller (faster) timer from this point on. */ protected void doTask() { - try { + try { sleep(BIG_SLEEP_TIME); informListener(true); smallTimer.request(); - } catch (InterruptedException e) { + } catch (InterruptedException e) { informListener(false); - } + } } } // class BigTimer @@ -240,13 +238,13 @@ private class SmallTimer extends Timer { protected void doTask() { - try { + try { // loop forever and keep rescheduling yourself while (true) { sleep(SMALL_SLEEP_TIME); informListener(true); } - } catch (InterruptedException e) {} + } catch (InterruptedException e) {} } // doTask method } // class SmallTimer @@ -262,47 +260,47 @@ /** * Constructor for DCMouseListener. * @param plusOrMinus true if this is a listener for the plus - * button, false if it is for the minus button. + * button, false if it is for the minus button. */ public DCMouseListener(boolean plusOrMinus) { - this.plusOrMinus = plusOrMinus; + this.plusOrMinus = plusOrMinus; } /** * Kicks in when the mouse is pressed. */ public void mousePressed(MouseEvent e) { - incrementFlag = plusOrMinus; - DCPanel.this.startAction(); + incrementFlag = plusOrMinus; + DCPanel.this.startAction(); } /** * Kicks in when the mouse is released. */ public void mouseReleased(MouseEvent e) { - incrementFlag = plusOrMinus; - DCPanel.this.stopAction(); - } - } + incrementFlag = plusOrMinus; + DCPanel.this.stopAction(); + } + } /** * The button used by this DCPanel. - */ + */ private class DCButton extends Button { public DCButton(String text) { - super(text); - if (text.equals("+")) - addMouseListener(new DCMouseListener(true)); - else - addMouseListener(new DCMouseListener(false)); + super(text); + if (text.equals("+")) + addMouseListener(new DCMouseListener(true)); + else + addMouseListener(new DCMouseListener(false)); } /** * Make the button non-focus traversable so that it cannot be * tabbed in to. */ - public boolean isFocusTraversable() { - return false; + public boolean isFocusable() { + return false; } } // DCButton @@ -317,5 +315,5 @@ f.setBounds(new Rectangle(100, 100, 100, 100)); f.setVisible(true); } - + } diff --git a/usr/src/cmd/krb5/kadmin/gui/dchanger/DateTimeDialog.java b/usr/src/cmd/krb5/kadmin/gui/dchanger/DateTimeDialog.java index 452d4cce35..d6100d2278 100644 --- a/usr/src/cmd/krb5/kadmin/gui/dchanger/DateTimeDialog.java +++ b/usr/src/cmd/krb5/kadmin/gui/dchanger/DateTimeDialog.java @@ -20,8 +20,6 @@ * CDDL HEADER END */ /* - * ident "%Z%%M% %I% %E% SMI" - * * Copyright (c) 1999-2000 by Sun Microsystems, Inc. * All rights reserved. */ @@ -44,25 +42,25 @@ import java.util.*; // help. The last two panels are separated by a LineSeparator. public class DateTimeDialog extends Dialog { - + private boolean save; private Frame parent; - + private DCPanel dateDCPanel; private DCPanel yearDCPanel; private DCPanel hourDCPanel; private DCPanel minuteDCPanel; private DCPanel secondDCPanel; - + private Choice month; - + private DCCircularTextField date; private DCCircularTextField hour; private DCCircularTextField second; private DCCircularTextField minute; private DCTextField year; - + private Button ok; private Button cancel; private Button help; @@ -70,32 +68,32 @@ public class DateTimeDialog extends Dialog { private Button midnight; private HelpDialog hd = null; - + private Panel topPanel; private Panel middlePanel; private Panel bottomPanel; - + private GregorianCalendar calendar = null; private static int MONTH_LEN[] = {31, 28, 31, 30, 31, 30, 31, - 31, 30, 31, 30, 31}; + 31, 30, 31, 30, 31}; private static DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM); private static Toolkit toolkit = Toolkit.getDefaultToolkit(); - + // For I18N private static ResourceBundle rb = - ResourceBundle.getBundle("GuiResource" /* NOI18N */); + ResourceBundle.getBundle("GuiResource" /* NOI18N */); private static ResourceBundle hrb = - ResourceBundle.getBundle("HelpData" /* NOI18N */); + ResourceBundle.getBundle("HelpData" /* NOI18N */); /** * Constructor that lays out the componeents and sets the different - * event handlers. + * event handlers. */ public DateTimeDialog(Frame parent, Color background, Color foreground) { super(parent, getString("SEAM Date/Time Helper"), true); - + this.parent = parent; setLayout(new GridBagLayout()); @@ -107,64 +105,64 @@ public class DateTimeDialog extends Dialog { setCurrentTime(); setSize(250, 300); setResizable(false); - + addWindowListener(new DCWindowListener()); - // initializeFocusOnTextField(); + // initializeFocusOnTextField(); } /** * Adds the labels only */ private void addLabels() { - + GridBagConstraints gbc = new GridBagConstraints(); gbc.weighty = 1; - + topPanel = new Panel(); topPanel.setLayout(new GridBagLayout()); - gbc.gridwidth = GridBagConstraints.REMAINDER; + gbc.gridwidth = GridBagConstraints.REMAINDER; gbc.fill = GridBagConstraints.BOTH; gbc.anchor = GridBagConstraints.CENTER; gbc.gridx = 0; gbc.gridy = 0; add(topPanel, gbc); - + gbc.fill = GridBagConstraints.NONE; gbc.anchor = GridBagConstraints.EAST; gbc.gridx = 0; gbc.gridwidth = 1; - + gbc.gridy = 0; topPanel.add(new Label(getString("Month")), gbc); - + gbc.gridy = 1; topPanel.add(new Label(getString("Date")), gbc); - + gbc.gridy = 2; topPanel.add(new Label(getString("Year")), gbc); - + gbc.gridy = 3; topPanel.add(new Label(getString("Hour")), gbc); - + gbc.gridy = 4; topPanel.add(new Label(getString("Minute")), gbc); - + gbc.gridy = 5; topPanel.add(new Label(getString("Second")), gbc); } - + /** * Adds the fields that will store the month, year, date, hour, * minute and second. */ private void addFields(Color background, Color foreground) { - + GridBagConstraints gbc = new GridBagConstraints(); gbc.weighty = 1; - + month = new Choice(); initializeMonth(); - + date = new DCCircularTextField("1", 2); date.setMinimum(1); date.setBackground(background); @@ -180,11 +178,11 @@ public class DateTimeDialog extends Dialog { second = new DCCircularTextField("00", 2); second.setBackground(background); second.setForeground(foreground); - + year = new DCTextField("2000", 4); year.setBackground(background); year.setForeground(foreground); - + Panel tempPanel = new Panel(); tempPanel.add(month); gbc.gridwidth = GridBagConstraints.REMAINDER; @@ -193,62 +191,62 @@ public class DateTimeDialog extends Dialog { gbc.gridx = 1; gbc.gridy = 0; topPanel.add(tempPanel, gbc); - - + + // Remaining fields are in topPanel gbc.gridwidth = 1; gbc.fill = GridBagConstraints.NONE; gbc.gridx = 1; - + gbc.gridy = 1; topPanel.add(date, gbc); - + gbc.gridy = 2; topPanel.add(year, gbc); - + gbc.gridy = 3; topPanel.add(hour, gbc); - + gbc.gridy = 4; topPanel.add(minute, gbc); - + gbc.gridy = 5; topPanel.add(second, gbc); - + } // Adds the panels with the +/- buttons for each DCField private void addDCPanels() { - + GridBagConstraints gbc = new GridBagConstraints(); gbc.weighty = 1; - + gbc.gridx = 2; gbc.gridwidth = GridBagConstraints.REMAINDER; gbc.gridheight = 1; gbc.fill = GridBagConstraints.NONE; - + dateDCPanel = new DCPanel(); yearDCPanel = new DCPanel(); hourDCPanel = new DCPanel(); minuteDCPanel = new DCPanel(); secondDCPanel = new DCPanel(); - + gbc.gridy = 1; topPanel.add(dateDCPanel, gbc); - + gbc.gridy = GridBagConstraints.RELATIVE; topPanel.add(yearDCPanel, gbc); topPanel.add(hourDCPanel, gbc); topPanel.add(minuteDCPanel, gbc); topPanel.add(secondDCPanel, gbc); - + dateDCPanel.setListener(date); yearDCPanel.setListener(year); hourDCPanel.setListener(hour); minuteDCPanel.setListener(minute); secondDCPanel.setListener(second); - + } @@ -259,60 +257,60 @@ public class DateTimeDialog extends Dialog { private void initializeMonth() { DateFormatSymbols dfSymbols = new DateFormatSymbols(); String[] monthStrings = dfSymbols.getMonths(); - - month.removeAll(); - - for (int i = 0; i < monthStrings.length; i++) { + + month.removeAll(); + + for (int i = 0; i < monthStrings.length; i++) { month.add(monthStrings[i]); - } + } - month.addItemListener(new DCMonthChangeListener()); + month.addItemListener(new DCMonthChangeListener()); } // Adds all the buttons private void addButtons() { - GridBagConstraints gbc = new GridBagConstraints(); - gbc.weighty = 1; - - - middlePanel = new Panel(); - now = new Button(getString("Now")); - midnight = new Button(getString("Midnight")); - middlePanel.add(midnight); - middlePanel.add(now); - gbc.fill = GridBagConstraints.HORIZONTAL; - gbc.gridwidth = GridBagConstraints.REMAINDER; - gbc.gridx = 0; - gbc.gridy = 1; - add(middlePanel, gbc); - - gbc.gridwidth = GridBagConstraints.REMAINDER; - gbc.gridheight = 1; - gbc.fill = GridBagConstraints.BOTH; - gbc.gridx = 0; - gbc.gridy = 2; - add(new LineSeparator(), gbc); - - bottomPanel = new Panel(); - ok = new Button(getString("OK")); - cancel = new Button(getString("Cancel")); - help = new Button(getString("Help")); - bottomPanel.add(ok); - bottomPanel.add(cancel); - bottomPanel.add(help); - gbc.fill = GridBagConstraints.HORIZONTAL; - gbc.gridwidth = GridBagConstraints.REMAINDER; - gbc.gridx = 0; - gbc.gridy = 3; - add(bottomPanel, gbc); - - DCButtonListener bl = new DCButtonListener(); - ok.addActionListener(bl); - cancel.addActionListener(bl); - help.addActionListener(bl); - now.addActionListener(bl); - midnight.addActionListener(bl); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.weighty = 1; + + + middlePanel = new Panel(); + now = new Button(getString("Now")); + midnight = new Button(getString("Midnight")); + middlePanel.add(midnight); + middlePanel.add(now); + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.gridwidth = GridBagConstraints.REMAINDER; + gbc.gridx = 0; + gbc.gridy = 1; + add(middlePanel, gbc); + + gbc.gridwidth = GridBagConstraints.REMAINDER; + gbc.gridheight = 1; + gbc.fill = GridBagConstraints.BOTH; + gbc.gridx = 0; + gbc.gridy = 2; + add(new LineSeparator(), gbc); + + bottomPanel = new Panel(); + ok = new Button(getString("OK")); + cancel = new Button(getString("Cancel")); + help = new Button(getString("Help")); + bottomPanel.add(ok); + bottomPanel.add(cancel); + bottomPanel.add(help); + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.gridwidth = GridBagConstraints.REMAINDER; + gbc.gridx = 0; + gbc.gridy = 3; + add(bottomPanel, gbc); + + DCButtonListener bl = new DCButtonListener(); + ok.addActionListener(bl); + cancel.addActionListener(bl); + help.addActionListener(bl); + now.addActionListener(bl); + midnight.addActionListener(bl); } @@ -334,10 +332,10 @@ public class DateTimeDialog extends Dialog { * Closes (hides) the dialog box when the user is done * @param save true if the box is being dismissed by clicking on * "ok" and the user wants to retain the modified value, false - * otherwise. + * otherwise. */ private void dateTimeDialogClose(boolean save) { - if (save == true) { + if (save == true) { if (!updateFromGui()) return; } @@ -350,9 +348,9 @@ public class DateTimeDialog extends Dialog { * @return true if all are valid, false otherwise. */ private boolean updateFromGui() { - return (checkErrorAndSet(date) && checkErrorAndSet(year) && - checkErrorAndSet(hour) && checkErrorAndSet(minute) && - checkErrorAndSet(second)); + return (checkErrorAndSet(date) && checkErrorAndSet(year) && + checkErrorAndSet(hour) && checkErrorAndSet(minute) && + checkErrorAndSet(second)); } /** @@ -362,21 +360,21 @@ public class DateTimeDialog extends Dialog { * otherwise. */ private boolean checkErrorAndSet(DCTextField tf) { - int i = 0; - boolean errorState = false; - try { + int i = 0; + boolean errorState = false; + try { i = new Integer(tf.getText().trim()).intValue(); errorState = !tf.checkValue(i); - } catch (NumberFormatException e2) { + } catch (NumberFormatException e2) { errorState = true; - } - if (errorState) { + } + if (errorState) { tf.selectAll(); toolkit.beep(); - } - else + } + else tf.setValue(i); - return !errorState; + return !errorState; } /** @@ -388,34 +386,34 @@ public class DateTimeDialog extends Dialog { */ public boolean isSaved() { - return save; + return save; } /** * Sets the date and time in fields to the current date and time. */ public void setCurrentTime() { - setDate(new Date()); + setDate(new Date()); } /** * Sets the current date of the DateTimeDialog and updates the gui - * components to reflect that. + * components to reflect that. * @param date the Date to set it to. */ public void setDate(Date newDate) { - calendar = new GregorianCalendar(); - calendar.setTime(newDate); + calendar = new GregorianCalendar(); + calendar.setTime(newDate); // update gui components now year.setValue(calendar.get(Calendar.YEAR)); month.select(calendar.get(Calendar.MONTH)); date.setValue(calendar.get(Calendar.DATE)); - + // Make sure the date is in the valid range for the given month fixDateField(); - + hour.setValue(calendar.get(Calendar.HOUR_OF_DAY)); minute.setValue(calendar.get(Calendar.MINUTE)); second.setValue(calendar.get(Calendar.SECOND)); @@ -436,33 +434,33 @@ public class DateTimeDialog extends Dialog { * for the currently selected month. */ private void fixDateField() { - int monthIndex = month.getSelectedIndex(); - int max = MONTH_LEN[monthIndex]; - date.setMaximum(calendar.isLeapYear(year.getValue()) && - monthIndex == 1 ? max + 1 : max); + int monthIndex = month.getSelectedIndex(); + int max = MONTH_LEN[monthIndex]; + date.setMaximum(calendar.isLeapYear(year.getValue()) && + monthIndex == 1 ? max + 1 : max); } - + // * ********************************************** - // I N N E R C L A S S E S F O L L O W + // I N N E R C L A S S E S F O L L O W // *********************************************** - + /** * Listener for closing the dialog box through the window close * menu. */ private class DCWindowListener extends WindowAdapter { public void windowClosing(WindowEvent e) { - dateTimeDialogClose(false); - } + dateTimeDialogClose(false); + } } - + /** * Listener for any change in the month selected through the * pull down menu */ private class DCMonthChangeListener implements ItemListener { public void itemStateChanged(ItemEvent e) { - fixDateField(); + fixDateField(); } } @@ -473,12 +471,12 @@ public class DateTimeDialog extends Dialog { */ private class DCButtonListener implements ActionListener { public void actionPerformed(ActionEvent e) { - if (e.getSource() == ok) { + if (e.getSource() == ok) { DateTimeDialog.this.dateTimeDialogClose(true); - } - else + } + else if (e.getSource() == cancel) { - DateTimeDialog.this.dateTimeDialogClose(false); + DateTimeDialog.this.dateTimeDialogClose(false); } else if (e.getSource() == now) { @@ -489,18 +487,18 @@ public class DateTimeDialog extends Dialog { DateTimeDialog.this.setMidnight(); } else - if (e.getSource() == help) { - if (hd != null) - hd.show(); + if (e.getSource() == help) { + if (hd != null) + hd.setVisible(true); else { - hd = new + hd = new HelpDialog(DateTimeDialog.this.parent, getString("Help for Date and Time Dialog"), false); - hd.setVisible(true); - hd.setText(getString(hrb, "DateTimeDialogHelp")); - } - } - } // actionPerformed + hd.setVisible(true); + hd.setText(getString(hrb, "DateTimeDialogHelp")); + } + } + } // actionPerformed } /** @@ -511,10 +509,10 @@ public class DateTimeDialog extends Dialog { */ private class DCFocusListener extends FocusAdapter { - public void focusLost(FocusEvent e) { + public void focusLost(FocusEvent e) { if (!checkErrorAndSet((DCTextField)e.getSource())) ((DCTextField)e.getSource()).requestFocus(); - } + } } /** @@ -523,13 +521,13 @@ public class DateTimeDialog extends Dialog { * default format, but to MEDIUM length formatting style. */ public String toString() { - calendar = new GregorianCalendar(year.getValue(), - month.getSelectedIndex(), - date.getValue(), - hour.getValue(), - minute.getValue(), - second.getValue()); - return df.format(calendar.getTime()); + calendar = new GregorianCalendar(year.getValue(), + month.getSelectedIndex(), + date.getValue(), + hour.getValue(), + minute.getValue(), + second.getValue()); + return df.format(calendar.getTime()); } /** @@ -548,17 +546,19 @@ public class DateTimeDialog extends Dialog { } catch (MissingResourceException e) { System.out.println("Missing resource "+key+", using English."); return key; - } + } } + /* BEGIN JSTYLED */ /* public static final void main(String args[]) { Frame f = new Frame(); - // while (true){ - DateTimeDialog d = new DateTimeDialog(f, Color.white, Color.black); - d.setVisible(true); - System.out.println(d.toString()); + // while (true){ + DateTimeDialog d = new DateTimeDialog(f, Color.white, Color.black); + d.setVisible(true); + System.out.println(d.toString()); // } } */ + /* END JSTYLED */ } diff --git a/usr/src/cmd/krb5/kadmin/gui/dchanger/DurationHelper.java b/usr/src/cmd/krb5/kadmin/gui/dchanger/DurationHelper.java index 45d3da80f6..0e865704bb 100644 --- a/usr/src/cmd/krb5/kadmin/gui/dchanger/DurationHelper.java +++ b/usr/src/cmd/krb5/kadmin/gui/dchanger/DurationHelper.java @@ -20,8 +20,6 @@ * CDDL HEADER END */ /* - * ident "%Z%%M% %I% %E% SMI" - * * Copyright (c) 1999-2000 by Sun Microsystems, Inc. * All rights reserved. */ @@ -51,33 +49,33 @@ private Button help; private Button compute; - private HelpDialog hd = null; + private HelpDialog hd = null; // For I18N private static ResourceBundle rb = ResourceBundle.getBundle("GuiResource" /* NOI18N */); - private static ResourceBundle hrb = + private static ResourceBundle hrb = ResourceBundle.getBundle("HelpData" /* NOI18N */); private static String[] units = { getString("Seconds"), - getString("Minutes"), - getString("Hours"), - getString("Days"), - getString("Weeks"), - getString("Months"), - getString("Years") }; + getString("Minutes"), + getString("Hours"), + getString("Days"), + getString("Weeks"), + getString("Months"), + getString("Years") }; private static int[] unitMultipliers = {1, 60, 60*60, 60*60*24, - 60*60*24*7, 60*60*24*30, - 60*60*24*365 }; - private static NumberFormat nf = NumberFormat.getInstance(); + 60*60*24*7, 60*60*24*30, + 60*60*24*365 }; + private static NumberFormat nf = NumberFormat.getInstance(); private static Toolkit toolkit = Toolkit.getDefaultToolkit(); - /** - * Constructor for DurationHelper. - * @param parent the parent Frame to whom input will be blocked - * while this dialog box is begin shown(modal behaviour). - */ - public DurationHelper(Frame parent, Color background, Color foreground) { + /** + * Constructor for DurationHelper. + * @param parent the parent Frame to whom input will be blocked + * while this dialog box is begin shown(modal behaviour). + */ + public DurationHelper(Frame parent, Color background, Color foreground) { super(parent, getString("SEAM Duration Helper"), true); this.parent = parent; @@ -95,7 +93,7 @@ * Adds all the labels. */ private void addLabels() { - GridBagConstraints gbc = new GridBagConstraints(); + GridBagConstraints gbc = new GridBagConstraints(); gbc.weightx = gbc.weighty = 1; add(new Label(getString("Unit")), gbc); add(new Label(getString("Value")), gbc); @@ -109,7 +107,7 @@ * Initializes the strings for the units. */ private void initUnits() { - unit = new Choice(); + unit = new Choice(); for (int i = 0; i < units.length; i++) unit.add(units[i]); unit.select(getString("Hours")); @@ -124,7 +122,7 @@ * Adds all the fields */ private void addFields(Color background, Color foreground) { - GridBagConstraints gbc = new GridBagConstraints(); + GridBagConstraints gbc = new GridBagConstraints(); gbc.weightx = gbc.weighty = 1; initUnits(); value = new TextField(); @@ -132,9 +130,9 @@ value.setForeground(foreground); value.setColumns(10); - // TBD: make total large enough to hold the largest int - total = new Label(" " /* NO18N */, - Label.RIGHT); + // TBD: make total large enough to hold the largest int + total = new Label(" " /* NO18N */, + Label.RIGHT); gbc.gridx = 0; gbc.gridy = 1; add(unit, gbc); @@ -155,7 +153,7 @@ */ private void addButtons() { - GridBagConstraints gbc = new GridBagConstraints(); + GridBagConstraints gbc = new GridBagConstraints(); gbc.weightx = gbc.weighty = 1; gbc.gridwidth = GridBagConstraints.REMAINDER; @@ -172,7 +170,7 @@ cancel = new Button(getString("Cancel")); help = new Button(getString("Help")); gbc = new GridBagConstraints(); - gbc.weightx = gbc.weighty = 1; + gbc.weightx = gbc.weighty = 1; p.add(ok, gbc); p.add(cancel, gbc); p.add(help, gbc); @@ -202,18 +200,18 @@ * field is not parseable, true otherwise. */ private boolean checkErrorAndSetTotal() { - try { - String noSpaces = value.getText().trim(); + try { + String noSpaces = value.getText().trim(); value.setText(noSpaces); Long l = Long.valueOf(noSpaces); total.setText(nf.format(l.longValue() * - unitMultipliers[unit.getSelectedIndex()])); - } catch (NumberFormatException e) { - value.requestFocus(); - value.selectAll(); - toolkit.beep(); + unitMultipliers[unit.getSelectedIndex()])); + } catch (NumberFormatException e) { + value.requestFocus(); + value.selectAll(); + toolkit.beep(); return false; - } + } return true; } @@ -224,10 +222,10 @@ * the dialog box, false if it is to be discarded. This is decided * based on whether the user clicked on the "Ok" button or the * "Cancel" button. Choosing the window close menu is equivalent to - * clicking on "Cancel." + * clicking on "Cancel." */ private void durationHelperClose(boolean save) { - if (save == true) { + if (save == true) { if (!checkErrorAndSetTotal()) return; } @@ -239,7 +237,7 @@ * Determine whether or not the user wanted to save the value in * this Dialog box. The user indicates this by clicking on the Ok * button to save it and on the Cancel button to discard it. Using the - * window close menu responds the same way as cancel. + * window close menu responds the same way as cancel. * @return true if the user wanted to use this value, * false if it is to be discarded. */ @@ -256,7 +254,7 @@ } // * ********************************************** - // I N N E R C L A S S E S F O L L O W + // I N N E R C L A S S E S F O L L O W // * ********************************************** /** @@ -264,7 +262,7 @@ * menu. */ private class DHWindowListener extends WindowAdapter { - public void windowClosing(WindowEvent e) { + public void windowClosing(WindowEvent e) { durationHelperClose(false); } } @@ -275,25 +273,25 @@ * of reducing the number of overall listeners. */ private class ButtonListener implements ActionListener { - public void actionPerformed(ActionEvent e) { - if (e.getSource() == ok) { - DurationHelper.this.durationHelperClose(true); + public void actionPerformed(ActionEvent e) { + if (e.getSource() == ok) { + DurationHelper.this.durationHelperClose(true); } else if (e.getSource() == cancel) { - DurationHelper.this.durationHelperClose(false); + DurationHelper.this.durationHelperClose(false); } else if (e.getSource() == help) { - if (hd != null) - hd.show(); - else { - hd = new HelpDialog(DurationHelper. this.parent, - getString("Help for entering time duration"), - false, 5, 45); - hd.setVisible(true); - hd.setText(getString(hrb, "DurationHelperHelp")); - } - } else if (e.getSource() == compute) { - checkErrorAndSetTotal(); - } - } + if (hd != null) + hd.setVisible(true); + else { + hd = new HelpDialog(DurationHelper. this.parent, + getString("Help for entering time duration"), + false, 5, 45); + hd.setVisible(true); + hd.setText(getString(hrb, "DurationHelperHelp")); + } + } else if (e.getSource() == compute) { + checkErrorAndSetTotal(); + } + } } /** @@ -307,9 +305,9 @@ } private static final String getString(ResourceBundle rb, String key) { - try { + try { String res = rb.getString(key); - return res; + return res; } catch (MissingResourceException e) { System.out.println("Missing resource "+key+", using English."); return key; @@ -319,13 +317,15 @@ /* * A main method to test this class. */ + /* BEGIN JSTYLED */ /* public static void main(String args[]) { - Frame f = new Frame("Test DurationHelper"); - f.setVisible(true); // for help dialog to use this as parent - DurationHelper dh = new DurationHelper(f, Color.white, Color.black); - dh.setVisible(true); - System.out.println("Save is " + dh.save); + Frame f = new Frame("Test DurationHelper"); + f.setVisible(true); // for help dialog to use this as parent + DurationHelper dh = new DurationHelper(f, Color.white, Color.black); + dh.setVisible(true); + System.out.println("Save is " + dh.save); } */ + /* END JSTYLED */ } diff --git a/usr/src/cmd/krb5/kadmin/gui/dchanger/EncListDialog.java b/usr/src/cmd/krb5/kadmin/gui/dchanger/EncListDialog.java index 66b58c4cfe..ca7f2e079b 100644 --- a/usr/src/cmd/krb5/kadmin/gui/dchanger/EncListDialog.java +++ b/usr/src/cmd/krb5/kadmin/gui/dchanger/EncListDialog.java @@ -1,8 +1,6 @@ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ import java.awt.*; @@ -49,13 +47,13 @@ public class EncListDialog extends Dialog { // For I18N private static ResourceBundle rb = - ResourceBundle.getBundle("GuiResource" /* NOI18N */); + ResourceBundle.getBundle("GuiResource" /* NOI18N */); private static ResourceBundle hrb = - ResourceBundle.getBundle("HelpData" /* NOI18N */); + ResourceBundle.getBundle("HelpData" /* NOI18N */); /* * Constructor that lays out the components and sets the different - * event handlers. + * event handlers. */ public EncListDialog(Frame parent, Color background, Color foreground, Kadmin session) { @@ -154,7 +152,7 @@ public class EncListDialog extends Dialog { * Closes (hides) the dialog box when the user is done * @param save true if the box is being dismissed by clicking on * "ok" and the user wants to retain the modified value, false - * otherwise. + * otherwise. */ private void encListDialogClose(boolean save) { this.save = save; @@ -195,7 +193,7 @@ public class EncListDialog extends Dialog { } // *********************************************** - // I N N E R C L A S S E S F O L L O W + // I N N E R C L A S S E S F O L L O W // *********************************************** /* @@ -256,16 +254,16 @@ public class EncListDialog extends Dialog { } } else if (e.getSource() == help) { if (hd != null) - hd.show(); + hd.setVisible(true); else { hd = new HelpDialog( EncListDialog.this.parent, - getString( + getString( "Help for Encryption Type Dialog"), - false); + false); hd.setVisible(true); hd.setText(getString(hrb, - "EncryptionTypeDialogHelp")); + "EncryptionTypeDialogHelp")); } } } // actionPerformed diff --git a/usr/src/cmd/krb5/kadmin/gui/dchanger/Makefile b/usr/src/cmd/krb5/kadmin/gui/dchanger/Makefile index a9c222e4a0..36c77a1083 100644 --- a/usr/src/cmd/krb5/kadmin/gui/dchanger/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/dchanger/Makefile @@ -22,12 +22,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" include ../../../../../Makefile.master include ../../../../Makefile.cmd -JAVAFLAGS= -nowarn -O GUIDIR=$(SRC)/cmd/krb5/kadmin/gui diff --git a/usr/src/cmd/krb5/kadmin/gui/native/Makefile b/usr/src/cmd/krb5/kadmin/gui/native/Makefile index 66c0743721..68fadc5b17 100644 --- a/usr/src/cmd/krb5/kadmin/gui/native/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/native/Makefile @@ -23,8 +23,6 @@ # Copyright (c) 1999-2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# # usr/src/cmd/krb5/kadmin/gui/native/Makefile # @@ -38,7 +36,6 @@ clobber := TARGET= clobber install := TARGET= install lint := TARGET= lint -JAVAFLAGS= -nowarn -O CLASSES=Kadmin diff --git a/usr/src/cmd/krb5/kadmin/gui/util/Makefile b/usr/src/cmd/krb5/kadmin/gui/util/Makefile index 1dd543d5db..da119bcfbc 100644 --- a/usr/src/cmd/krb5/kadmin/gui/util/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/util/Makefile @@ -23,13 +23,10 @@ # Copyright (c) 1999-2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../../../Makefile.master include ../../../../Makefile.cmd -JAVAFLAGS= -nowarn -O GUIDIR=$(SRC)/cmd/krb5/kadmin/gui diff --git a/usr/src/cmd/krb5/kadmin/gui/visualrt/Makefile b/usr/src/cmd/krb5/kadmin/gui/visualrt/Makefile index d5879c9016..05d97fb02c 100644 --- a/usr/src/cmd/krb5/kadmin/gui/visualrt/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/visualrt/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/Makefile.master @@ -38,7 +36,6 @@ check := TARGET= check .KEEP_STATE: -JAVAFLAGS= -nowarn -O GUIDIR=$(SRC)/cmd/krb5/kadmin/gui CLASSPATH=$(GUIDIR)/visualrt:$(JAVA_ROOT)/jre/lib/rt.jar:$(JAVA_ROOT)/jre/lib/i18n.jar diff --git a/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile b/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile index 73f769e069..27acf8574c 100644 --- a/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile +++ b/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile @@ -23,11 +23,9 @@ # Copyright (c) 1999-2000 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/Makefile.master -JAVAFLAGS= -nowarn -O +JAVAFLAGS = -source 1.5 -target 1.6 -nowarn -O GUIDIR=$(SRC)/cmd/krb5/kadmin/gui def := TARGET= def diff --git a/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile.com b/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile.com index 3b23f8eb2e..da31cfcf1a 100644 --- a/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile.com +++ b/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile.com @@ -23,10 +23,8 @@ # Copyright (c) 1999-2000 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -JAVAFLAGS= -nowarn -O +JAVAFLAGS = -source 1.5 -target 1.6 -nowarn -O JRE=$(JAVA_ROOT)/jre/lib VRT=$(SRC)/cmd/krb5/kadmin/gui/visualrt diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/domain/pools/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/domain/pools/Makefile index 750215accd..2e8d1de82d 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/domain/pools/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/domain/pools/Makefile @@ -27,7 +27,6 @@ include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -target 5 SOURCE = Move.java \ Expression.java \ diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/service/exception/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/service/exception/Makefile index b20cd0bac2..e72625b01e 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/service/exception/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/service/exception/Makefile @@ -23,14 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # cmd/pools/poold/com/sun/solaris/service/exception/Makefile include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -source 1.4 SOURCE = SuccinctStackTraceFormatter.java diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/service/kstat/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/service/kstat/Makefile index cc3b61b363..af7544f6bd 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/service/kstat/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/service/kstat/Makefile @@ -23,14 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # cmd/pools/poold/com/sun/solaris/service/kstat/Makefile include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -source 1.4 SOURCE = Kstat.java \ KstatChainUpdateException.java \ diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/service/locality/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/service/locality/Makefile index 65adde7df1..dc750937e1 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/service/locality/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/service/locality/Makefile @@ -23,14 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # cmd/pools/poold/com/sun/solaris/service/locality/Makefile include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -source 1.4 SOURCE = LocalityDomain.java \ LocalityGroup.java diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/service/logging/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/service/logging/Makefile index 1d4f8519b5..17ba46888e 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/service/logging/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/service/logging/Makefile @@ -23,14 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # cmd/pools/poold/com/sun/solaris/service/logging/Makefile include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -source 1.4 SOURCE = Facility.java \ Severity.java \ diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/service/pools/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/service/pools/Makefile index ab5fdcf0e1..c2cab7d1a3 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/service/pools/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/service/pools/Makefile @@ -23,14 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # cmd/pools/poold/com/sun/solaris/service/pools/Makefile include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -source 1.4 SOURCE = PoolInternal.java \ diff --git a/usr/src/cmd/pools/poold/com/sun/solaris/service/timer/Makefile b/usr/src/cmd/pools/poold/com/sun/solaris/service/timer/Makefile index 6515004cd9..f032cc2319 100644 --- a/usr/src/cmd/pools/poold/com/sun/solaris/service/timer/Makefile +++ b/usr/src/cmd/pools/poold/com/sun/solaris/service/timer/Makefile @@ -23,14 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # cmd/pools/poold/com/sun/solaris/service/logging/Makefile include $(SRC)/cmd/Makefile.cmd CLASSPATH = $(SRC)/cmd/pools/poold -JAVAFLAGS += -source 1.4 SOURCE = RecurringEventTimer.java \ SimpleRecurringEventTimer.java diff --git a/usr/src/lib/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile index 90c0eb6b78..e0f3e8e31a 100644 --- a/usr/src/lib/libdtrace_jni/java/Makefile +++ b/usr/src/lib/libdtrace_jni/java/Makefile @@ -76,9 +76,9 @@ MANIFESTS= $(APIMANI) APICLASSPATH=$(CLASSES):$(APIJAVASRC) # javac flags -JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH) -deprecation -JFLAGS += -target 1.5 -JFLAGS += -Xlint +JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH) +JFLAGS += -source 1.5 -target 1.6 +JFLAGS += -Xlint:all,-rawtypes,-options # The default make rule for Java files COMPILE.java=$(JAVAC) $(JFLAGS) @@ -88,7 +88,7 @@ $(CLASSES)/$(PKGPATH)/%.class: $(APIJAVASRC)/$(PKGPATH)/%.java # javah generated headers APIHDR= LocalConsumer.h -JNIHDRS=$(JNI)/$(APIHDRS) +JNIHDRS=$(JNI)/$(APIHDR) # API classes with native methods JNI_CLASSNAMES=\ diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java index 51e2630931..65dc65e38d 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java @@ -22,8 +22,6 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * ident "%Z%%M% %I% %E% SMI" */ package org.opensolaris.os.dtrace; @@ -637,7 +635,7 @@ public class LocalConsumer implements Consumer { // that listeners finish executing consumerStopped() // before the stop() method returns. synchronized (this) { - if (state == State.STOPPED || state == state.CLOSED) { + if (state == State.STOPPED || state == State.CLOSED) { // // This consumer was stopped just after calling // go() but before starting (the premature return diff --git a/usr/src/lib/libslp/javalib/Makefile.conf b/usr/src/lib/libslp/javalib/Makefile.conf index ab01d59946..1c6443a071 100644 --- a/usr/src/lib/libslp/javalib/Makefile.conf +++ b/usr/src/lib/libslp/javalib/Makefile.conf @@ -55,7 +55,8 @@ MANIFESTS= $(SLPMANI) $(SLPDMANI) SLPCLASSPATH=$(CLASSES):$(SLPJAVASRC) # javac flags -JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH) -deprecation +JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH) +JFLAGS += -source 1.6 -target 1.6 -Xlint:deprecation,-options # The default make rule for Java files COMPILE.java=$(JAVAC) $(JFLAGS) diff --git a/usr/src/man/man5/filesystem.5 b/usr/src/man/man5/filesystem.5 index 53cf68b47e..a2db375494 100644 --- a/usr/src/man/man5/filesystem.5 +++ b/usr/src/man/man5/filesystem.5 @@ -2240,16 +2240,6 @@ Include headers (for C programs). .sp .ne 2 .na -\fB\fB/usr/j2se\fR\fR -.ad -.sp .6 -.RS 4n -Java 2 SDK executables, loadable modules, and documentation. -.RE - -.sp -.ne 2 -.na \fB\fB/usr/java\fI*\fR\fR\fR .ad .sp .6 diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf index f2f92ce4b0..2a0a5486a5 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -275,9 +275,6 @@ dir path=var/news dir path=var/opt group=sys dir path=var/preserve mode=1777 dir path=var/run group=sys -dir path=var/sadm group=sys -dir path=var/sadm/system group=sys -dir path=var/sadm/system/admin group=sys dir path=var/saf dir path=var/saf/zsmon group=sys dir path=var/spool @@ -1463,7 +1460,6 @@ file path=var/adm/utmpx preserve=true file path=var/adm/wtmpx group=adm owner=adm preserve=true file path=var/log/authlog group=sys mode=0600 preserve=true file path=var/log/syslog group=sys preserve=true -file path=var/sadm/system/admin/default_java group=sys mode=0444 file path=var/saf/zsmon/log group=sys preserve=true file path=var/spool/cron/crontabs/adm group=sys mode=0600 preserve=true file path=var/spool/cron/crontabs/root group=sys mode=0600 preserve=true diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf index 31ad4856c0..dad7a39f2e 100644 --- a/usr/src/pkg/manifests/developer-dtrace.mf +++ b/usr/src/pkg/manifests/developer-dtrace.mf @@ -624,7 +624,12 @@ file \ group=other file path=usr/share/lib/java/javadoc/dtrace/api/overview-tree.html group=other file path=usr/share/lib/java/javadoc/dtrace/api/package-list group=other -file path=usr/share/lib/java/javadoc/dtrace/api/resources/inherit.gif \ +file path=usr/share/lib/java/javadoc/dtrace/api/resources/background.gif \ + group=other +file path=usr/share/lib/java/javadoc/dtrace/api/resources/tab.gif group=other +file path=usr/share/lib/java/javadoc/dtrace/api/resources/titlebar.gif \ + group=other +file path=usr/share/lib/java/javadoc/dtrace/api/resources/titlebar_end.gif \ group=other file path=usr/share/lib/java/javadoc/dtrace/api/serialized-form.html \ group=other diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf index e9b8791647..89deca5b22 100644 --- a/usr/src/pkg/manifests/service-network-dns-mdns.mf +++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf @@ -132,7 +132,12 @@ file path=usr/share/lib/java/javadoc/dnssd/api/index-all.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/index.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/overview-tree.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/package-list group=other -file path=usr/share/lib/java/javadoc/dnssd/api/resources/inherit.gif \ +file path=usr/share/lib/java/javadoc/dnssd/api/resources/background.gif \ + group=other +file path=usr/share/lib/java/javadoc/dnssd/api/resources/tab.gif group=other +file path=usr/share/lib/java/javadoc/dnssd/api/resources/titlebar.gif \ + group=other +file path=usr/share/lib/java/javadoc/dnssd/api/resources/titlebar_end.gif \ group=other file path=usr/share/lib/java/javadoc/dnssd/api/serialized-form.html \ group=other |