Merge pull request #1446 from singletonc/BACKLOG-43170

[BACKLOG-43170] Remove copyright headers from PAD, PRD, and PSW splas…
pentaho · Jan 24, 2025 · ef8cb82 · ef8cb82
2 parents 98441a4 + b88ea2f
commit ef8cb82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/workbench/src/main/java/mondrian/gui/Workbench.java b/workbench/src/main/java/mondrian/gui/Workbench.java
@@ -1119,23 +1119,6 @@ private void aboutMenuItemActionPerformed(ActionEvent evt) {
           versionLabel.setBorder( new EmptyBorder( 0, 0, 0, 0 ) );
           versionLabel.setBounds( 300, 80, 700, versionLabel.getPreferredSize().height );
 
-          final String year = new SimpleDateFormat( "yyyy" ).format( new Date() );
-          final JTextArea copyrightArea = new JTextArea( getResourceConverter().getFormattedString( 
-                                                          "schemaExplorer.about.copyright",
-                                                          "Copyright (c) {0} Hitachi Vantara. All rights reserved.",
-                                                          year ) );
-          copyrightArea.setEditable( false );
-          copyrightArea.setBounds( 300, 105, 700, 25 );
-          copyrightArea.setOpaque( false );
-          copyrightArea.setLineWrap( true );
-          copyrightArea.setWrapStyleWord( true );
-          copyrightArea.setFont( new Font( Font.SANS_SERIF, Font.PLAIN, 12 ) );
-          copyrightArea.setEnabled( false );
-          copyrightArea.setBackground( new Color( 0, 0, 0, 0 ) );
-          copyrightArea.setForeground( new Color( 65, 65, 65 ) );
-          copyrightArea.setBorder( new EmptyBorder( 0, 0, 0, 0 ) );
-          copyrightArea.setDisabledTextColor( copyrightArea.getForeground() );
-
           StringBuilder sb = new StringBuilder();
           String line;
             try {
@@ -1153,21 +1136,20 @@ private void aboutMenuItemActionPerformed(ActionEvent evt) {
             }
           final JTextArea licenseArea = new JTextArea( sb.toString() );
           licenseArea.setEditable( false );
-          licenseArea.setBounds( 300, 130, 700, 800 );
+          licenseArea.setBounds( 300, 130, 700, 825 );
           licenseArea.setOpaque( false );
           licenseArea.setLineWrap( true );
           licenseArea.setWrapStyleWord( true );
           licenseArea.setFont( new Font( "Monospaced", Font.PLAIN, 9 ) );
           licenseArea.setEnabled( false );
           licenseArea.setBackground( new Color( 0, 0, 0, 0 ) );
           licenseArea.setBorder( new EmptyBorder( 0, 0, 0, 0 ) );
-          licenseArea.setDisabledTextColor( copyrightArea.getForeground() );
+          licenseArea.setDisabledTextColor( new Color( 65, 65, 65 ) );
 
           // Add all the overlays
           final JPanel imagePanelOverlay = new JPanel( null );
           imagePanelOverlay.setOpaque( false );
           imagePanelOverlay.add( versionLabel );
-          imagePanelOverlay.add( copyrightArea );
           imagePanelOverlay.add( licenseArea );
           imagePanelOverlay.setBackground( new Color( 0, 0, 0, 0 ) );
 

diff --git a/workbench/src/main/resources/mondrian/gui/resources/text.properties b/workbench/src/main/resources/mondrian/gui/resources/text.properties
@@ -300,7 +300,6 @@ schemaExplorer.propertyFormatterForElement.title=Property Formatter for {0} {1}
 schemaExplorer.cellFormatterForElement.title=Cell Formatter for {0} {1}
 
 schemaExplorer.about.version=Version: {0}
-schemaExplorer.about.copyright=Copyright (c) {0} Hitachi Vantara. All rights reserved.
 schemaExplorer.about.licenseTextNotFound=Failed to load the license text
 
 schemaExplorer.frame.title=Schema - {0} ({1}){2}