Author: fmui
Date: Thu Apr 30 13:49:56 2015
New Revision: 1676986
URL: http://svn.apache.org/r1676986
Log:
Workbench improvements
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/types/BaseTypesTest.java
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/ChangeLogFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.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/CreateDocumentDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.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/InfoDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.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/PropertyEditorFrame.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/WorkbenchScale.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/actions/DeleteTreePanel.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/details/ActionsPanel.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ExtensionsPanel.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ObjectPanel.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/CreateDialog.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/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/types/BaseTypesTest.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/types/BaseTypesTest.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/types/BaseTypesTest.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/types/BaseTypesTest.java
Thu Apr 30 13:49:56 2015
@@ -265,7 +265,7 @@ public class BaseTypesTest extends Abstr
}
} catch (CmisObjectNotFoundException e) {
addResult(createResult(FAILURE,
- "Type children fetched via getTypeDescendants() is
not available via getTypeChildren(): "
+ "Type children fetched via getTypeDescendants()
are not available via getTypeChildren(): "
+ tree.getItem().getId(), e, false));
}
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -151,7 +151,7 @@ public class AclEditorFrame extends JFra
private void createGUI() {
setTitle(WINDOW_TITLE);
-
+
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
setPreferredSize(new Dimension((int) (screenSize.getWidth() / 1.5),
(int) (screenSize.getHeight() / 1.5)));
setMinimumSize(new Dimension(200, 60));
@@ -167,7 +167,7 @@ public class AclEditorFrame extends JFra
final JPanel topPanel = new JPanel();
topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.Y_AXIS));
- topPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
topPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
final JLabel nameLabel = new JLabel(object.getName());
nameLabel.setFont(boldFont);
topPanel.add(nameLabel);
@@ -215,7 +215,7 @@ public class AclEditorFrame extends JFra
// update button
JButton updateButton = new JButton("Update");
- updateButton.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
updateButton.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
updateButton.setDefaultCapable(true);
updateButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
@@ -244,7 +244,7 @@ public class AclEditorFrame extends JFra
final JPanel topPanel = new JPanel();
topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.LINE_AXIS));
- topPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
topPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
final JLabel titleLabel = new JLabel(title);
titleLabel.setFont(boldFont);
@@ -370,9 +370,9 @@ public class AclEditorFrame extends JFra
private final List<String> permissions;
private int position;
- private final JComboBox principalBox;
+ private final JComboBox<String> principalBox;
private final JPanel permissionsPanel;
- private final List<JComboBox> permissionBoxes;
+ private final List<JComboBox<String>> permissionBoxes;
public AceInputPanel(final AceList list, final List<String>
principals, final List<String> permissions,
int position) {
@@ -383,8 +383,9 @@ public class AclEditorFrame extends JFra
updatePosition(position);
setLayout(new GridBagLayout());
-
setBorder(BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0,
0, 1, 0, LINE),
- BorderFactory.createEmptyBorder(10, 5, 10, 5)));
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createCompoundBorder(
+
WorkbenchScale.scaleBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, LINE)),
+
WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5)))));
GridBagConstraints c = new GridBagConstraints();
c.gridheight = 1;
@@ -411,7 +412,7 @@ public class AclEditorFrame extends JFra
c.fill = GridBagConstraints.HORIZONTAL;
c.anchor = GridBagConstraints.LINE_START;
- principalBox = new JComboBox(principals.toArray(new String[0]));
+ principalBox = new JComboBox<String>(principals.toArray(new
String[0]));
principalBox.setEditable(true);
principalBox.setPrototypeDisplayValue("1234567890123456789012345");
@@ -425,7 +426,7 @@ public class AclEditorFrame extends JFra
permissionsPanel.setLayout(new BoxLayout(permissionsPanel,
BoxLayout.Y_AXIS));
permissionsPanel.setOpaque(false);
- permissionBoxes = new ArrayList<JComboBox>();
+ permissionBoxes = new ArrayList<JComboBox<String>>();
updatePermissionsPanel(false);
@@ -449,8 +450,8 @@ public class AclEditorFrame extends JFra
add(removeButton, c);
}
- private JComboBox createPermissionBox() {
- JComboBox result = new JComboBox(permissions.toArray(new
String[0]));
+ private JComboBox<String> createPermissionBox() {
+ JComboBox<String> result = new
JComboBox<String>(permissions.toArray(new String[0]));
result.setEditable(true);
result.setPrototypeDisplayValue("1234567890123456789012345");
@@ -499,7 +500,7 @@ public class AclEditorFrame extends JFra
if (changed) {
permissionsPanel.removeAll();
- for (JComboBox box : permissionBoxes) {
+ for (JComboBox<String> box : permissionBoxes) {
permissionsPanel.add(box);
}
@@ -528,7 +529,7 @@ public class AclEditorFrame extends JFra
public Ace getAce() {
List<String> permissionsList = new ArrayList<String>();
- for (JComboBox box : permissionBoxes) {
+ for (JComboBox<String> box : permissionBoxes) {
String permission = box.getSelectedItem().toString().trim();
if (permission.length() > 0) {
permissionsList.add(permission);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java
Thu Apr 30 13:49:56 2015
@@ -65,7 +65,7 @@ public class ChangeLogFrame extends JFra
private void createGUI() {
setTitle(WINDOW_TITLE + " - " + model.getRepositoryName());
-
+
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
setPreferredSize(new Dimension((int) (screenSize.getWidth() / 4),
(int) (screenSize.getHeight() / 2)));
setMinimumSize(new Dimension(200, 60));
@@ -73,7 +73,7 @@ public class ChangeLogFrame extends JFra
setLayout(new BorderLayout());
JPanel inputPanel = new JPanel(new BorderLayout());
- inputPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+
inputPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(3,
3, 3, 3)));
inputPanel.add(new JLabel("Change Log Token: "),
BorderLayout.LINE_START);
@@ -147,7 +147,7 @@ public class ChangeLogFrame extends JFra
for (int i = 0; i < COLUMN_WIDTHS.length; i++) {
TableColumn column = getColumnModel().getColumn(i);
- column.setPreferredWidth(COLUMN_WIDTHS[i]);
+
column.setPreferredWidth(WorkbenchScale.scaleInt(COLUMN_WIDTHS[i]));
}
setFillsViewportHeight(true);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
Thu Apr 30 13:49:56 2015
@@ -338,7 +338,7 @@ public class ClientFrame extends JFrame
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
pack();
- split.setDividerLocation(prefs.getInt(PREFS_DIV, 500));
+ split.setDividerLocation(prefs.getInt(PREFS_DIV,
getPreferredSize().width / 4));
if (prefs.getInt(PREFS_X, Integer.MAX_VALUE) == Integer.MAX_VALUE) {
setLocationRelativeTo(null);
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -90,7 +90,7 @@ public class ConnectionErrorDialog exten
// hint area
JPanel hintsPanel = new JPanel();
hintsPanel.setLayout(new BoxLayout(hintsPanel, BoxLayout.PAGE_AXIS));
- hintsPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
hintsPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
add(hintsPanel, BorderLayout.CENTER);
JEditorPane hints = new JEditorPane("text/html", hint.toString());
@@ -102,7 +102,7 @@ public class ConnectionErrorDialog exten
// close button
JPanel buttonPanel = new JPanel();
buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.PAGE_AXIS));
- buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 5, 5));
+
buttonPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
5, 5, 5)));
add(buttonPanel, BorderLayout.PAGE_END);
JButton closeButton = new JButton("Close");
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java
Thu Apr 30 13:49:56 2015
@@ -65,10 +65,10 @@ public class CreateDocumentDialog extend
private JRadioButton unfiledButton;
private JRadioButton currentPathButton;
private JTextField nameField;
- private JComboBox typeBox;
+ private JComboBox<ObjectTypeItem> typeBox;
private JTextField filenameField;
private JFormattedTextField generateContentSizeField;
- private JComboBox generateContentUnitField;
+ private JComboBox<String> generateContentUnitField;
private JRadioButton versioningStateNoneButton;
private JRadioButton versioningStateMajorButton;
private JRadioButton versioningStateMinorButton;
@@ -108,14 +108,14 @@ public class CreateDocumentDialog extend
nameField = new JTextField(60);
createRow("Name:", nameField, 1);
- Object[] types = getTypes(BaseTypeId.CMIS_DOCUMENT.value());
+ ObjectTypeItem[] types = getTypes(BaseTypeId.CMIS_DOCUMENT.value());
if (types.length == 0) {
JOptionPane.showMessageDialog(this, "No creatable type!",
"Creatable Types", JOptionPane.ERROR_MESSAGE);
thisDialog.dispose();
return;
}
- typeBox = new JComboBox(types);
+ typeBox = new JComboBox<ObjectTypeItem>(types);
typeBox.setSelectedIndex(0);
typeBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
@@ -192,7 +192,7 @@ public class CreateDocumentDialog extend
generateContentSizeField.setMaximumSize(generateContentSizeField.getPreferredSize());
generateContentPanel.add(generateContentSizeField);
- generateContentUnitField = new JComboBox(new String[] { "Bytes",
"KiB", "MiB", "GiB" });
+ generateContentUnitField = new JComboBox<String>(new String[] {
"Bytes", "KiB", "MiB", "GiB" });
generateContentUnitField.setMaximumSize(new Dimension((int)
generateContentUnitField.getPreferredSize()
.getWidth() + 200, (int)
generateContentUnitField.getPreferredSize().getHeight()));
generateContentPanel.add(generateContentUnitField);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java
Thu Apr 30 13:49:56 2015
@@ -41,7 +41,7 @@ public class CreateFolderDialog extends
private static final long serialVersionUID = 1L;
private JTextField nameField;
- private JComboBox typeBox;
+ private JComboBox<ObjectTypeItem> typeBox;
public CreateFolderDialog(Frame owner, ClientModel model) {
super(owner, "Create Folder", model);
@@ -54,14 +54,14 @@ public class CreateFolderDialog extends
nameField = new JTextField(60);
createRow("Name:", nameField, 0);
- Object[] types = getTypes(BaseTypeId.CMIS_FOLDER.value());
+ ObjectTypeItem[] types = getTypes(BaseTypeId.CMIS_FOLDER.value());
if (types.length == 0) {
JOptionPane.showMessageDialog(this, "No creatable type!",
"Creatable Types", JOptionPane.ERROR_MESSAGE);
thisDialog.dispose();
return;
}
- typeBox = new JComboBox(types);
+ typeBox = new JComboBox<ObjectTypeItem>(types);
typeBox.setSelectedIndex(0);
typeBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java
Thu Apr 30 13:49:56 2015
@@ -41,7 +41,7 @@ public class CreateItemDialog extends Cr
private static final long serialVersionUID = 1L;
private JTextField nameField;
- private JComboBox typeBox;
+ private JComboBox<ObjectTypeItem> typeBox;
public CreateItemDialog(Frame owner, ClientModel model) {
super(owner, "Create Item", model);
@@ -54,14 +54,14 @@ public class CreateItemDialog extends Cr
nameField = new JTextField(60);
createRow("Name:", nameField, 0);
- Object[] types = getTypes(BaseTypeId.CMIS_ITEM.value());
+ ObjectTypeItem[] types = getTypes(BaseTypeId.CMIS_ITEM.value());
if (types.length == 0) {
JOptionPane.showMessageDialog(this, "No creatable type!",
"Creatable Types", JOptionPane.ERROR_MESSAGE);
thisDialog.dispose();
return;
}
- typeBox = new JComboBox(types);
+ typeBox = new JComboBox<ObjectTypeItem>(types);
typeBox.setSelectedIndex(0);
typeBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java
Thu Apr 30 13:49:56 2015
@@ -41,7 +41,7 @@ public class CreateRelationshipDialog ex
private static final long serialVersionUID = 1L;
private JTextField nameField;
- private JComboBox typeBox;
+ private JComboBox<ObjectTypeItem> typeBox;
private JTextField sourceIdField;
private JTextField targetIdField;
@@ -56,14 +56,14 @@ public class CreateRelationshipDialog ex
nameField = new JTextField(60);
createRow("Name:", nameField, 0);
- Object[] types = getTypes(BaseTypeId.CMIS_RELATIONSHIP.value());
+ ObjectTypeItem[] types =
getTypes(BaseTypeId.CMIS_RELATIONSHIP.value());
if (types.length == 0) {
JOptionPane.showMessageDialog(this, "No creatable type!",
"Creatable Types", JOptionPane.ERROR_MESSAGE);
thisDialog.dispose();
return;
}
- typeBox = new JComboBox(types);
+ typeBox = new JComboBox<ObjectTypeItem>(types);
typeBox.setSelectedIndex(0);
typeBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java
Thu Apr 30 13:49:56 2015
@@ -45,7 +45,7 @@ public class ExpertLoginTab extends Abst
private static final String CONFIGS_FOLDER = "/configs/";
private static final String CONFIGS_LIBRARY = "config-library.properties";
- private JComboBox configs;
+ private JComboBox<FileEntry> configs;
private JTextArea sessionParameterTextArea;
private List<FileEntry> sessionConfigurations;
@@ -56,7 +56,7 @@ public class ExpertLoginTab extends Abst
private void createGUI() {
setLayout(new BorderLayout());
- setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0, 5, 0,
5)));
URI propFile = null;
@@ -69,7 +69,7 @@ public class ExpertLoginTab extends Abst
sessionConfigurations = ClientHelper.readFileProperties(propFile);
- configs = new JComboBox();
+ configs = new JComboBox<FileEntry>();
configs.setMaximumRowCount(20);
configs.addItem(new FileEntry("", null));
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java
Thu Apr 30 13:49:56 2015
@@ -110,7 +110,7 @@ public class FolderPanel extends JPanel
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
- panel.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
+
panel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(1,
0, 1, 0)));
upButton = new JButton("up");
upButton.setEnabled(false);
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -92,7 +92,7 @@ public class FolderTable extends JTable
for (int i = 0; i < COLUMN_WIDTHS.length; i++) {
TableColumn column = getColumnModel().getColumn(i);
- column.setPreferredWidth(COLUMN_WIDTHS[i]);
+
column.setPreferredWidth(WorkbenchScale.scaleInt(COLUMN_WIDTHS[i]));
}
setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java
Thu Apr 30 13:49:56 2015
@@ -89,7 +89,7 @@ public class InfoDialog extends JDialog
ta.setEditable(false);
ta.setFont(new Font(Font.MONOSPACED, Font.PLAIN,
ta.getFont().getSize()));
JScrollPane readmePane = new JScrollPane(ta);
- readmePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 5, 5));
+
readmePane.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
5, 5, 5)));
add(readmePane);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java
Thu Apr 30 13:49:56 2015
@@ -51,9 +51,9 @@ public class LogFrame extends JFrame {
private void createGUI() {
setTitle(WINDOW_TITLE);
-
+
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- setPreferredSize(new Dimension((int) (screenSize.getWidth() / 2),
(int) (screenSize.getHeight() / 2)));
+ setPreferredSize(new Dimension((int) (screenSize.getWidth() / 2),
(int) (screenSize.getHeight() / 2)));
setMinimumSize(new Dimension(200, 60));
setLayout(new BorderLayout());
@@ -80,7 +80,7 @@ public class LogFrame extends JFrame {
Level.INFO.toString(), Level.WARN.toString(),
Level.ERROR.toString(), Level.FATAL.toString(),
Level.OFF.toString() };
- final JComboBox levelBox = new JComboBox(levels);
+ final JComboBox<String> levelBox = new JComboBox<String>(levels);
levelBox.setSelectedItem(Logger.getRootLogger().getLevel().toString());
levelBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -66,7 +66,7 @@ public class LoginDialog extends JDialog
private ExpertLoginTab expertLoginTab;
private JButton loadRepositoryButton;
private JButton loginButton;
- private JComboBox repositoryBox;
+ private JComboBox<Repository> repositoryBox;
private AbstractLoginTab currentTab;
private boolean canceled = true;
@@ -80,7 +80,7 @@ public class LoginDialog extends JDialog
private void createGUI() {
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- setPreferredSize(new Dimension((int) (screenSize.getWidth() / 2),
(int) (screenSize.getHeight() / 2)));
+ setPreferredSize(new Dimension((int) (screenSize.getWidth() / 2),
(int) (screenSize.getHeight() / 3)));
setMinimumSize(new Dimension(700, 500));
Container pane = getContentPane();
@@ -95,7 +95,7 @@ public class LoginDialog extends JDialog
// repository
JPanel buttonPanel = new JPanel();
buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.PAGE_AXIS));
- buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 5, 5));
+
buttonPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
5, 5, 5)));
add(buttonPanel, BorderLayout.PAGE_END);
loadRepositoryButton = createButton("Load Repositories");
@@ -255,14 +255,14 @@ public class LoginDialog extends JDialog
}
private void createRepositoryBox(Container pane) {
- repositoryBox = new JComboBox();
+ repositoryBox = new JComboBox<Repository>();
- int height = 60;
- height = Math.max(height,
(getFontMetrics(repositoryBox.getFont()).getHeight() * 3)
- + repositoryBox.getInsets().top +
repositoryBox.getInsets().bottom + 6);
+ RepositoryRenderer renderer = new RepositoryRenderer();
+
+ int height = (int) (renderer.getPreferredSize().height * 1.1);
repositoryBox.setEnabled(false);
- repositoryBox.setRenderer(new RepositoryRenderer());
+ repositoryBox.setRenderer(renderer);
repositoryBox.setPreferredSize(new Dimension(Short.MAX_VALUE, height));
repositoryBox.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -303,7 +303,7 @@ public class LoginDialog extends JDialog
return canceled;
}
- static class RepositoryRenderer extends JPanel implements ListCellRenderer
{
+ static class RepositoryRenderer extends JPanel implements
ListCellRenderer<Repository> {
private static final long serialVersionUID = 1L;
private final JLabel nameLabel;
@@ -313,7 +313,7 @@ public class LoginDialog extends JDialog
public RepositoryRenderer() {
super();
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
- setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(3, 3, 3,
3)));
Font labelFont = UIManager.getFont("Label.font");
@@ -326,13 +326,14 @@ public class LoginDialog extends JDialog
descriptionLabel = new JLabel();
add(descriptionLabel);
+
+ setPreferredSize(new Dimension(Short.SIZE,
(getFontMetrics(labelFont).getHeight() * 3)
+ + WorkbenchScale.scaleInt(6)));
}
@Override
- public Component getListCellRendererComponent(JList list, Object
value, int index, boolean isSelected,
- boolean cellHasFocus) {
- Repository repository = (Repository) value;
-
+ public Component getListCellRendererComponent(JList<? extends
Repository> list, Repository value, int index,
+ boolean isSelected, boolean cellHasFocus) {
if (isSelected) {
setBackground(list.getSelectionBackground());
setForeground(list.getSelectionForeground());
@@ -341,14 +342,14 @@ public class LoginDialog extends JDialog
setForeground(list.getForeground());
}
- if (repository == null) {
+ if (value == null) {
nameLabel.setText("");
idLabel.setText("");
descriptionLabel.setText("");
} else {
- nameLabel.setText(repository.getName());
- idLabel.setText(repository.getId());
- descriptionLabel.setText(repository.getDescription());
+ nameLabel.setText(value.getName());
+ idLabel.setText(value.getId());
+ descriptionLabel.setText(value.getDescription());
}
return this;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java
Thu Apr 30 13:49:56 2015
@@ -108,7 +108,7 @@ public class PropertyEditorFrame extends
final JPanel topPanel = new JPanel();
topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.Y_AXIS));
- topPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
topPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
final JLabel nameLabel = new JLabel(object.getName());
nameLabel.setFont(boldFont);
topPanel.add(nameLabel);
@@ -159,7 +159,7 @@ public class PropertyEditorFrame extends
}
JButton updateButton = new JButton("Update");
- updateButton.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
updateButton.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
updateButton.setDefaultCapable(true);
updateButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
@@ -248,7 +248,7 @@ public class PropertyEditorFrame extends
private final PropertyDefinition<?> propDef;
private final Object value;
private final Color bgColor;
- private JComboBox changeBox;
+ private JComboBox<String> changeBox;
private List<JComponent> valueComponents;
public PropertyInputPanel(PropertyDefinition<?> propDef, Object value,
int position) {
@@ -263,8 +263,9 @@ public class PropertyEditorFrame extends
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
setBackground(bgColor);
-
setBorder(BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0,
0, 1, 0, LINE),
- BorderFactory.createEmptyBorder(10, 5, 10, 5)));
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createCompoundBorder(
+
WorkbenchScale.scaleBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, LINE)),
+
WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5)))));
Font labelFont = UIManager.getFont("Label.font");
Font boldFont = labelFont.deriveFont(Font.BOLD,
labelFont.getSize2D() * 1.2f);
@@ -293,7 +294,7 @@ public class PropertyEditorFrame extends
titlePanel.add(namePanel, BorderLayout.LINE_START);
- changeBox = new JComboBox(new Object[] { "Don't change ",
"Update ", "Unset " });
+ changeBox = new JComboBox<String>(new String[] { "Don't change
", "Update ", "Unset " });
titlePanel.add(changeBox, BorderLayout.LINE_END);
valueComponents = new ArrayList<JComponent>();
@@ -575,11 +576,11 @@ public class PropertyEditorFrame extends
/**
* Boolean property.
*/
- public static class BooleanPropertyInputField extends JComboBox implements
PropertyValue {
+ public static class BooleanPropertyInputField extends JComboBox<Boolean>
implements PropertyValue {
private static final long serialVersionUID = 1L;
public BooleanPropertyInputField(final Object value, final
UpdateStatus status, final Color bgColor) {
- super(new Object[] { true, false });
+ super(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
setSelectedItem(value == null ? true : value);
addActionListener(new ActionListener() {
@@ -590,8 +591,8 @@ public class PropertyEditorFrame extends
});
}
- public Object getPropertyValue() {
- return getSelectedItem();
+ public Boolean getPropertyValue() {
+ return (Boolean) getSelectedItem();
}
}
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -195,25 +195,25 @@ public class TckDialog {
final JPanel configPanel = new JPanel();
configPanel.setLayout(new BoxLayout(configPanel,
BoxLayout.PAGE_AXIS));
configPanel.setPreferredSize(new Dimension(getWidth() / 2, 500));
- configPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+
configPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
5, 0, 0)));
- final JComboBox folderComboBox = addComboBox(configPanel, "Test
folder type:",
+ final JComboBox<String> folderComboBox = addComboBox(configPanel,
"Test folder type:",
BaseTypeId.CMIS_FOLDER.value(),
TestParameters.DEFAULT_FOLDER_TYPE_VALUE, true);
configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new
Dimension(1, 10))));
- final JComboBox documentComboBox = addComboBox(configPanel, "Test
document type:",
+ final JComboBox<String> documentComboBox =
addComboBox(configPanel, "Test document type:",
BaseTypeId.CMIS_DOCUMENT.value(),
TestParameters.DEFAULT_DOCUMENT_TYPE_VALUE, true);
configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new
Dimension(1, 10))));
- final JComboBox relationshipComboBox = addComboBox(configPanel,
"Test relationship type:",
+ final JComboBox<String> relationshipComboBox =
addComboBox(configPanel, "Test relationship type:",
BaseTypeId.CMIS_RELATIONSHIP.value(),
TestParameters.DEFAULT_RELATIONSHIP_TYPE_VALUE, true);
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);
+ final JComboBox<String> itemComboBox = addComboBox(configPanel,
"Test item type:",
+ BaseTypeId.CMIS_ITEM.value(),
TestParameters.DEFAULT_ITEM_TYPE_VALUE, true);
configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new
Dimension(1, 10))));
- final JComboBox secondaryComboBox = addComboBox(configPanel, "Test
secondary type:",
+ final JComboBox<String> secondaryComboBox =
addComboBox(configPanel, "Test secondary type:",
BaseTypeId.CMIS_SECONDARY.value(),
TestParameters.DEFAULT_SECONDARY_TYPE_VALUE, false);
configPanel.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new
Dimension(1, 10))));
@@ -228,7 +228,7 @@ public class TckDialog {
add(configPanel);
final JPanel mainPanel = new JPanel(new BorderLayout());
- mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
mainPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
mainPanel.add(new JScrollPane(groupTree), BorderLayout.CENTER);
mainPanel.add(configPanel, BorderLayout.LINE_END);
add(mainPanel, BorderLayout.CENTER);
@@ -277,7 +277,7 @@ public class TckDialog {
final JPanel runButtonPanel = new JPanel();
runButtonPanel.setLayout(new BoxLayout(runButtonPanel,
BoxLayout.PAGE_AXIS));
- runButtonPanel.setBorder(BorderFactory.createEmptyBorder(0, 3, 3,
3));
+
runButtonPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
3, 3, 3)));
runButton.setMaximumSize(new Dimension(Short.MAX_VALUE, height));
runButtonPanel.add(runButton);
@@ -305,7 +305,7 @@ public class TckDialog {
treeModel.nodeChanged((TreeNode) treeModel.getRoot());
}
- private JComboBox addComboBox(JPanel panel, String title, String
rootTypeId, String defaultTypeId,
+ private JComboBox<String> addComboBox(JPanel panel, String title,
String rootTypeId, String defaultTypeId,
boolean creatableOnly) {
final JLabel label = new JLabel(title);
label.setAlignmentX(Component.LEFT_ALIGNMENT);
@@ -319,7 +319,7 @@ public class TckDialog {
typeIds[i++] = type.getId();
}
- final JComboBox comboBox = new JComboBox(typeIds);
+ final JComboBox<String> comboBox = new JComboBox<String>(typeIds);
comboBox.setSelectedItem(defaultTypeId);
comboBox.setAlignmentX(Component.LEFT_ALIGNMENT);
comboBox.setMaximumSize(new Dimension(Short.MAX_VALUE, 10));
@@ -514,7 +514,7 @@ public class TckDialog {
JPanel progressPanel = new JPanel();
progressPanel.setLayout(new BoxLayout(progressPanel,
BoxLayout.Y_AXIS));
- progressPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5,
5));
+
progressPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
progressPanel.add(Box.createRigidArea(new Dimension(0, 10)));
@@ -561,7 +561,7 @@ public class TckDialog {
final JPanel cancelButtonPanel = new JPanel();
cancelButtonPanel.setLayout(new BoxLayout(cancelButtonPanel,
BoxLayout.PAGE_AXIS));
- cancelButtonPanel.setBorder(BorderFactory.createEmptyBorder(0, 3,
3, 3));
+
cancelButtonPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
3, 3, 3)));
cancelButton.setMaximumSize(new Dimension(Short.MAX_VALUE, 30));
cancelButtonPanel.add(cancelButton);
@@ -627,7 +627,7 @@ public class TckDialog {
int x;
sb.append("<html>");
-
+
x = status.get(CmisTestResultStatus.INFO);
if (x > 0) {
sb.append("<font color='#000000'>[Info: " + x + "]</font> ");
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -261,7 +261,7 @@ public class TypeSplitPane extends JSpli
for (int i = 0; i < COLUMN_WIDTHS.length; i++) {
TableColumn column = getColumnModel().getColumn(i);
- column.setPreferredWidth(COLUMN_WIDTHS[i]);
+
column.setPreferredWidth(WorkbenchScale.scaleInt(COLUMN_WIDTHS[i]));
}
setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
Modified:
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=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/WorkbenchScale.java
Thu Apr 30 13:49:56 2015
@@ -28,8 +28,13 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.UIDefaults;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
+import javax.swing.border.MatteBorder;
import javax.swing.plaf.nimbus.NimbusLookAndFeel;
public class WorkbenchScale {
@@ -91,6 +96,27 @@ public class WorkbenchScale {
}
}
+ public static Border scaleBorder(Border border) {
+ if (scale) {
+ if (border instanceof EmptyBorder) {
+ Insets borderInsets = scaleInsets(((EmptyBorder)
border).getBorderInsets());
+ return BorderFactory.createEmptyBorder(borderInsets.top,
borderInsets.left, borderInsets.bottom,
+ borderInsets.right);
+ } else if (border instanceof LineBorder) {
+ return BorderFactory.createLineBorder(((LineBorder)
border).getLineColor(),
+ scaleInt(((LineBorder) border).getThickness()));
+ } else if (border instanceof MatteBorder) {
+ Insets borderInsets = scaleInsets(((MatteBorder)
border).getBorderInsets());
+ return BorderFactory.createMatteBorder(borderInsets.top,
borderInsets.left, borderInsets.bottom,
+ borderInsets.right, ((MatteBorder)
border).getMatteColor());
+ } else {
+ return border;
+ }
+ } else {
+ return border;
+ }
+ }
+
public static ImageIcon scaleIcon(ImageIcon icon) {
if (scale) {
int newWidth = (int) (icon.getIconWidth() * getScaleFactor());
@@ -147,6 +173,11 @@ public class WorkbenchScale {
if (insets != null) {
newDefs.put(key, scaleInsets(insets));
}
+
+ Border border = defs.getBorder(key);
+ if (border != null) {
+ newDefs.put(key, scaleBorder(border));
+ }
}
for (Map.Entry<String, Object> entry : newDefs.entrySet()) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/actions/DeleteTreePanel.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/actions/DeleteTreePanel.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/actions/DeleteTreePanel.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/actions/DeleteTreePanel.java
Thu Apr 30 13:49:56 2015
@@ -35,7 +35,7 @@ public class DeleteTreePanel extends Act
private static final long serialVersionUID = 1L;
private JCheckBox allVersionsBox;
- private JComboBox unfileObjectsBox;
+ private JComboBox<UnfileObject> unfileObjectsBox;
private JCheckBox continueOnFailureBox;
public DeleteTreePanel(ClientModel model) {
@@ -47,8 +47,8 @@ public class DeleteTreePanel extends Act
allVersionsBox = new JCheckBox("delete all versions", true);
addActionComponent(allVersionsBox);
- unfileObjectsBox = new JComboBox(new Object[] { UnfileObject.DELETE,
UnfileObject.DELETESINGLEFILED,
- UnfileObject.UNFILE });
+ unfileObjectsBox = new JComboBox<UnfileObject>(new UnfileObject[] {
UnfileObject.DELETE,
+ UnfileObject.DELETESINGLEFILED, UnfileObject.UNFILE });
unfileObjectsBox.setSelectedIndex(0);
addActionComponent(unfileObjectsBox);
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -138,7 +138,7 @@ public class SwingReport extends Abstrac
final JPanel reportPanel = new JPanel();
reportPanel.add(new JLabel("Open report as "));
- final JComboBox reportType = new JComboBox(new Object[] { "HTML",
"Text", "XML" });
+ final JComboBox<String> reportType = new JComboBox<String>(new
String[] { "HTML", "Text", "XML" });
reportPanel.add(reportType);
final JButton reportButton = new JButton("go");
reportPanel.add(reportButton);
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -37,6 +37,7 @@ import javax.swing.table.TableColumn;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.ObjectId;
import org.apache.chemistry.opencmis.workbench.ClientHelper;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
import org.apache.chemistry.opencmis.workbench.model.ClientModelEvent;
import org.apache.chemistry.opencmis.workbench.model.ObjectListener;
@@ -69,7 +70,7 @@ public abstract class AbstractDetailsTab
for (int i = 0; i < colummnWidths.length; i++) {
TableColumn column = getColumnModel().getColumn(i);
- column.setPreferredWidth(colummnWidths[i]);
+
column.setPreferredWidth(WorkbenchScale.scaleInt(colummnWidths[i]));
}
setRowHeight((int) (getFontMetrics(getFont()).getHeight() * 1.1));
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ActionsPanel.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/ActionsPanel.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ActionsPanel.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ActionsPanel.java
Thu Apr 30 13:49:56 2015
@@ -24,6 +24,7 @@ import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
import org.apache.chemistry.opencmis.workbench.actions.AclUpdatePanel;
import org.apache.chemistry.opencmis.workbench.actions.AddObjectToFolderPanel;
import
org.apache.chemistry.opencmis.workbench.actions.AppendContentStreamPanel;
@@ -134,7 +135,7 @@ public class ActionsPanel extends JPanel
private void createGUI() {
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
- setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5, 5, 5,
5)));
propertyUpdatePanel = new PropertyUpdatePanel(model);
add(propertyUpdatePanel);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ExtensionsPanel.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/ExtensionsPanel.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ExtensionsPanel.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ExtensionsPanel.java
Thu Apr 30 13:49:56 2015
@@ -37,6 +37,7 @@ import javax.swing.tree.TreeSelectionMod
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.commons.data.CmisExtensionElement;
import org.apache.chemistry.opencmis.commons.enums.ExtensionLevel;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
import org.apache.chemistry.opencmis.workbench.model.ClientModelEvent;
import org.apache.chemistry.opencmis.workbench.model.ObjectListener;
@@ -135,18 +136,18 @@ public class ExtensionsPanel extends JPa
private void createGUI() {
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
- setBorder(BorderFactory.createEmptyBorder());
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder()));
setBackground(Color.WHITE);
extensionsTree = new JTree();
extensionsTree.setRootVisible(false);
extensionsTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
- extensionsTree.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
extensionsTree.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)));
extensionsTree.setModel(new DefaultTreeModel(null));
JScrollPane pane = new JScrollPane(extensionsTree);
- pane.setBorder(BorderFactory.createEmptyBorder());
+
pane.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder()));
add(pane);
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ObjectPanel.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/ObjectPanel.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ObjectPanel.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/details/ObjectPanel.java
Thu Apr 30 13:49:56 2015
@@ -58,6 +58,7 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.commons.SessionParameter;
import org.apache.chemistry.opencmis.tck.CmisTestGroup;
import org.apache.chemistry.opencmis.workbench.ClientHelper;
+import org.apache.chemistry.opencmis.workbench.WorkbenchScale;
import
org.apache.chemistry.opencmis.workbench.checks.ObjectComplianceTestGroup;
import org.apache.chemistry.opencmis.workbench.checks.SwingReport;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
@@ -282,7 +283,7 @@ public class ObjectPanel extends InfoPan
scriptOutput = new JTextArea(null, 1, 80);
scriptOutput.setEditable(false);
scriptOutput.setFont(Font.decode("Monospaced"));
- scriptOutput.setBorder(BorderFactory.createTitledBorder(""));
+
scriptOutput.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createTitledBorder("")));
scriptOutputWriter = new JTextAreaWriter(scriptOutput);
scriptPanel.add(scriptOutput, BorderLayout.CENTER);
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -83,10 +83,11 @@ public abstract class ActionPanel extend
setLayout(borderLayout);
setBackground(Color.WHITE);
- setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createEmptyBorder(5, 5, 5, 5),
-
BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(Color.GRAY,
2),
- BorderFactory.createEmptyBorder(5, 5, 5, 5))));
+
setBorder(WorkbenchScale.scaleBorder(BorderFactory.createCompoundBorder(
+ WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5,
5, 5, 5)),
+ WorkbenchScale.scaleBorder(BorderFactory.createCompoundBorder(
+
WorkbenchScale.scaleBorder(BorderFactory.createLineBorder(Color.GRAY, 2)),
+
WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)))))));
Font labelFont = UIManager.getFont("Label.font");
Font boldFont = labelFont.deriveFont(Font.BOLD, labelFont.getSize2D()
* 1.2f);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.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/CreateDialog.java?rev=1676986&r1=1676985&r2=1676986&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.java
Thu Apr 30 13:49:56 2015
@@ -41,6 +41,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.PropertyType;
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 CreateDialog extends JDialog {
@@ -59,14 +60,14 @@ public abstract class CreateDialog exten
setLayout(new BorderLayout());
panel = new JPanel(new GridBagLayout());
- panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
panel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(10,
10, 10, 10)));
add(panel, BorderLayout.CENTER);
mandatoryProperties = new HashMap<String, JComponent>();
mandatoryPropertiesPanel = new JPanel(new GridBagLayout());
- mandatoryPropertiesPanel
-
.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,
0, 0, 0),
- BorderFactory.createTitledBorder("Mandatory
properties")));
+
mandatoryPropertiesPanel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createCompoundBorder(
+ WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(10,
0, 0, 0)),
+
WorkbenchScale.scaleBorder(BorderFactory.createTitledBorder("Mandatory
properties")))));
actionPanel = new JPanel();
createRow(actionPanel, 10);
@@ -119,10 +120,10 @@ public abstract class CreateDialog exten
setVisible(true);
}
- protected final Object[] getTypes(String rootTypeId) {
+ protected final ObjectTypeItem[] getTypes(String rootTypeId) {
List<ObjectType> types = model.getTypesAsList(rootTypeId, true);
- Object[] result = new Object[types.size()];
+ ObjectTypeItem[] result = new ObjectTypeItem[types.size()];
int i = 0;
for (final ObjectType type : types) {
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=1676986&r1=1676985&r2=1676986&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
Thu Apr 30 13:49:56 2015
@@ -115,7 +115,7 @@ public abstract class InfoPanel extends
protected JTextField addLine(final String label, final boolean bold,
JTextField textField) {
textField.setEditable(false);
- textField.setBorder(BorderFactory.createEmptyBorder());
+
textField.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder()));
if (bold) {
textField.setFont(boldFont);
}
@@ -171,7 +171,7 @@ public abstract class InfoPanel extends
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
- panel.setBorder(BorderFactory.createEmptyBorder());
+
panel.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder()));
panel.setOpaque(false);
panel.add(comp);
textLable.setLabelFor(panel);
@@ -211,7 +211,7 @@ public abstract class InfoPanel extends
for (Object o : list) {
JTextField textField = new JTextField(o == null ? "" :
o.toString());
textField.setEditable(false);
- textField.setBorder(BorderFactory.createEmptyBorder(0, 0, 2,
0));
+
textField.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(0,
0, 2, 0)));
add(textField);
}
}
