X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=61b2f24f4ae36b19eee8028cd73bd78eda8db363;hb=f4b18ae31d37e694b59875f26e0863179de248f1;hp=ddef7a4fd4376673eb7f613f0fae3c9b0586250a;hpb=9495cd9a452073db15529f4844dc9888a6847d00;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index ddef7a4..61b2f24 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -43,7 +43,10 @@ import java.util.List; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; +import javax.swing.BoxLayout; import javax.swing.ButtonGroup; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -54,6 +57,7 @@ import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JRadioButton; import javax.swing.JScrollPane; +import javax.swing.JSlider; import javax.swing.JSpinner; import javax.swing.JTabbedPane; import javax.swing.JTable; @@ -75,6 +79,8 @@ import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import jalview.bin.Cache; +import jalview.bin.Console; +import jalview.bin.MemorySetting; import jalview.fts.core.FTSDataColumnPreferences; import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; import jalview.fts.service.pdb.PDBFTSRestClient; @@ -87,8 +93,10 @@ import jalview.io.BackupFilenameParts; import jalview.io.BackupFiles; import jalview.io.BackupFilesPresetEntry; import jalview.io.IntKeyStringValueEntry; +import jalview.util.BrowserLauncher; import jalview.util.MessageManager; import jalview.util.Platform; +import jalview.util.StringUtils; /** * Base class for the Preferences panel. @@ -175,8 +183,6 @@ public class GPreferences extends JPanel protected JCheckBox structFromPdb = new JCheckBox(); - protected JCheckBox useRnaView = new JCheckBox(); - protected JCheckBox addSecondaryStructure = new JCheckBox(); protected JCheckBox addTempFactor = new JCheckBox(); @@ -266,7 +272,7 @@ public class GPreferences extends JPanel protected JPasswordField proxyAuthPasswordPB = new JPasswordField(); - protected JTextField defaultBrowser = new JTextField(); + protected JComboBox defaultBrowser = new JComboBox(); protected ButtonGroup proxyType = new ButtonGroup(); @@ -381,6 +387,30 @@ public class GPreferences extends JPanel private JLabel messageLabel = new JLabel("", JLabel.CENTER); + /* + * Startup tab components + */ + + protected JCheckBox customiseMemorySetting = new JCheckBox(); + + protected JLabel exampleMemoryLabel = new JLabel(); + + protected JTextArea exampleMemoryMessageTextArea = new JTextArea(); + + protected JLabel maxMemoryLabel = new JLabel(); + + protected JLabel jvmMemoryPercentLabel = new JLabel(); + + protected JSlider jvmMemoryPercentSlider = new JSlider(); + + protected JLabel jvmMemoryPercentDisplay = new JLabel(); + + protected JLabel jvmMemoryMaxLabel = new JLabel(); + + protected JTextField jvmMemoryMaxTextField = new JTextField(null, 8); + + protected JComboBox lafCombo = new JComboBox<>(); + /** * Creates a new GPreferences object. */ @@ -427,11 +457,11 @@ public class GPreferences extends JPanel tabbedPane.add(initConnectionsTab(), MessageManager.getString("label.connections")); - if (!Platform.isJS()) - { - tabbedPane.add(initBackupsTab(), - MessageManager.getString("label.backups")); - } + if (!Platform.isJS()) + { + tabbedPane.add(initBackupsTab(), + MessageManager.getString("label.backups")); + } tabbedPane.add(initLinksTab(), MessageManager.getString("label.urllinks")); @@ -442,6 +472,9 @@ public class GPreferences extends JPanel tabbedPane.add(initEditingTab(), MessageManager.getString("label.editing")); + tabbedPane.add(initStartupTab(), + MessageManager.getString("label.startup")); + /* * See WsPreferences for the real work of configuring this tab. */ @@ -510,9 +543,12 @@ public class GPreferences extends JPanel } } - public final static int CONNECTIONS_TAB = 5; + public static enum TabRef + { + CONNECTIONS_TAB, STRUCTURE_TAB + }; - public void selectTab(int selectTab) + public void selectTab(TabRef selectTab) { // select a given tab - currently only for Connections switch (selectTab) @@ -520,6 +556,9 @@ public class GPreferences extends JPanel case CONNECTIONS_TAB: tabbedPane.setSelectedComponent(connectTab); break; + case STRUCTURE_TAB: + tabbedPane.setSelectedComponent(structureTab); + break; default: } } @@ -709,12 +748,12 @@ public class GPreferences extends JPanel browserLabel.setFont(LABEL_FONT); browserLabel.setHorizontalAlignment(SwingConstants.TRAILING); browserLabel.setText( - MessageManager.getString("label.default_browser_unix")); + MessageManager.getString("label.default_browser_unix_windows")); defaultBrowser.setFont(LABEL_FONT); - defaultBrowser.setText(""); final String tooltip = JvSwingUtils.wrapTooltip(true, MessageManager.getString("label.double_click_to_browse")); defaultBrowser.setToolTipText(tooltip); + /* defaultBrowser.addMouseListener(new MouseAdapter() { @Override @@ -726,6 +765,7 @@ public class GPreferences extends JPanel } } }); + */ JPanel proxyPanel = initConnTabProxyPanel(); initConnTabCheckboxes(); @@ -736,7 +776,15 @@ public class GPreferences extends JPanel GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 0, 5, 5), 5, 1)); defaultBrowser.setFont(LABEL_FONT); - defaultBrowser.setText(""); + + ComboBoxModel cbModel = new DefaultComboBoxModel( + BrowserLauncher.getInstance().getBrowserList().toArray()); + String browserPref = Cache.getProperty("DEFAULT_BROWSER"); + if (browserPref != null) + { + cbModel.setSelectedItem(browserPref); + } + defaultBrowser.setModel(cbModel); connectTab.add(defaultBrowser, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, @@ -990,6 +1038,33 @@ public class GPreferences extends JPanel proxyPortHttpsTB.setColumns(4); proxyAuthUsernameTB.setFont(LABEL_FONT); proxyAuthUsernameTB.setColumns(30); + + // check for any change to enable applyProxyButton + DocumentListener d = new DocumentListener() + { + @Override + public void changedUpdate(DocumentEvent e) + { + applyProxyButtonEnabled(true); + } + + @Override + public void insertUpdate(DocumentEvent e) + { + applyProxyButtonEnabled(true); + } + + @Override + public void removeUpdate(DocumentEvent e) + { + applyProxyButtonEnabled(true); + } + }; + proxyServerHttpTB.getDocument().addDocumentListener(d); + proxyPortHttpTB.getDocument().addDocumentListener(d); + proxyServerHttpsTB.getDocument().addDocumentListener(d); + proxyPortHttpsTB.getDocument().addDocumentListener(d); + proxyAuthUsernameTB.getDocument().addDocumentListener(d); proxyAuthPasswordPB.setFont(LABEL_FONT); proxyAuthPasswordPB.setColumns(30); proxyAuthPasswordPB.getDocument() @@ -998,19 +1073,22 @@ public class GPreferences extends JPanel @Override public void changedUpdate(DocumentEvent e) { - proxyAuthPasswordHighlight(true); + proxyAuthPasswordCheckHighlight(true); + applyProxyButtonEnabled(true); } @Override public void insertUpdate(DocumentEvent e) { - proxyAuthPasswordHighlight(true); + proxyAuthPasswordCheckHighlight(true); + applyProxyButtonEnabled(true); } @Override public void removeUpdate(DocumentEvent e) { - proxyAuthPasswordHighlight(true); + proxyAuthPasswordCheckHighlight(true); + applyProxyButtonEnabled(true); } }); @@ -1175,45 +1253,56 @@ public class GPreferences extends JPanel gbc.gridy++; proxyPanel.add(hpPanel, gbc); - // Require authentication checkbox - gbc.gridy++; - proxyPanel.add(proxyAuth, gbc); - - // username and password - JPanel upPanel = new JPanel(); - upPanel.setLayout(new GridBagLayout()); - // username row - c.gridy = 0; - c.gridx = 0; - c.gridwidth = 1; - c.weightx = 0.4; - c.anchor = GridBagConstraints.LINE_END; - upPanel.add(proxyAuthUsernameLabel, c); - - c.gridx++; - c.weightx = 1.0; - c.anchor = GridBagConstraints.LINE_START; - upPanel.add(proxyAuthUsernameTB, c); - - // password row - c.gridy++; - c.gridx = 0; - c.weightx = 0.4; - c.anchor = GridBagConstraints.LINE_END; - upPanel.add(proxyAuthPasswordLabel, c); - - c.gridx++; - c.weightx = 1.0; - c.anchor = GridBagConstraints.LINE_START; - upPanel.add(proxyAuthPasswordPB, c); - - c.gridx++; - c.weightx = 0.4; - c.anchor = GridBagConstraints.LINE_START; - upPanel.add(passwordNotStoredLabel, c); - - gbc.gridy++; - proxyPanel.add(upPanel, gbc); + if (!Platform.isJS()) + /** + * java.net.Authenticator is not implemented in SwingJS. Not displaying the + * Authentication options in Preferences. + * + * @j2sIgnore + * + */ + { + // Require authentication checkbox + gbc.gridy++; + proxyPanel.add(proxyAuth, gbc); + + // username and password + JPanel upPanel = new JPanel(); + upPanel.setLayout(new GridBagLayout()); + // username row + c.gridy = 0; + c.gridx = 0; + c.gridwidth = 1; + c.weightx = 0.4; + c.anchor = GridBagConstraints.LINE_END; + upPanel.add(proxyAuthUsernameLabel, c); + + c.gridx++; + c.weightx = 1.0; + c.anchor = GridBagConstraints.LINE_START; + upPanel.add(proxyAuthUsernameTB, c); + + // password row + c.gridy++; + c.gridx = 0; + c.weightx = 0.4; + c.anchor = GridBagConstraints.LINE_END; + upPanel.add(proxyAuthPasswordLabel, c); + + c.gridx++; + c.weightx = 1.0; + c.anchor = GridBagConstraints.LINE_START; + upPanel.add(proxyAuthPasswordPB, c); + + c.gridx++; + c.weightx = 0.4; + c.anchor = GridBagConstraints.LINE_START; + upPanel.add(passwordNotStoredLabel, c); + + gbc.gridy++; + proxyPanel.add(upPanel, gbc); + + } // end j2sIgnore applyProxyButton.setText(MessageManager.getString("action.apply")); applyProxyButton.addActionListener(new ActionListener() @@ -1222,6 +1311,7 @@ public class GPreferences extends JPanel public void actionPerformed(ActionEvent e) { saveProxySettings(); + applyProxyButton.setEnabled(false); } }); gbc.gridy++; @@ -1232,15 +1322,21 @@ public class GPreferences extends JPanel return proxyPanel; } - public void proxyAuthPasswordHighlight(boolean enabled) + public void proxyAuthPasswordCheckHighlight(boolean enabled) + { + proxyAuthPasswordCheckHighlight(enabled, false); + } + + public void proxyAuthPasswordCheckHighlight(boolean enabled, + boolean grabFocus) { if (enabled && proxyType.isSelected(customProxy.getModel()) && proxyAuth.isSelected() && !proxyAuthUsernameTB.getText().isEmpty() && proxyAuthPasswordPB.getDocument().getLength() == 0) { - - proxyAuthPasswordPB.grabFocus(); + if (grabFocus) + proxyAuthPasswordPB.grabFocus(); proxyAuthPasswordPB.setBackground(Color.PINK); } else @@ -1249,6 +1345,11 @@ public class GPreferences extends JPanel } } + public void applyProxyButtonEnabled(boolean enabled) + { + applyProxyButton.setEnabled(enabled); + } + public void saveProxySettings() { // overridden in Preferences @@ -1593,7 +1694,6 @@ public class GPreferences extends JPanel { boolean selected = structFromPdb.isSelected(); // enable other options only when the first is checked - useRnaView.setEnabled(selected); addSecondaryStructure.setEnabled(selected); addTempFactor.setEnabled(selected); } @@ -1602,12 +1702,6 @@ public class GPreferences extends JPanel // indent checkboxes that are conditional on the first one ypos += lineSpacing; - useRnaView.setFont(LABEL_FONT); - useRnaView.setText(MessageManager.getString("label.use_rnaview")); - useRnaView.setBounds(new Rectangle(25, ypos, width, height)); - structureTab.add(useRnaView); - - ypos += lineSpacing; addSecondaryStructure.setFont(LABEL_FONT); addSecondaryStructure .setText(MessageManager.getString("label.autoadd_secstr")); @@ -1651,11 +1745,13 @@ public class GPreferences extends JPanel ypos += lineSpacing; structureViewerPathLabel = new JLabel(); - structureViewerPathLabel.setFont(LABEL_FONT);// new Font("SansSerif", 0, 11)); + structureViewerPathLabel.setFont(LABEL_FONT);// new Font("SansSerif", 0, + // 11)); structureViewerPathLabel.setHorizontalAlignment(SwingConstants.LEFT); structureViewerPathLabel.setText(MessageManager .formatMessage("label.viewer_path", "Chimera(X)")); - structureViewerPathLabel.setBounds(new Rectangle(10, ypos, 170, height)); + structureViewerPathLabel + .setBounds(new Rectangle(10, ypos, 170, height)); structureViewerPathLabel.setEnabled(false); structureTab.add(structureViewerPathLabel); @@ -1713,14 +1809,14 @@ public class GPreferences extends JPanel /* * hide Chimera options in JalviewJS */ - if (Platform.isJS()) + if (Platform.isJS()) { structureViewerPathLabel.setVisible(false); structureViewerPath.setVisible(false); viewerLabel.setVisible(false); structViewer.setVisible(false); } - + return structureTab; } @@ -1744,6 +1840,14 @@ public class GPreferences extends JPanel String choice = null; JFileChooser chooser = new JFileChooser(); + // Enable appBundleIsTraversable in macOS FileChooser to allow selecting + // hidden executables within .app dirs + if (Platform.isMac()) + { + chooser.putClientProperty("JFileChooser.appBundleIsTraversable", + true); + } + // chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle( MessageManager.getString("label.open_local_file")); @@ -2097,13 +2201,13 @@ public class GPreferences extends JPanel visualTab.add(fontNameCB); visualTab.add(fontSizeCB); visualTab.add(fontStyleCB); - + if (Platform.isJS()) { startupCheckbox.setVisible(false); startupFileTextfield.setVisible(false); } - + return visualTab; } @@ -2115,8 +2219,8 @@ public class GPreferences extends JPanel { BackupFilesPresetEntry savedPreset = BackupFilesPresetEntry .getSavedBackupEntry(); - enableBackupFiles - .setSelected(Cache.getDefault(BackupFiles.ENABLED, !Platform.isJS())); + enableBackupFiles.setSelected( + Cache.getDefault(BackupFiles.ENABLED, !Platform.isJS())); BackupFilesPresetEntry backupfilesCustomEntry = BackupFilesPresetEntry .createBackupFilesPresetEntry(Cache @@ -2140,6 +2244,19 @@ public class GPreferences extends JPanel updateBackupFilesExampleLabel(); } + /* + * Load the saved Memory settings + */ + protected void loadLastSavedMemorySettings() + { + customiseMemorySetting.setSelected( + Cache.getDefault(MemorySetting.CUSTOMISED_SETTINGS, false)); + jvmMemoryPercentSlider + .setValue(Cache.getDefault(MemorySetting.MEMORY_JVMMEMPC, 90)); + jvmMemoryMaxTextField.setText( + Cache.getDefault(MemorySetting.MEMORY_JVMMEMMAX, "32g")); + } + private boolean warnAboutSuffixReverseChange() { BackupFilesPresetEntry bfpe = BackupFilesPresetEntry @@ -2157,6 +2274,285 @@ public class GPreferences extends JPanel && nowSuffixTemplate.equals(savedSuffixTemplate); } + /* Initialises the Startup tabbed panel. + * + * @return + * */ + + private JPanel initStartupTab() + { + JPanel startupTab = new JPanel(); + startupTab.setBorder( + new TitledBorder(MessageManager.getString("label.memory"))); + startupTab.setLayout(new GridBagLayout()); + + GridBagConstraints gbc = new GridBagConstraints(); + gbc.weightx = 0.0; + gbc.weighty = 0.0; + gbc.anchor = GridBagConstraints.FIRST_LINE_START; + gbc.fill = GridBagConstraints.NONE; + + initMemoryPanel(); + + gbc.gridheight = 1; + gbc.gridwidth = 3; + + gbc.gridy = 0; // row 1 + gbc.gridx = 0; + JLabel memoryText = new JLabel(); + memoryText.setFont(LABEL_FONT_ITALIC); + memoryText + .setText(MessageManager.getString("label.memory_setting_text")); + startupTab.add(memoryText, gbc); + + gbc.gridy++; // row 2 + gbc.gridx = 0; + JPanel exampleMemoryPanel = new JPanel(); + exampleMemoryPanel + .setLayout(new BoxLayout(exampleMemoryPanel, BoxLayout.Y_AXIS)); + exampleMemoryPanel.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.memory_example_tooltip"))); + JLabel exampleTextLabel = new JLabel(); + exampleTextLabel + .setText(MessageManager.getString("label.memory_example_text")); + exampleTextLabel.setForeground(Color.GRAY); + exampleTextLabel.setFont(LABEL_FONT); + exampleMemoryPanel.add(exampleTextLabel); + exampleMemoryPanel.add(exampleMemoryLabel); + exampleMemoryPanel.setBackground(Color.WHITE); + exampleMemoryPanel.setBorder(BorderFactory.createEtchedBorder()); + startupTab.add(exampleMemoryPanel, gbc); + + gbc.gridy++; // row 3 + gbc.gridx = 0; + startupTab.add(customiseMemorySetting, gbc); + + gbc.gridy += 2; // row 4 with a gap + gbc.gridx = 0; + startupTab.add(maxMemoryLabel, gbc); + + gbc.gridy += 2; // row 5 + gbc.gridx = 0; + gbc.gridwidth = 1; + startupTab.add(jvmMemoryPercentLabel, gbc); + gbc.gridx++; + startupTab.add(jvmMemoryPercentSlider, gbc); + gbc.gridx++; + // gbc.weightx = 0.1; + startupTab.add(jvmMemoryPercentDisplay, gbc); + // gbc.weightx = 1.0; + gbc.gridwidth = 3; + + gbc.gridy++; // row 6 + gbc.gridx = 0; + startupTab.add(jvmMemoryMaxLabel, gbc); + gbc.gridx++; + startupTab.add(jvmMemoryMaxTextField, gbc); + + gbc.gridy++; // row 7 + gbc.gridx = 0; + gbc.gridwidth = 4; + exampleMemoryMessageTextArea.setBackground(startupTab.getBackground()); + JScrollPane sp = new JScrollPane(exampleMemoryMessageTextArea); + sp.setBorder(BorderFactory.createEmptyBorder()); + sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + startupTab.add(sp, gbc); + + // fill empty space to push widget to top left + gbc.gridy++; + gbc.weighty = 1.0; + gbc.gridx = 100; + gbc.gridwidth = 1; + gbc.weightx = 1.0; + startupTab.add(new JPanel(), gbc); + + setMemoryPercentDisplay(); + memoryOptionsSetEnabled(); + return startupTab; + } + + private void initMemoryPanel() + { + // Enable memory settings checkbox + customiseMemorySetting.setFont(LABEL_FONT_BOLD); + customiseMemorySetting.setText( + MessageManager.getString("label.customise_memory_settings")); + customiseMemorySetting.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + memoryOptionsSetEnabled(); + } + }); + + loadLastSavedMemorySettings(); + + exampleMemoryLabel.setFont(LABEL_FONT_BOLD); + exampleMemoryLabel.setBackground(Color.WHITE); + + maxMemoryLabel = new JLabel( + MessageManager.getString("label.maximum_memory_used")); + maxMemoryLabel.setFont(LABEL_FONT_BOLD); + + // Maximum memory percentage slider + jvmMemoryPercentLabel.setFont(LABEL_FONT); + jvmMemoryPercentLabel.setText( + MessageManager.getString("label.percent_of_physical_memory")); + jvmMemoryPercentSlider.setPaintLabels(true); + jvmMemoryPercentSlider.setPaintTicks(true); + jvmMemoryPercentSlider.setPaintTrack(true); + jvmMemoryPercentSlider.setMajorTickSpacing(50); + jvmMemoryPercentSlider.setMinorTickSpacing(10); + jvmMemoryPercentSlider.addChangeListener(new ChangeListener() + { + @Override + public void stateChanged(ChangeEvent e) + { + setMemoryPercentDisplay(); + } + }); + jvmMemoryPercentDisplay.setFont(LABEL_FONT); + setMemoryPercentDisplay(); + + // Maximum memory cap textbox + jvmMemoryMaxLabel.setFont(LABEL_FONT); + jvmMemoryMaxLabel + .setText(MessageManager.getString("label.maximum_memory")); + initMemoryMaxTextField(); + + exampleMemoryMessageTextArea.setFont(LABEL_FONT_ITALIC); + exampleMemoryMessageTextArea.setForeground(Color.GRAY); + exampleMemoryMessageTextArea.setEditable(false); + exampleMemoryMessageTextArea.setLineWrap(true); + exampleMemoryMessageTextArea.setWrapStyleWord(true); + exampleMemoryMessageTextArea.setText(" "); + exampleMemoryMessageTextArea.setRows(2); + exampleMemoryMessageTextArea.setColumns(40); + + setExampleMemoryLabel(); + } + + private void initMemoryMaxTextField() + { + jvmMemoryMaxTextField.setToolTipText( + MessageManager.getString("label.maximum_memory_tooltip")); + jvmMemoryMaxTextField.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent arg0) + { + validateMemoryMaxTextField(); + setExampleMemoryLabel(); + } + }); + + jvmMemoryMaxTextField.addKeyListener(new KeyListener() + { + @Override + public void keyReleased(KeyEvent e) + { + validateMemoryMaxTextField(); + setExampleMemoryLabel(); + } + + @Override + public void keyPressed(KeyEvent e) + { + } + + // try and stop invalid typing + @Override + public void keyTyped(KeyEvent e) + { + char c = Character.toLowerCase(e.getKeyChar()); + String text = jvmMemoryMaxTextField.getText(); + String suffixes = "tgmkb"; + int pos = jvmMemoryMaxTextField.getCaretPosition(); + int suffixPos = StringUtils.firstCharPosIgnoreCase(text, suffixes); + if (!((('0' <= c && c <= '9') + && (suffixPos == -1 || pos <= suffixPos)) // digits only allowed + // before suffix + || (suffixes.indexOf(Character.toLowerCase(c)) >= 0 // valid + // suffix + && pos == text.length() // at end of text and + && suffixPos == -1) // there isn't already one + )) + { + // don't process + e.consume(); + } + } + }); + } + + private boolean isMemoryMaxTextFieldValid() + { + return MemorySetting + .isValidMemoryString(jvmMemoryMaxTextField.getText()); + } + + private void validateMemoryMaxTextField() + { + if (isMemoryMaxTextFieldValid()) + { + jvmMemoryMaxTextField.setBackground(Color.WHITE); + } + else + { + jvmMemoryMaxTextField.setBackground(Color.PINK); + } + } + + private void setMemoryPercentDisplay() + { + jvmMemoryPercentDisplay + .setText(jvmMemoryPercentSlider.getValue() + "%"); + setExampleMemoryLabel(); + } + + private void setExampleMemoryLabel() + { + boolean selected = customiseMemorySetting.isSelected(); + int jvmmempc = jvmMemoryPercentSlider.getValue(); + String jvmmemmax = jvmMemoryMaxTextField.getText(); + + long mem; + if (selected && (0 <= jvmmempc && jvmmempc <= 100) + && MemorySetting.isValidMemoryString(jvmmemmax)) + { + mem = MemorySetting.getMemorySetting(jvmmemmax, + String.valueOf(jvmmempc), false, true); + } + else + { + mem = MemorySetting.getMemorySetting(null, null, false, true); + } + exampleMemoryLabel.setText(MemorySetting.memoryLongToString(mem)); + String message = MemorySetting.getAdjustmentMessage(); + exampleMemoryMessageTextArea.setText( + MessageManager.getString("label.adjustments_for_this_computer") + + ": " + + (message == null + ? MessageManager.getString("label.none") + : message)); + } + + private void memoryOptionsSetEnabled() + { + boolean enabled = customiseMemorySetting.isSelected(); + // leave exampleMemoryLabel enabled always + maxMemoryLabel.setEnabled(enabled); + jvmMemoryPercentLabel.setEnabled(enabled); + jvmMemoryPercentSlider.setEnabled(enabled); + jvmMemoryPercentDisplay.setEnabled(enabled); + jvmMemoryMaxLabel.setEnabled(enabled); + jvmMemoryMaxTextField.setEnabled(enabled); + exampleMemoryMessageTextArea.setEnabled(enabled); + setExampleMemoryLabel(); + } + /** * Initialises the Backups tabbed panel. * @@ -2193,7 +2589,6 @@ public class GPreferences extends JPanel } }); - // enable checkbox 1 col gbc.gridwidth = 1; gbc.gridheight = 1; @@ -2266,8 +2661,8 @@ public class GPreferences extends JPanel presetsComboLabel = new JLabel(title + ":"); presetsPanel.add(presetsComboLabel, gbc); - List entries = Arrays - .asList((Object[]) BackupFilesPresetEntry.backupfilesPresetEntries); + List entries = Arrays.asList( + (Object[]) BackupFilesPresetEntry.backupfilesPresetEntries); List tooltips = Arrays.asList( BackupFilesPresetEntry.backupfilesPresetEntryDescriptions); backupfilesPresetsCombo = JvSwingUtils.buildComboWithTooltips(entries, @@ -2294,7 +2689,8 @@ public class GPreferences extends JPanel { if (customiseCheckbox.isSelected()) { - // got here by clicking on customiseCheckbox so don't change the values + // got here by clicking on customiseCheckbox so don't change the + // values backupfilesCustomOptionsSetEnabled(); } else @@ -2373,13 +2769,11 @@ public class GPreferences extends JPanel private JPanel initBackupsTabFilenameExamplesPanel() { - String title = MessageManager - .getString("label.scheme_examples"); + String title = MessageManager.getString("label.scheme_examples"); TitledBorder tb = new TitledBorder(title); exampleFilesPanel.setBorder(tb); exampleFilesPanel.setLayout(new GridBagLayout()); - backupfilesExampleLabel.setEditable(false); backupfilesExampleLabel .setBackground(exampleFilesPanel.getBackground()); @@ -2412,7 +2806,7 @@ public class GPreferences extends JPanel } else { - Cache.log.error( + Console.error( "Preset '" + value + "' [key:" + key + "] not implemented"); } @@ -2432,7 +2826,7 @@ public class GPreferences extends JPanel .getSelectedItem(); } catch (Exception ex) { - Cache.log.error( + Console.error( "Problem casting Combo entry to IntKeyStringValueEntry."); e = null; } @@ -2440,8 +2834,7 @@ public class GPreferences extends JPanel } protected void setComboIntStringKey( - JComboBox backupfilesPresetsCombo2, - int key) + JComboBox backupfilesPresetsCombo2, int key) { for (int i = 0; i < backupfilesPresetsCombo2.getItemCount(); i++) { @@ -2451,7 +2844,7 @@ public class GPreferences extends JPanel e = (IntKeyStringValueEntry) backupfilesPresetsCombo2.getItemAt(i); } catch (Exception ex) { - Cache.log.error( + Console.error( "Problem casting Combo entry to IntKeyStringValueEntry. Skipping item. "); continue; } @@ -2711,9 +3104,8 @@ public class GPreferences extends JPanel JPanel jp = new JPanel(); jp.setLayout(new FlowLayout()); - oldBackupFilesLabel - .setText(MessageManager - .getString("label.autodelete_old_backup_files")); + oldBackupFilesLabel.setText( + MessageManager.getString("label.autodelete_old_backup_files")); oldBackupFilesLabel.setFont(LABEL_FONT); oldBackupFilesLabel.setHorizontalAlignment(SwingConstants.LEFT); jp.add(oldBackupFilesLabel); @@ -2873,7 +3265,8 @@ public class GPreferences extends JPanel } - // add some extra empty lines to pad out the example files box. ugh, please tell + // add some extra empty lines to pad out the example files box. ugh, please + // tell // me how to do this better int remainingLines = lowersurround + uppersurround + 1 - lineNumber; if (remainingLines > 0) @@ -2899,7 +3292,7 @@ public class GPreferences extends JPanel i = ((Integer) s.getValue()).intValue(); } catch (Exception e) { - Cache.log.error( + Console.error( "Exception casting the initial value of s.getValue()"); } } @@ -2935,7 +3328,7 @@ public class GPreferences extends JPanel i = (Integer) s.getValue(); } catch (Exception e) { - Cache.log.error("Failed casting (Integer) JSpinner s.getValue()"); + Console.error("Failed casting (Integer) JSpinner s.getValue()"); } return i; } @@ -2952,8 +3345,7 @@ public class GPreferences extends JPanel private void backupfilesKeepAllSetEnabled(boolean tryEnabled) { boolean enabled = tryEnabled && enableBackupFiles.isSelected() - && customiseCheckbox.isSelected() - && suffixTemplate.getText() + && customiseCheckbox.isSelected() && suffixTemplate.getText() .indexOf(BackupFiles.NUM_PLACEHOLDER) > -1; keepfilesPanel.setEnabled(enabled); backupfilesKeepAll.setEnabled(enabled); @@ -3195,13 +3587,15 @@ public class GPreferences extends JPanel public void proxyType_actionPerformed() { setCustomProxyEnabled(); - proxyAuthPasswordHighlight(true); + proxyAuthPasswordCheckHighlight(true); + applyProxyButtonEnabled(true); } public void proxyAuth_actionPerformed() { setProxyAuthEnabled(); - proxyAuthPasswordHighlight(true); + proxyAuthPasswordCheckHighlight(true); + applyProxyButtonEnabled(true); } /** @@ -3276,4 +3670,3 @@ public class GPreferences extends JPanel } } -