changeset in /hg/icedtea: Fix up more DOS line endings.
Andrew John Hughes
ahughes at redhat.com
Tue Aug 4 09:41:19 PDT 2009
changeset 40aa38f0fe07 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=40aa38f0fe07
description:
Fix up more DOS line endings.
2009-08-04 Andrew John Hughes <ahughes at redhat.com>
* test/jtreg/com/sun/javatest/exec/FileTable.java,
* test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java,
* test/jtreg/com/sun/javatest/report/XMLReportMaker.java:
Remove more DOS line endings.
diffstat:
4 files changed, 900 insertions(+), 893 deletions(-)
ChangeLog | 7
test/jtreg/com/sun/javatest/exec/FileTable.java | 146 -
test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java | 474 ++--
test/jtreg/com/sun/javatest/report/XMLReportMaker.java | 1166 +++++-----
diffs (truncated from 1821 to 500 lines):
diff -r 5aca55727a2a -r 40aa38f0fe07 ChangeLog
--- a/ChangeLog Tue Aug 04 17:29:24 2009 +0100
+++ b/ChangeLog Tue Aug 04 17:43:18 2009 +0100
@@ -1,3 +1,10 @@ 2009-08-04 Andrew John Hughes <ahughes
+2009-08-04 Andrew John Hughes <ahughes at redhat.com>
+
+ * test/jtreg/com/sun/javatest/exec/FileTable.java,
+ * test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java,
+ * test/jtreg/com/sun/javatest/report/XMLReportMaker.java:
+ Remove more DOS line endings.
+
2009-08-04 Andrew John Hughes <ahughes at redhat.com>
* netx/net/sourceforge/jnlp/DefaultLaunchHandler.java,
diff -r 5aca55727a2a -r 40aa38f0fe07 test/jtreg/com/sun/javatest/exec/FileTable.java
--- a/test/jtreg/com/sun/javatest/exec/FileTable.java Tue Aug 04 17:29:24 2009 +0100
+++ b/test/jtreg/com/sun/javatest/exec/FileTable.java Tue Aug 04 17:43:18 2009 +0100
@@ -24,76 +24,76 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-package com.sun.javatest.exec;
-
-import com.sun.javatest.tool.UIFactory;
-import java.awt.Component;
-import javax.swing.Icon;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.DefaultTableCellRenderer;
-
-public class FileTable extends JTable {
-
-
-
- public FileTable(FileSystemTableModel model, UIFactory uif) {
- super(model);
- this.uif = uif;
- setCellSelectionEnabled(false);
- setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- setRowSelectionAllowed(true);
- setShowGrid(false);
- getColumnModel().getColumn(0).setCellRenderer(new IconRenderer());
- }
-
- private class IconRenderer extends DefaultTableCellRenderer {
-
- {
- up = uif.createIcon("upper");
- dir = uif.createIcon("folder");
- }
-
- public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
-
- setFont(table.getFont());
- setIcon(null);
- setText("");
-
- if (isSelected) {
- super.setForeground(table.getSelectionForeground());
- super.setBackground(table.getSelectionBackground());
- } else {
- super.setForeground(table.getForeground());
- super.setBackground(table.getBackground());
- }
-
- if (value instanceof FileTableNode) {
- FileTableNode fn = (FileTableNode) value;
- if (fn.getMode() != 'f') {
- if (fn.getMode() == 'u') {
- setIcon(up);
- return this;
- }
- if (fn.getMode() == 'd') {
- setIcon(dir);
- setText(fn.toString());
- return this;
- }
- }
- }
- return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
- }
-
- private Icon up;
- private Icon dir;
-
- }
-
-
-
- private UIFactory uif;
-
-
-}
+package com.sun.javatest.exec;
+
+import com.sun.javatest.tool.UIFactory;
+import java.awt.Component;
+import javax.swing.Icon;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.table.DefaultTableCellRenderer;
+
+public class FileTable extends JTable {
+
+
+
+ public FileTable(FileSystemTableModel model, UIFactory uif) {
+ super(model);
+ this.uif = uif;
+ setCellSelectionEnabled(false);
+ setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ setRowSelectionAllowed(true);
+ setShowGrid(false);
+ getColumnModel().getColumn(0).setCellRenderer(new IconRenderer());
+ }
+
+ private class IconRenderer extends DefaultTableCellRenderer {
+
+ {
+ up = uif.createIcon("upper");
+ dir = uif.createIcon("folder");
+ }
+
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+
+ setFont(table.getFont());
+ setIcon(null);
+ setText("");
+
+ if (isSelected) {
+ super.setForeground(table.getSelectionForeground());
+ super.setBackground(table.getSelectionBackground());
+ } else {
+ super.setForeground(table.getForeground());
+ super.setBackground(table.getBackground());
+ }
+
+ if (value instanceof FileTableNode) {
+ FileTableNode fn = (FileTableNode) value;
+ if (fn.getMode() != 'f') {
+ if (fn.getMode() == 'u') {
+ setIcon(up);
+ return this;
+ }
+ if (fn.getMode() == 'd') {
+ setIcon(dir);
+ setText(fn.toString());
+ return this;
+ }
+ }
+ }
+ return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ }
+
+ private Icon up;
+ private Icon dir;
+
+ }
+
+
+
+ private UIFactory uif;
+
+
+}
diff -r 5aca55727a2a -r 40aa38f0fe07 test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java
--- a/test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java Tue Aug 04 17:29:24 2009 +0100
+++ b/test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java Tue Aug 04 17:43:18 2009 +0100
@@ -24,240 +24,240 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-package com.sun.javatest.mrep;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.border.Border;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import com.sun.javatest.tool.UIFactory;
-import javax.swing.JOptionPane;
-
-public class ConflictResolutionDialog extends JDialog {
-
- private String resolveButtonStr = "resolve";
- private String cancelButtonStr = "cancel";
- private String useMostRecentCheckBoxStr = "useMost";
-
- private JCheckBox preferredReportCheckBox;
- private JCheckBox useMostRecentCheckBox;
-
- private JButton resolveButton;
- private JButton cancelButton;
-
- private DefaultListModel listModel;
- private JList list;
-
- private int selectedIndex;
- private boolean bPreferredReport;
- private boolean bUseMostRecent;
-
- private UIFactory uif;
-
- private boolean cancel = false;
-
-
- public ConflictResolutionDialog(JFrame parent, String testName, String[] reportsList, boolean bPreferredSet, UIFactory uif) {
- super(parent, true);
- this.uif = uif;
-
- setName("conflict");
- setTitle(uif.getI18NString("conflict.name"));
- setResizable(false);
-
- Container cp = getContentPane();
- cp.setLayout(new BorderLayout());
- setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- ConflictResolutionActionListener conflictResolutionListener = new ConflictResolutionActionListener();
-
- JLabel text = uif.createLabel("conflict.text");
- text.setText(text.getText() + " " + testName);
-
-
- text.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
- JPanel textPanel = uif.createPanel("conflict.text.panel", new FlowLayout(FlowLayout.CENTER));
- textPanel.add(text);
-
- Box vBox = Box.createVerticalBox();
-
- JLabel chooseText =uif.createLabel("conflict.chooseText");
- //text.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
- JPanel chooseTextPanel = uif.createPanel("conflict.choosePanel", new FlowLayout(FlowLayout.CENTER));
- chooseTextPanel.add(chooseText);
-
- // Build list box
- listModel=new DefaultListModel();
- for (int i=0; i< reportsList.length; i++) {
- listModel.addElement(reportsList[i]);
- }
- list = uif.createList("conflict.list", listModel);
- list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- ReportsListSelectionListener rl = new ReportsListSelectionListener();
- list.addListSelectionListener(rl);
- Border brd = BorderFactory.createMatteBorder(1, 1, 1, 1, Color.BLACK);
- list.setBorder(brd);
- JScrollPane scrollPane = uif.createScrollPane(list);
- Box hBox = Box.createHorizontalBox();
- //hBox.add(Box.createHorizontalStrut(20));
- hBox.add(scrollPane);
- //hBox.add(Box.createHorizontalStrut(20));
-
- preferredReportCheckBox = uif.createCheckBox("conflict.preffered");
- preferredReportCheckBox.setMnemonic(0);
- preferredReportCheckBox.setEnabled(false);
- JPanel preferredReportPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
- preferredReportPanel.add(preferredReportCheckBox);
-
-
- useMostRecentCheckBox = uif.createCheckBox("conflict.most.recent");
- useMostRecentCheckBox.setMnemonic(1);
- useMostRecentCheckBox.addActionListener(conflictResolutionListener);
- useMostRecentCheckBox.setActionCommand(useMostRecentCheckBoxStr);
- JPanel useRecentPanel = uif.createPanel("conflict.recent", new FlowLayout(FlowLayout.LEFT));
- useRecentPanel.add(useMostRecentCheckBox);
-
-
-
- vBox.setBorder(BorderFactory.createEmptyBorder(0,20,0,20));
- vBox.add(chooseTextPanel);
- vBox.add(hBox);
- // if preferred report was already chosen, in previous dialogs, it should not be seen here
- if (!bPreferredSet) {
- vBox.add(preferredReportPanel);
- }
- vBox.add(useRecentPanel);
-
-
- // Build control buttons
- JPanel controlButtonsPanel = uif.createPanel("conflict.control", new FlowLayout(FlowLayout.CENTER));
- JPanel p2 = new JPanel();
- p2.setLayout(new GridLayout(1,0,5,5));
-
- resolveButton = uif.createButton("conflict.resolve");
- resolveButton.setMnemonic(0);
- resolveButton.addActionListener(conflictResolutionListener);
- resolveButton.setActionCommand(resolveButtonStr);
- resolveButton.setEnabled(false);
-
- cancelButton = uif.createButton("conflict.cancel");
- cancelButton.addActionListener(conflictResolutionListener);
- cancelButton.setActionCommand(cancelButtonStr);
-
- p2.add(resolveButton);
- p2.add(cancelButton);
-
- controlButtonsPanel.add(p2);
- controlButtonsPanel.setBorder(BorderFactory.createEmptyBorder(20,0,0,0));
-
- cp.add(textPanel, BorderLayout.NORTH);
- cp.add(vBox, BorderLayout.CENTER);
- cp.add(controlButtonsPanel, BorderLayout.SOUTH);
-
- pack();
- setLocationRelativeTo(parent);
- }
-
- public int getSelectedIndex() {
- return selectedIndex;
- }
- public boolean getPreferredReport() {
- return bPreferredReport;
- }
-
- public boolean getUseMostRecent() {
- return bUseMostRecent;
- }
-
- public boolean wasCanceled() {
- return cancel;
- }
-
- class CancelException extends Exception {
-
- }
-
-
- class ConflictResolutionActionListener implements ActionListener {
-
- public void actionPerformed(ActionEvent e) {
-
- String cmd = e.getActionCommand();
- if (cmd.equals(cancelButtonStr)) {
-
- if (uif.showYesNoDialog("conflict.areyousure") != JOptionPane.YES_OPTION)
- return;
-
- ConflictResolutionDialog.this.cancel = true;
- ConflictResolutionDialog.this.dispose();
- } else if (cmd.equals(resolveButtonStr)) {
- bUseMostRecent = useMostRecentCheckBox.isSelected();
- bPreferredReport = preferredReportCheckBox.isSelected();
- selectedIndex = list.getSelectedIndex();
- ConflictResolutionDialog.this.dispose();
-
- } else if (cmd.equals(useMostRecentCheckBoxStr)) {
- if ((list.getSelectedValues().length == 0) &&
- (!useMostRecentCheckBox.isSelected())) {
- resolveButton.setEnabled(false);
- } else {
- resolveButton.setEnabled(true);
- }
-
-
- if (useMostRecentCheckBox.isSelected()) {
- list.setEnabled(false);
- preferredReportCheckBox.setEnabled(false);
- } else {
- list.setEnabled(true);
- preferredReportCheckBox.setEnabled(true);
- }
- } else
- ; // ignore events on all other objects
- }
- }
-
-
- class ReportsListSelectionListener implements ListSelectionListener {
- public void valueChanged(ListSelectionEvent e) {
- if(e.getValueIsAdjusting()) return;
-
- if ((list.getSelectedValues().length == 0) &&
- (!useMostRecentCheckBox.isSelected())) {
- resolveButton.setEnabled(false);
- } else {
- resolveButton.setEnabled(true);
- }
-
-
- if (list.getSelectedValues().length == 0) {
- preferredReportCheckBox.setEnabled(false);
- } else {
- preferredReportCheckBox.setEnabled(true);
- }
-
- }
- }
-
-}
-
+package com.sun.javatest.mrep;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.border.Border;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import com.sun.javatest.tool.UIFactory;
+import javax.swing.JOptionPane;
+
+public class ConflictResolutionDialog extends JDialog {
+
+ private String resolveButtonStr = "resolve";
+ private String cancelButtonStr = "cancel";
+ private String useMostRecentCheckBoxStr = "useMost";
+
+ private JCheckBox preferredReportCheckBox;
+ private JCheckBox useMostRecentCheckBox;
+
+ private JButton resolveButton;
+ private JButton cancelButton;
+
+ private DefaultListModel listModel;
+ private JList list;
+
+ private int selectedIndex;
+ private boolean bPreferredReport;
+ private boolean bUseMostRecent;
+
+ private UIFactory uif;
+
+ private boolean cancel = false;
+
+
+ public ConflictResolutionDialog(JFrame parent, String testName, String[] reportsList, boolean bPreferredSet, UIFactory uif) {
+ super(parent, true);
+ this.uif = uif;
+
+ setName("conflict");
+ setTitle(uif.getI18NString("conflict.name"));
+ setResizable(false);
+
+ Container cp = getContentPane();
+ cp.setLayout(new BorderLayout());
+ setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+ ConflictResolutionActionListener conflictResolutionListener = new ConflictResolutionActionListener();
+
+ JLabel text = uif.createLabel("conflict.text");
+ text.setText(text.getText() + " " + testName);
+
+
+ text.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+ JPanel textPanel = uif.createPanel("conflict.text.panel", new FlowLayout(FlowLayout.CENTER));
+ textPanel.add(text);
+
+ Box vBox = Box.createVerticalBox();
+
+ JLabel chooseText =uif.createLabel("conflict.chooseText");
+ //text.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+ JPanel chooseTextPanel = uif.createPanel("conflict.choosePanel", new FlowLayout(FlowLayout.CENTER));
+ chooseTextPanel.add(chooseText);
+
+ // Build list box
+ listModel=new DefaultListModel();
+ for (int i=0; i< reportsList.length; i++) {
+ listModel.addElement(reportsList[i]);
+ }
+ list = uif.createList("conflict.list", listModel);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
More information about the distro-pkg-dev
mailing list