You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2015/04/24 15:56:47 UTC
svn commit: r1675859 - in /chemistry/opencmis/trunk: ./
chemistry-opencmis-workbench/chemistry-opencmis-workbench/
chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/
chemistry-opencmis-workb...
Author: fmui
Date: Fri Apr 24 13:56:46 2015
New Revision: 1675859
URL: http://svn.apache.org/r1675859
Log:
Workbench: first step to make the UI scalable
Added:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java
Modified:
chemistry/opencmis/trunk/README.txt
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientHelper.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/QueryFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypeSplitPane.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypesFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/Workbench.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/checks/SwingReport.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/AbstractDetailsTable.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/InfoPanel.java
Modified: chemistry/opencmis/trunk/README.txt
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/README.txt?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/README.txt (original)
+++ chemistry/opencmis/trunk/README.txt Fri Apr 24 13:56:46 2015
@@ -17,7 +17,7 @@ You can build OpenCMIS like this:
mvn clean install
-You need Maven 3 with Java 6 (or higher) for the build.
+You need Maven 3 with Java 7 (or higher) for the build.
Set the environment variable MAVEN_OPTS to
'-Xmx1024m -XX:MaxPermSize=256m' to give Maven more memory.
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml Fri Apr 24 13:56:46 2015
@@ -135,6 +135,14 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>1.7</target>
+ <source>1.7</source>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -145,8 +153,8 @@
<classpathPrefix />
</manifest>
<manifestEntries>
- <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+ <X-Compile-Source-JDK>1.7</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>1.7</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java Fri Apr 24 13:56:46 2015
@@ -26,6 +26,7 @@ import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
@@ -150,7 +151,10 @@ public class AclEditorFrame extends JFra
private void createGUI() {
setTitle(WINDOW_TITLE);
- setPreferredSize(new Dimension(800, 600));
+
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ setPreferredSize(new Dimension((int) (screenSize.getWidth() / 1.5), (int) (screenSize.getHeight() / 1.5)));
+ setMinimumSize(new Dimension(200, 60));
setMinimumSize(new Dimension(300, 120));
setLayout(new BorderLayout());
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java Fri Apr 24 13:56:46 2015
@@ -111,9 +111,9 @@ public class BasicLoginTab extends Abstr
bindingGroup.add(bindingWebServicesButton);
bindingGroup.add(bindingBrowserButton);
bindingContainer.add(bindingAtomButton);
- bindingContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ bindingContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
bindingContainer.add(bindingWebServicesButton);
- bindingContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ bindingContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
bindingContainer.add(bindingBrowserButton);
JLabel bindingLabel = new JLabel("Binding:", JLabel.TRAILING);
@@ -139,11 +139,11 @@ public class BasicLoginTab extends Abstr
authenticationGroup.add(authenticationNTLMButton);
authenticationGroup.add(authenticationOAuthButton);
authenticationContainer.add(authenticationNoneButton);
- authenticationContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ authenticationContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
authenticationContainer.add(authenticationStandardButton);
- authenticationContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ authenticationContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
authenticationContainer.add(authenticationNTLMButton);
- authenticationContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ authenticationContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
authenticationContainer.add(authenticationOAuthButton);
JLabel authenticatioLabel = new JLabel("Authentication:", JLabel.TRAILING);
@@ -161,7 +161,7 @@ public class BasicLoginTab extends Abstr
compressionGroup.add(compressionOnButton);
compressionGroup.add(compressionOffButton);
compressionContainer.add(compressionOnButton);
- compressionContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ compressionContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
compressionContainer.add(compressionOffButton);
JLabel compressionLabel = new JLabel("Compression:", JLabel.TRAILING);
@@ -179,7 +179,7 @@ public class BasicLoginTab extends Abstr
clientCompressionGroup.add(clientCompressionOnButton);
clientCompressionGroup.add(clientCompressionOffButton);
clientCompressionContainer.add(clientCompressionOnButton);
- clientCompressionContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ clientCompressionContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
clientCompressionContainer.add(clientCompressionOffButton);
JLabel clientCompressionLabel = new JLabel("Client Compression:", JLabel.TRAILING);
@@ -197,7 +197,7 @@ public class BasicLoginTab extends Abstr
cookiesGroup.add(cookiesOnButton);
cookiesGroup.add(cookiesOffButton);
cookiesContainer.add(cookiesOnButton);
- cookiesContainer.add(Box.createRigidArea(new Dimension(10, 0)));
+ cookiesContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0))));
cookiesContainer.add(cookiesOffButton);
JLabel cookiesLabel = new JLabel("Cookies:", JLabel.TRAILING);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientHelper.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientHelper.java Fri Apr 24 13:56:46 2015
@@ -208,7 +208,7 @@ public final class ClientHelper {
public static ImageIcon getIcon(String name) {
URL imageURL = ClientHelper.class.getResource("/images/" + name);
if (imageURL != null) {
- return new ImageIcon(imageURL);
+ return WorkbenchScale.scaleIcon(new ImageIcon(imageURL));
}
return null;
@@ -425,8 +425,8 @@ public final class ClientHelper {
char c = s.charAt(i);
if (c == '<') {
sb.append("<");
- } else if (c == '<') {
- sb.append("<");
+ } else if (c == '>') {
+ sb.append(">");
} else if (c == '"') {
sb.append(""");
} else if (c == '\'') {
@@ -536,7 +536,7 @@ public final class ClientHelper {
return null;
}
} catch (Exception e) {
- LOG.error("Cannot open library file: " + propertiesFile, e);
+ LOG.error("Cannot open library file: {}", propertiesFile, e);
return null;
}
@@ -591,7 +591,7 @@ public final class ClientHelper {
if (uri != null) {
result.add(new FileEntry(properties.getProperty(file), uri));
} else {
- LOG.error("Cannot find library entry: " + file);
+ LOG.error("Cannot find library entry: {}", file);
}
} catch (URISyntaxException e) {
// ignore entry
@@ -601,7 +601,7 @@ public final class ClientHelper {
return result;
} catch (IOException e) {
- LOG.error("Cannot read library file: " + propertiesFile);
+ LOG.error("Cannot read library file: {}", propertiesFile);
return null;
} finally {
IOUtils.closeQuietly(stream);
@@ -713,9 +713,12 @@ public final class ClientHelper {
public static void runJSR223Script(final Component parent, final ClientModel model, final File file,
final String ext, final Writer out) {
+ InputStreamReader reader = null;
try {
parent.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ reader = new InputStreamReader(new FileInputStream(file), IOUtils.UTF8);
+
ScriptEngineManager mgr = new ScriptEngineManager();
ScriptEngine engine = mgr.getEngineByExtension(ext);
engine.getContext().setWriter(out);
@@ -723,10 +726,11 @@ public final class ClientHelper {
engine.put("session", model.getClientSession().getSession());
engine.put("binding", model.getClientSession().getSession().getBinding());
engine.put("out", new PrintWriter(out));
- engine.eval(new InputStreamReader(new FileInputStream(file), IOUtils.UTF8));
+ engine.eval(reader);
} catch (Exception ex) {
ClientHelper.showError(null, ex);
} finally {
+ IOUtils.closeQuietly(reader);
parent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java Fri Apr 24 13:56:46 2015
@@ -106,7 +106,7 @@ public class ConnectionErrorDialog exten
add(buttonPanel, BorderLayout.PAGE_END);
JButton closeButton = new JButton("Close");
- closeButton.setPreferredSize(new Dimension(Short.MAX_VALUE, 30));
+ closeButton.setPreferredSize(new Dimension(Short.MAX_VALUE, WorkbenchScale.scaleInt(30)));
closeButton.setMaximumSize(new Dimension(Short.MAX_VALUE, Short.MAX_VALUE));
closeButton.setAlignmentX(Component.CENTER_ALIGNMENT);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java Fri Apr 24 13:56:46 2015
@@ -95,7 +95,7 @@ public class FolderTable extends JTable
column.setPreferredWidth(COLUMN_WIDTHS[i]);
}
- setRowHeight(getFontMetrics(getFont()).getHeight());
+ setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
final JPopupMenu popup = new JPopupMenu();
JMenuItem menuItem = new JMenuItem("Copy to clipboard");
@@ -166,7 +166,10 @@ public class FolderTable extends JTable
}
});
+ // load icon and set icon column size
loadIcons();
+ getColumnModel().getColumn(0).setPreferredWidth(
+ (int) (icons.get(BaseTypeId.CMIS_DOCUMENT).getIconWidth() * 1.1));
}
private void loadIcons() {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java Fri Apr 24 13:56:46 2015
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+x * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/QueryFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/QueryFrame.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/QueryFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/QueryFrame.java Fri Apr 24 13:56:46 2015
@@ -439,7 +439,7 @@ public class QueryFrame extends JFrame {
setFillsViewportHeight(true);
setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- setRowHeight(getFontMetrics(getFont()).getHeight());
+ setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
}
@Override
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java Fri Apr 24 13:56:46 2015
@@ -234,7 +234,7 @@ public class RepositoryInfoFrame extends
JTable permTable = new JTable(data, new String[] { "Permission", "Description" });
permTable.setFillsViewportHeight(true);
- permTable.setRowHeight(getFontMetrics(permTable.getFont()).getHeight());
+ permTable.setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
addComponent("Permissions:", new JScrollPane(permTable));
}
@@ -250,7 +250,7 @@ public class RepositoryInfoFrame extends
JTable permMapTable = new JTable(data, new String[] { "Key", "Permissions" });
permMapTable.setFillsViewportHeight(true);
- permMapTable.setRowHeight(getFontMetrics(permMapTable.getFont()).getHeight());
+ permMapTable.setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
addComponent("Permission mapping:", new JScrollPane(permMapTable));
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java Fri Apr 24 13:56:46 2015
@@ -199,27 +199,27 @@ public class TckDialog {
final JComboBox folderComboBox = addComboBox(configPanel, "Test folder type:",
BaseTypeId.CMIS_FOLDER.value(), TestParameters.DEFAULT_FOLDER_TYPE_VALUE, true);
- configPanel.add(Box.createRigidArea(new Dimension(1, 10)));
+ configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(1, 10))));
final JComboBox documentComboBox = addComboBox(configPanel, "Test document type:",
BaseTypeId.CMIS_DOCUMENT.value(), TestParameters.DEFAULT_DOCUMENT_TYPE_VALUE, true);
- configPanel.add(Box.createRigidArea(new Dimension(1, 10)));
+ configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(1, 10))));
final JComboBox relationshipComboBox = addComboBox(configPanel, "Test relationship type:",
BaseTypeId.CMIS_RELATIONSHIP.value(), TestParameters.DEFAULT_RELATIONSHIP_TYPE_VALUE, true);
- configPanel.add(Box.createRigidArea(new Dimension(1, 10)));
+ configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(1, 10))));
final JComboBox itemComboBox = addComboBox(configPanel, "Test item type:", BaseTypeId.CMIS_ITEM.value(),
TestParameters.DEFAULT_ITEM_TYPE_VALUE, true);
- configPanel.add(Box.createRigidArea(new Dimension(1, 10)));
+ configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(1, 10))));
final JComboBox secondaryComboBox = addComboBox(configPanel, "Test secondary type:",
BaseTypeId.CMIS_SECONDARY.value(), TestParameters.DEFAULT_SECONDARY_TYPE_VALUE, false);
- configPanel.add(Box.createRigidArea(new Dimension(1, 10)));
+ configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(1, 10))));
configPanel.add(new JLabel("Test folder path:"));
final JTextField testParentFolderField = new JTextField(TestParameters.DEFAULT_TEST_FOLDER_PARENT_VALUE);
- testParentFolderField.setMaximumSize(new Dimension(Short.MAX_VALUE, 10));
+ testParentFolderField.setMaximumSize(new Dimension(Short.MAX_VALUE, WorkbenchScale.scaleInt(10)));
testParentFolderField.setAlignmentX(Component.LEFT_ALIGNMENT);
configPanel.add(testParentFolderField);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypeSplitPane.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypeSplitPane.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypeSplitPane.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypeSplitPane.java Fri Apr 24 13:56:46 2015
@@ -264,7 +264,7 @@ public class TypeSplitPane extends JSpli
column.setPreferredWidth(COLUMN_WIDTHS[i]);
}
- setRowHeight(getFontMetrics(getFont()).getHeight());
+ setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
final JPopupMenu popup = new JPopupMenu();
JMenuItem menuItem = new JMenuItem("Copy to clipboard");
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypesFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypesFrame.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypesFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TypesFrame.java Fri Apr 24 13:56:46 2015
@@ -61,6 +61,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
public class TypesFrame extends JFrame {
@@ -125,13 +126,15 @@ public class TypesFrame extends JFrame {
int chooseResult = fileChooser.showDialog(getRootPane(), "Save XML");
if (chooseResult == JFileChooser.APPROVE_OPTION) {
+ OutputStream out = null;
try {
- OutputStream out = new BufferedOutputStream(new FileOutputStream(fileChooser.getSelectedFile()));
+ out = new BufferedOutputStream(new FileOutputStream(fileChooser.getSelectedFile()));
TypeUtils.writeToXML(currentType, out);
out.flush();
- out.close();
} catch (Exception e) {
ClientHelper.showError(getRootPane(), e);
+ } finally {
+ IOUtils.closeQuietly(out);
}
}
}
@@ -147,13 +150,15 @@ public class TypesFrame extends JFrame {
int chooseResult = fileChooser.showDialog(getRootPane(), "Save JSON");
if (chooseResult == JFileChooser.APPROVE_OPTION) {
+ OutputStream out = null;
try {
- OutputStream out = new BufferedOutputStream(new FileOutputStream(fileChooser.getSelectedFile()));
+ out = new BufferedOutputStream(new FileOutputStream(fileChooser.getSelectedFile()));
TypeUtils.writeToJSON(currentType, out);
out.flush();
- out.close();
} catch (Exception e) {
ClientHelper.showError(getRootPane(), e);
+ } finally {
+ IOUtils.closeQuietly(out);
}
}
}
@@ -181,11 +186,10 @@ public class TypesFrame extends JFrame {
int chooseResult = fileChooser.showDialog(getRootPane(), "Load XML");
if (chooseResult == JFileChooser.APPROVE_OPTION) {
+ InputStream in = null;
try {
- InputStream in = new BufferedInputStream(new FileInputStream(fileChooser.getSelectedFile()),
- 64 * 1024);
+ in = new BufferedInputStream(new FileInputStream(fileChooser.getSelectedFile()), 64 * 1024);
TypeDefinition type = TypeUtils.readFromXML(in);
- in.close();
if (checkTypeDefinition(type)) {
model.getClientSession().getSession().updateType(type);
@@ -194,6 +198,8 @@ public class TypesFrame extends JFrame {
loadData();
} catch (Exception e) {
ClientHelper.showError(getRootPane(), e);
+ } finally {
+ IOUtils.closeQuietly(in);
}
}
}
@@ -208,11 +214,10 @@ public class TypesFrame extends JFrame {
int chooseResult = fileChooser.showDialog(getRootPane(), "Load JSON");
if (chooseResult == JFileChooser.APPROVE_OPTION) {
+ InputStream in = null;
try {
- InputStream in = new BufferedInputStream(new FileInputStream(fileChooser.getSelectedFile()),
- 64 * 1024);
+ in = new BufferedInputStream(new FileInputStream(fileChooser.getSelectedFile()), 64 * 1024);
TypeDefinition type = TypeUtils.readFromJSON(in);
- in.close();
if (checkTypeDefinition(type)) {
model.getClientSession().getSession().updateType(type);
@@ -221,6 +226,8 @@ public class TypesFrame extends JFrame {
loadData();
} catch (Exception e) {
ClientHelper.showError(getRootPane(), e);
+ } finally {
+ IOUtils.closeQuietly(in);
}
}
}
@@ -272,12 +279,10 @@ public class TypesFrame extends JFrame {
int chooseResult = fileChooser.showDialog(getRootPane(), "Load XML");
if (chooseResult == JFileChooser.APPROVE_OPTION) {
+ InputStream in = null;
try {
- InputStream in = new BufferedInputStream(new FileInputStream(fileChooser.getSelectedFile()),
- 64 * 1024);
+ in = new BufferedInputStream(new FileInputStream(fileChooser.getSelectedFile()), 64 * 1024);
TypeDefinition type = TypeUtils.readFromXML(in);
- in.close();
-
if (checkTypeDefinition(type)) {
model.getClientSession().getSession().createType(type);
}
@@ -285,6 +290,8 @@ public class TypesFrame extends JFrame {
loadData();
} catch (Exception e) {
ClientHelper.showError(getRootPane(), e);
+ } finally {
+ IOUtils.closeQuietly(in);
}
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/Workbench.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/Workbench.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/Workbench.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/Workbench.java Fri Apr 24 13:56:46 2015
@@ -49,7 +49,11 @@ public class Workbench {
for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
- UIManager.setLookAndFeel(info.getClassName());
+ if (WorkbenchScale.isScaling()) {
+ UIManager.setLookAndFeel(new WorkbenchScale.ScaledNimbusLookAndFeel());
+ } else {
+ UIManager.setLookAndFeel(info.getClassName());
+ }
nimbus = true;
break;
}
@@ -59,12 +63,12 @@ public class Workbench {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
}
} catch (Exception e) {
- LOG.warn("Nimbus not available: " + e.getMessage(), e);
+ LOG.warn("Nimbus not available: {}", e.getMessage(), e);
}
}
});
} catch (Exception e) {
- LOG.warn("Nimbus not available: " + e.getMessage(), e);
+ LOG.warn("Nimbus not available: {}", e.getMessage(), e);
}
JFrame.setDefaultLookAndFeelDecorated(true);
Added: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java?rev=1675859&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java Fri Apr 24 13:56:46 2015
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.chemistry.opencmis.workbench;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.ImageIcon;
+import javax.swing.UIDefaults;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+
+public class WorkbenchScale {
+ public static final String WORKBENCH_SCALE = "cmis.workbench.scale";
+
+ private static boolean scale = false;
+ private static Float scaleFactor = null;
+
+ static {
+ String scaleStr = System.getProperty(WORKBENCH_SCALE);
+ if (scaleStr != null) {
+ try {
+ scaleFactor = Float.parseFloat(scaleStr.trim());
+ scale = true;
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+
+ public static boolean isScaling() {
+ return scale;
+ }
+
+ public static float getScaleFactor() {
+ return (scaleFactor == null ? 1.0f : (float) scaleFactor);
+ }
+
+ public static int scaleInt(int x) {
+ if (scale) {
+ return (int) (x * getScaleFactor());
+ } else {
+ return x;
+ }
+ }
+
+ public static Font scaleFont(Font font) {
+ if (scale) {
+ return font.deriveFont(font.getSize() * getScaleFactor());
+ } else {
+ return font;
+ }
+ }
+
+ public static Insets scaleInsets(Insets insets) {
+ if (scale) {
+ return new Insets(scaleInt(insets.top), scaleInt(insets.left), scaleInt(insets.bottom),
+ scaleInt(insets.right));
+ } else {
+ return insets;
+ }
+ }
+
+ public static Dimension scaleDimension(Dimension dim) {
+ if (scale) {
+ return new Dimension(scaleInt(dim.width), scaleInt(dim.height));
+ } else {
+ return dim;
+ }
+ }
+
+ public static ImageIcon scaleIcon(ImageIcon icon) {
+ if (scale) {
+ int newWidth = (int) (icon.getIconWidth() * getScaleFactor());
+ int newHeight = (int) (icon.getIconHeight() * getScaleFactor());
+
+ BufferedImage img = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_4BYTE_ABGR);
+ Graphics2D g = img.createGraphics();
+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ g.drawImage(icon.getImage(), 0, 0, newWidth, newHeight, 0, 0, icon.getIconWidth(), icon.getIconHeight(),
+ null);
+ g.dispose();
+
+ return new ImageIcon(img);
+ } else {
+ return icon;
+ }
+ }
+
+ public static class ScaledNimbusLookAndFeel extends NimbusLookAndFeel {
+ private static final long serialVersionUID = 1L;
+
+ private UIDefaults defs;
+ private boolean isScaled;
+
+ public ScaledNimbusLookAndFeel() {
+ isScaled = false;
+ }
+
+ @Override
+ public synchronized UIDefaults getDefaults() {
+ if (isScaled) {
+ return defs;
+ }
+
+ defs = super.getDefaults();
+
+ Map<String, Object> newDefs = new HashMap<String, Object>();
+
+ Enumeration<Object> enumeration = defs.keys();
+ while (enumeration.hasMoreElements()) {
+ String key = enumeration.nextElement().toString();
+
+ Font font = defs.getFont(key);
+ if (font != null) {
+ newDefs.put(key, scaleFont(font));
+ }
+
+ Dimension dim = defs.getDimension(key);
+ if (dim != null) {
+ newDefs.put(key, scaleDimension(dim));
+ }
+
+ Insets insets = defs.getInsets(key);
+ if (insets != null) {
+ newDefs.put(key, scaleInsets(insets));
+ }
+ }
+
+ for (Map.Entry<String, Object> entry : newDefs.entrySet()) {
+ defs.put(entry.getKey(), entry.getValue());
+ }
+
+ isScaled = true;
+
+ return defs;
+ }
+ }
+}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/checks/SwingReport.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/checks/SwingReport.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/checks/SwingReport.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/checks/SwingReport.java Fri Apr 24 13:56:46 2015
@@ -55,6 +55,7 @@ import org.apache.chemistry.opencmis.tck
import org.apache.chemistry.opencmis.tck.report.TextReport;
import org.apache.chemistry.opencmis.tck.report.XmlReport;
import org.apache.chemistry.opencmis.workbench.ClientHelper;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
/**
* Swing Report.
@@ -100,8 +101,8 @@ public class SwingReport extends Abstrac
}
private void createGUI() {
- setPreferredSize(new Dimension(width, height));
- setMinimumSize(new Dimension(width, height));
+ setPreferredSize(WorkbenchScale.scaleDimension(new Dimension(width, height)));
+ setMinimumSize(WorkbenchScale.scaleDimension(new Dimension(width, height)));
setLayout(new BorderLayout());
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/AbstractDetailsTable.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/AbstractDetailsTable.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/AbstractDetailsTable.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/AbstractDetailsTable.java Fri Apr 24 13:56:46 2015
@@ -72,7 +72,7 @@ public abstract class AbstractDetailsTab
column.setPreferredWidth(colummnWidths[i]);
}
- setRowHeight(getFontMetrics(getFont()).getHeight());
+ setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
setFillsViewportHeight(true);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java Fri Apr 24 13:56:46 2015
@@ -205,7 +205,7 @@ public class ClientSession {
try {
maxChildren = Integer.valueOf(maxChildrenStr.trim());
} catch (NumberFormatException e) {
- LOG.warn("Invalid " + MAX_FOLDER_CHILDREN + " parameter!", e);
+ LOG.warn("Invalid {} parameter!", MAX_FOLDER_CHILDREN, e);
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java Fri Apr 24 13:56:46 2015
@@ -39,6 +39,7 @@ import javax.swing.UIManager;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
import org.apache.chemistry.opencmis.workbench.ClientHelper;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
public abstract class ActionPanel extends JPanel implements ActionListener {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/InfoPanel.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/InfoPanel.java?rev=1675859&r1=1675858&r2=1675859&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/InfoPanel.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/InfoPanel.java Fri Apr 24 13:56:46 2015
@@ -59,6 +59,7 @@ import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import org.apache.chemistry.opencmis.workbench.ClientHelper;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
import com.google.zxing.BarcodeFormat;
@@ -98,7 +99,7 @@ public abstract class InfoPanel extends
gbc.fill = GridBagConstraints.BOTH;
gbc.gridy = 0;
- gbc.insets = new Insets(3, 3, 3, 3);
+ gbc.insets = WorkbenchScale.scaleInsets(new Insets(3, 3, 3, 3));
Font labelFont = UIManager.getFont("Label.font");
boldFont = labelFont.deriveFont(Font.BOLD, labelFont.getSize2D() * 1.2f);