summaryrefslogtreecommitdiff
path: root/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:03 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:03 +0200
commitd8b6cc3b44ddcf9647653dc8ee88f3d9024feebf (patch)
tree3d395e7313279565a46774ac2921b987e24b9fc5 /javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
parentb52ec9a4fa9b8eb93a181fac3613f1de7d1d0825 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 04144eede67d986878496224a1bfec8b5666f1fe (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:16 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit c2d496a993f9643bc8a737c505f070246fcf6fad Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:53:12 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) .../uiconfig/sbibliography/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit da172d85638baf1bcc1dd2bdc985f1a50d308bc3 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:36 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: components_libreoffice-3.3.0.4
Diffstat (limited to 'javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java')
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java34
1 files changed, 17 insertions, 17 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
index c21d1e663cae..af72ef8cee3d 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ public class DetailsDialog extends JDialog implements ActionListener {
private JButton okButton;
private String helpFileName;
private String helpFileString;
-
+
public DetailsDialog(SetupFrame setupFrame) {
super(setupFrame.getDialog());
@@ -61,14 +61,14 @@ public class DetailsDialog extends JDialog implements ActionListener {
String dialogTitle = ResourceManager.getString("String_InstallationCompleted_Button");
String dialogText = setupFrame.getCurrentPanel().getDialogText();
-
+
setTitle(dialogTitle);
this.getContentPane().setLayout(new java.awt.BorderLayout());
-
+
JPanel toppanel = new JPanel();
toppanel.setLayout(new java.awt.BorderLayout());
toppanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
-
+
JPanel buttonpanel = new JPanel();
buttonpanel.setLayout(new java.awt.FlowLayout());
buttonpanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
@@ -101,39 +101,39 @@ public class DetailsDialog extends JDialog implements ActionListener {
okButton.addActionListener(this);
JSeparator separator = new JSeparator();
-
+
// toppanel.add(label1, BorderLayout.NORTH);
- // toppanel.add(label2, BorderLayout.CENTER);
- buttonpanel.add(okButton);
+ // toppanel.add(label2, BorderLayout.CENTER);
+ buttonpanel.add(okButton);
this.getContentPane().add(toppanel, BorderLayout.NORTH);
this.getContentPane().add(editorScrollPane, BorderLayout.CENTER);
this.getContentPane().add(buttonpanel, BorderLayout.SOUTH);
-
+
// JScrollBar ScrollBar = editorScrollPane.getVerticalScrollBar();
// if ( ScrollBar.isShowing() ) {
// editorPane.setFocusable(false);
// } else {
- // editorPane.setFocusable(true);
+ // editorPane.setFocusable(true);
// }
-
- // Setting tab-order and focus on okButton
+
+ // Setting tab-order and focus on okButton
DialogFocusTraversalPolicy policy = new DialogFocusTraversalPolicy(new JComponent[] {okButton, editorScrollPane});
this.setFocusTraversalPolicy(policy); // set policy
this.setFocusCycleRoot(true); // enable policy
}
-
+
private JEditorPane createEditorPane(String dialogText) {
JEditorPane editorPane = new JEditorPane();
editorPane.setEditable(false);
editorPane.setContentType("text/html");
- editorPane.setText(dialogText);
+ editorPane.setText(dialogText);
return editorPane;
- }
-
+ }
+
public void actionPerformed (java.awt.event.ActionEvent evt) {
setVisible(false);
- dispose();
+ dispose();
}
}