You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/01/30 15:47:50 UTC
svn commit: r501406 - in /incubator/uima/uimaj/trunk/uimaj-tools/src/main:
java/org/apache/uima/tools/annot_view/
java/org/apache/uima/tools/pear/install/ java/org/apache/uima/tools/util/gui/
resources/org/apache/uima/tools/images/
Author: alally
Date: Tue Jan 30 06:47:46 2007
New Revision: 501406
URL: http://svn.apache.org/viewvc?view=rev&rev=501406
Log:
Updated logo graphics.
UIMA-22: https://issues.apache.org/jira/browse/UIMA-22
Modified:
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png
incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png
incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java?view=diff&rev=501406&r1=501405&r2=501406
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/MainFrame.java Tue Jan 30 06:47:46 2007
@@ -2486,8 +2486,8 @@
contentPane.setOpaque(true);
JLabel bannerLabel = new JLabel(Images.getImageIcon(Images.BANNER));
- bannerLabel.setAlignmentX(LEFT_ALIGNMENT);
- contentPane.setAlignmentX(LEFT_ALIGNMENT);
+ bannerLabel.setAlignmentX(CENTER_ALIGNMENT);
+ contentPane.setAlignmentX(CENTER_ALIGNMENT);
JPanel mainPane = new JPanel();
mainPane.setBackground(Color.WHITE);
// mainPane.setLayout(new BorderLayout());
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java?view=diff&rev=501406&r1=501405&r2=501406
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java Tue Jan 30 06:47:46 2007
@@ -21,6 +21,7 @@
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Container;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Toolkit;
@@ -1095,37 +1096,38 @@
});
helpMenu.add(helpMenuItem);
helpMenu.add(aboutMenuItem);
- JPanel bannerPanel = new JPanel();
- bannerPanel.setSize(735, 60);
- bannerPanel.setBackground(Color.WHITE);
- bannerLabel = new JLabel(new ImageIcon(getClass().getResource(Images.BANNER)));
- bannerLabel.setBounds(0, 30, 735, 20);
- bannerPanel.add(bannerLabel);
+
/*
- * Initialize jContentPane and add the initialized components into the content's pane
+ * Initialize Main Pane and add the initialized components
*/
JLabel installDirLabel = new JLabel();
JLabel pearFileLabel = new JLabel();
- JPanel jContentPane = new JPanel();
- jContentPane.setLayout(null);
+ JPanel mainPane = new JPanel();
+ mainPane.setLayout(null);
pearFileLabel.setBounds(83, 70, 126, 20);
pearFileLabel.setText("PEAR File:");
installDirLabel.setBounds(83, 110, 126, 20);
installDirLabel.setText("Installation Directory:");
- jContentPane.add(pearFileLabel, null);
- jContentPane.add(getPearFileTextField(), null);
- jContentPane.add(getbrowseButton(), null);
- jContentPane.add(installDirLabel, null);
- jContentPane.add(getInstallDirTextField(), null);
- jContentPane.add(getBrowseDirButton(), null);
- jContentPane.add(getInstallButton(), null);
- jContentPane.add(getRunButton(), null);
- jContentPane.add(getHelpButton(), null);
- jContentPane.add(getPearConsole(), null);
- jContentPane.add(getJScrollPane(), null);
- jContentPane.add(bannerPanel);
- setContentPane(jContentPane);
-
+ mainPane.add(pearFileLabel, null);
+ mainPane.add(getPearFileTextField(), null);
+ mainPane.add(getbrowseButton(), null);
+ mainPane.add(installDirLabel, null);
+ mainPane.add(getInstallDirTextField(), null);
+ mainPane.add(getBrowseDirButton(), null);
+ mainPane.add(getInstallButton(), null);
+ mainPane.add(getRunButton(), null);
+ mainPane.add(getHelpButton(), null);
+ mainPane.add(getPearConsole(), null);
+ mainPane.add(getJScrollPane(), null);
+
+ /*
+ * Add main pane and UIMA banner to content pane
+ */
+ Container contentPanel = getContentPane();
+ contentPanel.setBackground(Color.WHITE);
+ JLabel banner = new JLabel(Images.getImageIcon(Images.BANNER));
+ contentPanel.add(banner, BorderLayout.NORTH);
+ contentPanel.add(mainPane, BorderLayout.CENTER);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java?view=diff&rev=501406&r1=501405&r2=501406
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java Tue Jan 30 06:47:46 2007
@@ -20,6 +20,7 @@
package org.apache.uima.tools.util.gui;
import java.awt.BorderLayout;
+import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
@@ -53,7 +54,11 @@
getContentPane().setLayout(new BorderLayout());
JButton closeButton = new JButton("OK");
- getContentPane().add(new JLabel(Images.getImageIcon(Images.UIMA_LOGO_BIG)), BorderLayout.WEST);
+ JLabel imageLabel = new JLabel(Images.getImageIcon(Images.UIMA_LOGO_BIG));
+ JPanel imagePanel = new JPanel();
+ imagePanel.setBackground(Color.WHITE);
+ imagePanel.add(imageLabel);
+ getContentPane().add(imagePanel, BorderLayout.WEST);
String aboutText = ABOUT_TEXT.replaceAll("\\$\\{version\\}", UIMAFramework.getVersionString());
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png?view=diff&rev=501406&r1=501405&r2=501406
==============================================================================
Binary files - no diff available.
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png?view=diff&rev=501406&r1=501405&r2=501406
==============================================================================
Binary files - no diff available.
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png?view=diff&rev=501406&r1=501405&r2=501406
==============================================================================
Binary files - no diff available.