jdk-sandbox: comparison jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java

equal deleted inserted replaced

-:db159b144c98
+:3ad91a1b7495
 /*
-* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 public static final int MW_EDIT_BUTTON              = 1;
 public static final int MW_REMOVE_BUTTON            = 2;
 public static final int MW_POLICY_LIST              = 3; // follows MW_PANEL
 /* The preferred height of JTextField should match JComboBox. */
-static final int TEXTFIELD_HEIGHT = new JComboBox().getPreferredSize().height;
+static final int TEXTFIELD_HEIGHT = new JComboBox<>().getPreferredSize().height;
 private PolicyTool tool;
 /**
 * Constructor
 try {
 // open the policy file
 tool.openPolicy(policyFile);
 // display the policy entries via the policy list textarea
-DefaultListModel listModel = new DefaultListModel();
+DefaultListModel<String> listModel = new DefaultListModel<>();
-JList list = new JList(listModel);
+JList<String> list = new JList<>(listModel);
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, this));
 PolicyEntry entries[] = tool.getEntry();
 if (entries != null) {
 newFilename.setText(policyFile);
 initPolicyList(list);
 } catch (FileNotFoundException fnfe) {
 // add blank policy listing
-JList list = new JList(new DefaultListModel());
+JList<String> list = new JList<>(new DefaultListModel<>());
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, this));
 initPolicyList(list);
 tool.setPolicyFileName(null);
 // just add warning
 tool.warnings.addElement(fnfe.toString());
 } catch (Exception e) {
 // add blank policy listing
-JList list = new JList(new DefaultListModel());
+JList<String> list = new JList<>(new DefaultListModel<>());
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, this));
 initPolicyList(list);
 tool.setPolicyFileName(null);
 /**
 * Init the policy_entry_list TEXTAREA component in the
 * PolicyTool window
 */
-void initPolicyList(JList policyList) {
+void initPolicyList(JList<String> policyList) {
 // add the policy list to the window
 //policyList.setPreferredSize(new Dimension(500, 350));
 JScrollPane scrollPane = new JScrollPane(policyList);
 addNewComponent(this, scrollPane, MW_POLICY_LIST,
 /**
 * Replace the policy_entry_list TEXTAREA component in the
 * PolicyTool window with an updated one.
 */
-void replacePolicyList(JList policyList) {
+void replacePolicyList(JList<String> policyList) {
 // remove the original list of Policy Entries
 // and add the new list of entries
-JList list = (JList)getComponent(MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> list = (JList<String>)getComponent(MW_POLICY_LIST);
 list.setModel(policyList.getModel());
 }
 /**
 * display the main PolicyTool window
 private static final int PERMISSION_SIGNEDBY        = 3;
 private static final int PRINCIPAL_TYPE             = 4;
 private static final int PRINCIPAL_NAME             = 5;
 /* The preferred height of JTextField should match JComboBox. */
-static final int TEXTFIELD_HEIGHT = new JComboBox().getPreferredSize().height;
+static final int TEXTFIELD_HEIGHT = new JComboBox<>().getPreferredSize().height;
 public static java.util.ArrayList<Perm> PERM_ARRAY;
 public static java.util.ArrayList<Prin> PRIN_ARRAY;
 PolicyTool tool;
 ToolWindow tw;
 setResizable(true);
 if (edit) {
 // get the selected item
 entries = tool.getEntry();
-JList policyList = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> policyList = (JList<String>)tw.getComponent(ToolWindow.MW_POLICY_LIST);
 listIndex = policyList.getSelectedIndex();
 // get principal list
 LinkedList<PolicyParser.PrincipalEntry> principals =
 entries[listIndex].getGrantEntry().principals;
 tw.addNewComponent(newTD, label, PRD_DESC_LABEL,
 0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
 ToolWindow.TOP_BOTTOM_PADDING);
 // principal choice
-JComboBox choice = new JComboBox();
+JComboBox<String> choice = new JComboBox<>();
 choice.addItem(PRIN_TYPE);
 choice.getAccessibleContext().setAccessibleName(PRIN_TYPE);
 for (int i = 0; i < PRIN_ARRAY.size(); i++) {
 Prin next = PRIN_ARRAY.get(i);
 choice.addItem(next.CLASS);
 tw.addNewComponent(newTD, label, PD_DESC_LABEL,
 0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
 ToolWindow.TOP_BOTTOM_PADDING);
 // permission choice (added in alphabetical order)
-JComboBox choice = new JComboBox();
+JComboBox<String> choice = new JComboBox<>();
 choice.addItem(PERM);
 choice.getAccessibleContext().setAccessibleName(PERM);
 for (int i = 0; i < PERM_ARRAY.size(); i++) {
 Perm next = PERM_ARRAY.get(i);
 choice.addItem(next.CLASS);
 1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
 ToolWindow.LR_BOTTOM_PADDING);
 choice.addItemListener(new PermissionMenuListener(newTD));
 // name label and textfield
-choice = new JComboBox();
+choice = new JComboBox<>();
 choice.addItem(PERM_NAME);
 choice.getAccessibleContext().setAccessibleName(PERM_NAME);
 tf = (edit ? new JTextField(editMe.name, 40) : new JTextField(40));
 tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
 tf.getAccessibleContext().setAccessibleName(PERM_NAME);
 1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
 ToolWindow.LR_BOTTOM_PADDING);
 choice.addItemListener(new PermissionNameMenuListener(newTD));
 // actions label and textfield
-choice = new JComboBox();
+choice = new JComboBox<>();
 choice.addItem(PERM_ACTIONS);
 choice.getAccessibleContext().setAccessibleName(PERM_ACTIONS);
 tf = (edit ? new JTextField(editMe.action, 40) : new JTextField(40));
 tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
 tf.getAccessibleContext().setAccessibleName(PERM_ACTIONS);
 * confirm that the user REALLY wants to remove the Policy Entry
 */
 void displayConfirmRemovePolicyEntry() {
 // find the entry to be removed
-JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> list = (JList<String>)tw.getComponent(ToolWindow.MW_POLICY_LIST);
 int index = list.getSelectedIndex();
 PolicyEntry entries[] = tool.getEntry();
 // find where the PolicyTool gui is
 Point location = tw.getLocationOnScreen();
 tool.modified = false;
 tw.displayErrorDialog(null, ee);
 }
 // display the policy entries via the policy list textarea
-JList list = new JList(new DefaultListModel());
+JList<String> list = new JList<>(new DefaultListModel<>());
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, tw));
 tw.replacePolicyList(list);
 try {
 // open the policy file
 tool.openPolicy(policyFile);
 // display the policy entries via the policy list textarea
-DefaultListModel listModel = new DefaultListModel();
+DefaultListModel<String> listModel = new DefaultListModel<>();
-list = new JList(listModel);
+list = new JList<>(listModel);
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, tw));
 PolicyEntry entries[] = tool.getEntry();
 if (entries != null) {
 ("Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information."));
 }
 } catch (Exception e) {
 // add blank policy listing
-list = new JList(new DefaultListModel());
+list = new JList<>(new DefaultListModel<>());
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, tw));
 tw.replacePolicyList(list);
 tool.setPolicyFileName(null);
 *
 * If TARGETS are valid but there are no standard ones
 * (user must enter them by hand) then the TARGETS array may be empty
 * (and of course non-null).
 */
-void setPermissionNames(Perm inputPerm, JComboBox names, JTextField field) {
+void setPermissionNames(Perm inputPerm, JComboBox<String> names, JTextField field) {
 names.removeAllItems();
 names.addItem(PERM_NAME);
 if (inputPerm == null) {
 // custom permission
 *
 * If ACTIONS are valid but there are no standard ones
 * (user must enter them by hand) then the ACTIONS array may be empty
 * (and of course non-null).
 */
-void setPermissionActions(Perm inputPerm, JComboBox actions, JTextField field) {
+void setPermissionActions(Perm inputPerm, JComboBox<String> actions, JTextField field) {
 actions.removeAllItems();
 actions.addItem(PERM_ACTIONS);
 if (inputPerm == null) {
 // custom permission
 } else if (PolicyTool.collator.compare(e.getActionCommand(),
 ToolWindow.REMOVE_POLICY_ENTRY) == 0) {
 // get the selected entry
-JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> list = (JList<String>)tw.getComponent(ToolWindow.MW_POLICY_LIST);
 int index = list.getSelectedIndex();
 if (index < 0) {
 tw.displayErrorDialog(null, new Exception
 (PolicyTool.getMessage("No.Policy.Entry.selected")));
 return;
 } else if (PolicyTool.collator.compare(e.getActionCommand(),
 ToolWindow.EDIT_POLICY_ENTRY) == 0) {
 // get the selected entry
-JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> list = (JList<String>)tw.getComponent(ToolWindow.MW_POLICY_LIST);
 int index = list.getSelectedIndex();
 if (index < 0) {
 tw.displayErrorDialog(null, new Exception
 (PolicyTool.getMessage("No.Policy.Entry.selected")));
 return;
 }
 }
 }
 // add the entry
-JList policyList = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> policyList = (JList<String>)tw.getComponent(ToolWindow.MW_POLICY_LIST);
 if (edit) {
 int listIndex = policyList.getSelectedIndex();
 tool.addEntry(newEntry, listIndex);
 String newCodeBaseStr = newEntry.headerToString();
 if (PolicyTool.collator.compare
 (newCodeBaseStr, policyList.getModel().getElementAt(listIndex)) != 0)
 tool.modified = true;
-((DefaultListModel)policyList.getModel()).set(listIndex, newCodeBaseStr);
+((DefaultListModel<String>)policyList.getModel()).set(listIndex, newCodeBaseStr);
 } else {
 tool.addEntry(newEntry, -1);
-((DefaultListModel)policyList.getModel()).addElement(newEntry.headerToString());
+((DefaultListModel<String>)policyList.getModel()).addElement(newEntry.headerToString());
 tool.modified = true;
 }
 td.setVisible(false);
 td.dispose();
 }
 public void actionPerformed(ActionEvent e) {
 // get the Permission selected from the Permission List
-JList list = (JList)td.getComponent(ToolDialog.PE_PERM_LIST);
+@SuppressWarnings("unchecked")
+JList<String> list = (JList<String>)td.getComponent(ToolDialog.PE_PERM_LIST);
 int permIndex = list.getSelectedIndex();
 if (permIndex < 0) {
 tw.displayErrorDialog(td, new Exception
 (PolicyTool.getMessage("No.permission.selected")));
 if (e.getStateChange() == ItemEvent.DESELECTED) {
 // We're only interested in SELECTED events
 return;
 }
-JComboBox prin = (JComboBox)td.getComponent(ToolDialog.PRD_PRIN_CHOICE);
+@SuppressWarnings("unchecked")
+JComboBox<String> prin = (JComboBox<String>)td.getComponent(ToolDialog.PRD_PRIN_CHOICE);
 JTextField prinField = (JTextField)td.getComponent(
 ToolDialog.PRD_PRIN_TEXTFIELD);
 JTextField nameField = (JTextField)td.getComponent(
 ToolDialog.PRD_NAME_TEXTFIELD);
 if (e.getStateChange() == ItemEvent.DESELECTED) {
 // We're only interested in SELECTED events
 return;
 }
-JComboBox perms = (JComboBox)td.getComponent(
+@SuppressWarnings("unchecked")
+JComboBox<String> perms = (JComboBox<String>)td.getComponent(
 ToolDialog.PD_PERM_CHOICE);
-JComboBox names = (JComboBox)td.getComponent(
+@SuppressWarnings("unchecked")
+JComboBox<String> names = (JComboBox<String>)td.getComponent(
 ToolDialog.PD_NAME_CHOICE);
-JComboBox actions = (JComboBox)td.getComponent(
+@SuppressWarnings("unchecked")
+JComboBox<String> actions = (JComboBox<String>)td.getComponent(
 ToolDialog.PD_ACTIONS_CHOICE);
 JTextField nameField = (JTextField)td.getComponent(
 ToolDialog.PD_NAME_TEXTFIELD);
 JTextField actionsField = (JTextField)td.getComponent(
 ToolDialog.PD_ACTIONS_TEXTFIELD);
 if (e.getStateChange() == ItemEvent.DESELECTED) {
 // We're only interested in SELECTED events
 return;
 }
-JComboBox names = (JComboBox)td.getComponent(ToolDialog.PD_NAME_CHOICE);
+@SuppressWarnings("unchecked")
+JComboBox<String> names = (JComboBox<String>)td.getComponent(ToolDialog.PD_NAME_CHOICE);
 names.getAccessibleContext().setAccessibleName(
 PolicyTool.splitToWords((String)e.getItem()));
 if (((String)e.getItem()).indexOf(ToolDialog.PERM_NAME) != -1)
 return;
 if (e.getStateChange() == ItemEvent.DESELECTED) {
 // We're only interested in SELECTED events
 return;
 }
-JComboBox actions = (JComboBox)td.getComponent(
+@SuppressWarnings("unchecked")
+JComboBox<String> actions = (JComboBox<String>)td.getComponent(
 ToolDialog.PD_ACTIONS_CHOICE);
 actions.getAccessibleContext().setAccessibleName((String)e.getItem());
 if (((String)e.getItem()).indexOf(ToolDialog.PERM_ACTIONS) != -1)
 return;
 this.us = us;
 }
 public void actionPerformed(ActionEvent e) {
 // remove the entry
-JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+@SuppressWarnings("unchecked")
+JList<String> list = (JList<String>)tw.getComponent(ToolWindow.MW_POLICY_LIST);
 int index = list.getSelectedIndex();
 PolicyEntry entries[] = tool.getEntry();
 tool.removeEntry(entries[index]);
 // redraw the window listing
-DefaultListModel listModel = new DefaultListModel();
+DefaultListModel<String> listModel = new DefaultListModel<>();
-list = new JList(listModel);
+list = new JList<>(listModel);
 list.setVisibleRowCount(15);
 list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 list.addMouseListener(new PolicyListListener(tool, tw));
 entries = tool.getEntry();
 if (entries != null) {
 }
 /**
 * This is a java.awt.List that bind an Object to each String it holds.
 */
-class TaggedList extends JList {
+class TaggedList extends JList<String> {
 private static final long serialVersionUID = -5676238110427785853L;
 private java.util.List<Object> data = new LinkedList<>();
 public TaggedList(int i, boolean b) {
-super(new DefaultListModel());
+super(new DefaultListModel<>());
 setVisibleRowCount(i);
 setSelectionMode(b ? ListSelectionModel.MULTIPLE_INTERVAL_SELECTION : ListSelectionModel.SINGLE_SELECTION);
 }
 public Object getObject(int index) {
 return data.get(index);
 }
 public void addTaggedItem(String string, Object object) {
-((DefaultListModel)getModel()).addElement(string);
+((DefaultListModel<String>)getModel()).addElement(string);
 data.add(object);
 }
 public void replaceTaggedItem(String string, Object object, int index) {
-((DefaultListModel)getModel()).set(index, string);
+((DefaultListModel<String>)getModel()).set(index, string);
 data.set(index, object);
 }
 public void removeTaggedItem(int index) {
-((DefaultListModel)getModel()).remove(index);
+((DefaultListModel<String>)getModel()).remove(index);
 data.remove(index);
 }
 }
 /**

changeset 22059	3ad91a1b7495
parent 21365	2a7be11ae905
child 23333	b0af2c7c8c91