diff options
Diffstat (limited to 'BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java')
| -rw-r--r-- | BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java | 183 |
1 files changed, 5 insertions, 178 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java index e323d195..3d47e1cd 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java @@ -114,11 +114,6 @@ public class SimpleGUI implements BKUGUIFacade { /** remember the pinfield to return to worker */ protected JPasswordField pinField; -// protected JButton okButton; -// protected JButton cancelButton; -// protected JButton signButton; -// protected JButton saveButton; -// protected JButton backButton; protected int buttonSize; private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width; @@ -255,16 +250,13 @@ public class SimpleGUI implements BKUGUIFacade { GroupLayout contentPanelLayout = new GroupLayout(contentPanel); contentPanel.setLayout(contentPanelLayout); -// contentPanelLayout.setHorizontalGroup( -// contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) -// .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) -// .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) -// .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //)); + contentPanelLayout.setHorizontalGroup( contentPanelLayout.createSequentialGroup() .addContainerGap() .addGroup( contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) +// .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()); @@ -306,7 +298,6 @@ public class SimpleGUI implements BKUGUIFacade { mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(waitMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) @@ -336,18 +327,16 @@ public class SimpleGUI implements BKUGUIFacade { JLabel welcomeMsgLabel = new JLabel(); welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD)); - welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); //MESSAGE_WAIT)); + welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(welcomeMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(welcomeMsgLabel)); contentPanel.validate(); @@ -382,11 +371,9 @@ public class SimpleGUI implements BKUGUIFacade { mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(insertCardMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(insertCardMsgLabel)); // JButton cancelButton = new JButton(); @@ -434,18 +421,16 @@ public class SimpleGUI implements BKUGUIFacade { JLabel insertCardMsgLabel = new JLabel(); insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD)); - insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); //MESSAGE_INSERTCARD)); + insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(insertCardMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(insertCardMsgLabel)); // JButton cancelButton = new JButton(); @@ -507,7 +492,6 @@ public class SimpleGUI implements BKUGUIFacade { String pinLabel = messages.getString(LABEL_PIN); cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()})); -// JPasswordField cardPINField = new JPasswordField(); pinField = new JPasswordField(); pinField.setText(""); pinField.setDocument(new PINDocument(pinSpec, okButton)); @@ -535,36 +519,6 @@ public class SimpleGUI implements BKUGUIFacade { infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)})); infoLabel.setForeground(ERROR_COLOR); } - -// GroupLayout mainPanelLayout = new GroupLayout(mainPanel); -// mainPanel.setLayout(mainPanelLayout); -// -// mainPanelLayout.setHorizontalGroup( -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) -// .addGroup(mainPanelLayout.createSequentialGroup() // .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) -// // .addComponent(hashDataLabel) -// // .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup() -// .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED) -// .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING) -// .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE) -// .addComponent(pinField, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)) //)) -// .addContainerGap())); -// -// mainPanelLayout.setVerticalGroup( -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() // .addComponent(hashDataLabel).addGap(14, 14, 14) -// .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false) -// .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE) -// .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) -// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10))); -// -// GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel); -// buttonPanel.setLayout(buttonPanelLayout); -// -// buttonPanelLayout.setHorizontalGroup( -// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap())); -// buttonPanelLayout.setVerticalGroup( -// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton))); - GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); @@ -586,7 +540,6 @@ public class SimpleGUI implements BKUGUIFacade { .addComponent(pinField)) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) .addComponent(infoLabel)); -// .addGap(signPinLabel.getFont().getSize())); GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel); buttonPanel.setLayout(buttonPanelLayout); @@ -742,7 +695,6 @@ public class SimpleGUI implements BKUGUIFacade { .addComponent(pinField)) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) .addComponent(infoLabel)); -// .addGap(signPinLabel.getFont().getSize())); GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel); buttonPanel.setLayout(buttonPanelLayout); @@ -772,49 +724,7 @@ public class SimpleGUI implements BKUGUIFacade { pinField.requestFocusInWindow(); contentPanel.validate(); - }// private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) { -// ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING); -// mainGroup.addComponent(hashDataLabel); -// if (errorLabel != null) { -// mainGroup.addComponent(errorLabel); -// } -// mainGroup.addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup() -// .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) -// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) -// .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING) -// .addComponent(pinSizeLabel) -// .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))); -// return mainGroup; -// } -// private GroupLayout.SequentialGroup createVerticalMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) { -// GroupLayout.SequentialGroup mainGroup = mainPanelLayout.createSequentialGroup(); -// mainGroup.addComponent(hashDataLabel) -// .addGap(hashDataLabel.getFont().getSize()); //14, 14, 14) -// -// if (errorLabel != null) { -// mainGroup.addComponent(errorLabel) -// .addGap(errorLabel.getFont().getSize()); -// } -// mainGroup.addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false) -// .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE) -// .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) -// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) -// .addComponent(pinSizeLabel) -// .addGap(signPinLabel.getFont().getSize()); -// -// return mainGroup; -//// mainPanelLayout.createSequentialGroup() -//// .addComponent(hashDataLabel) -//// .addGap(hashDataLabel.getFont().getSize()) //14, 14, 14) -//// .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false) -//// .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE) -//// .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) -//// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) -//// .addComponent(pinSizeLabel) -//// .addGap(signPinLabel.getFont().getSize()) -//// -//// -// } + } }); } @@ -848,11 +758,9 @@ public class SimpleGUI implements BKUGUIFacade { mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(errorMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(errorMsgLabel)); JButton okButton = new JButton(); @@ -907,11 +815,9 @@ public class SimpleGUI implements BKUGUIFacade { mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(errorMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(errorMsgLabel)); contentPanel.validate(); @@ -949,11 +855,9 @@ public class SimpleGUI implements BKUGUIFacade { mainPanelLayout.setHorizontalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(waitMsgLabel)); mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() -// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(waitMsgLabel)); contentPanel.validate(); @@ -978,8 +882,6 @@ public class SimpleGUI implements BKUGUIFacade { if (signedReferences.size() == 1) { -// final HashDataInput signedRef = signedReferences.get(0); - if ("text/plain".equals(signedReferences.get(0).getMimeType())) { ActionListener saveHashDataListener = new ActionListener() { @@ -1062,15 +964,6 @@ public class SimpleGUI implements BKUGUIFacade { .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE)); - // GroupLayout mainPanelLayout = new GroupLayout(mainPanel); - // mainPanel.setLayout(mainPanelLayout); - // - // mainPanelLayout.setHorizontalGroup( - // mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap())); - // - // mainPanelLayout.setVerticalGroup( - // mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize()))); - JButton backButton = new JButton(); backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD)); backButton.setText(messages.getString(BUTTON_BACK)); @@ -1107,15 +1000,6 @@ public class SimpleGUI implements BKUGUIFacade { // .addComponent(saveButton) // .addComponent(backButton)); - - // GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel); - // buttonPanel.setLayout(buttonPanelLayout); - // - // buttonPanelLayout.setHorizontalGroup( - // buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap())); - // buttonPanelLayout.setVerticalGroup( - // buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton))); - contentPanel.validate(); } }); @@ -1169,61 +1053,6 @@ public class SimpleGUI implements BKUGUIFacade { .addComponent(refIdLabel) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3)); - // .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)); - - - - // - // GroupLayout mainPanelLayout = new GroupLayout(mainPanel); - // mainPanel.setLayout(mainPanelLayout); - // - // mainPanelLayout.setHorizontalGroup( - // mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - // .addGroup(mainPanelLayout.createSequentialGroup() - // .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - // .addComponent(refIdLabel) - // .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)) - // .addContainerGap())); - // - // mainPanelLayout.setVerticalGroup( - // mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - // .addGroup(mainPanelLayout.createSequentialGroup() - // .addComponent(refIdLabel) - // .addGap(refIdLabel.getFont().getSize()) - // .addComponent(hashDataScrollPane) - // .addGap(refIdLabel.getFont().getSize()))); - - - - - - - - - - - - - // GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel); - // buttonPanel.setLayout(buttonPanelLayout); - // - // buttonPanelLayout.setHorizontalGroup( - // buttonPanelLayout.createSequentialGroup() - //// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - //// .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup() - // .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - // .addComponent(saveButton) - // .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - // .addComponent(cancelButton) - // .addContainerGap()); //); - // buttonPanelLayout.setVerticalGroup( - // buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - // .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup() - // .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) - // .addComponent(saveButton) - // .addComponent(cancelButton)) - // .addContainerGap())); - JButton backButton = new JButton(); backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD)); @@ -1266,8 +1095,6 @@ public class SimpleGUI implements BKUGUIFacade { } }); } - -// private DisposableFileChooser fileDialog; private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) { |