[Gridarta-commit] SF.net SVN: gridarta:[9488] trunk/src/gridarta/src/main/java/net/sf/ gridarta/gui/dialog/plugin/PluginEditor.java

[<aki...@us...>]

Revision: 9488
          http://sourceforge.net/p/gridarta/code/9488
Author:   akirschbaum
Date:     2013-11-23 09:36:38 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Extract code into functions.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2013-11-23 09:26:02 UTC (rev 9487)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java	2013-11-23 09:36:38 UTC (rev 9488)
@@ -83,15 +83,12 @@
     private final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory;
 
     @NotNull
-    private final JPanel paramTable;
+    private final JPanel paramTable = new JPanel(new GridBagLayout());
 
     @NotNull
-    private final AbstractButton removeParameter;
+    private final AbstractButton removeParameter = new JButton("Remove parameter");
 
     @NotNull
-    private final RSyntaxTextArea code;
-
-    @NotNull
     private final PluginModel<G, A, R> pluginModel;
 
     @NotNull
@@ -152,13 +149,13 @@
     };
 
     @NotNull
-    private final AbstractButton typeAutoRun;
+    private final AbstractButton typeAutoRun = new JCheckBox("auto-run at application startup");
 
     @NotNull
-    private final AbstractButton typeFilter;
+    private final AbstractButton typeFilter = new JCheckBox("reference in the filters list");
 
     @NotNull
-    private final AbstractButton typeBash;
+    private final AbstractButton typeBash = new JCheckBox("reference in the manual run list");
 
     /**
      * Create a visual JComponent used to edit the given script.
@@ -173,6 +170,13 @@
         final JTabbedPane tabs = new JTabbedPane();
         panel.setLayout(new BorderLayout());
         panel.add(tabs);
+        tabs.add("Options", createOptionsTab(pluginController, resourceIcons));
+        tabs.addTab("Manual run parameters", createParameterTab());
+        tabs.addTab("Code", createCodePanel(pluginController));
+    }
+
+    @NotNull
+    private Component createOptionsTab(@NotNull final PluginController<G, A, R> pluginController, @NotNull final ResourceIcons resourceIcons) {
         final Container optionsTab = new JPanel(new GridBagLayout());
         final GridBagConstraints gbc = new GridBagConstraints();
         gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -198,7 +202,6 @@
         gbc.weightx = 0.9;
         gbc.fill = GridBagConstraints.NONE;
         gbc.anchor = GridBagConstraints.WEST;
-        typeAutoRun = new JCheckBox("auto-run at application startup");
         typeAutoRun.addActionListener(new ActionListener() {
 
             @Override
@@ -209,7 +212,6 @@
         typeAutoRun.setSelected(plugin.isAutoBoot());
         optionsTab.add(typeAutoRun, gbc);
         gbc.gridy = 2;
-        typeFilter = new JCheckBox("reference in the filters list");
         typeFilter.addActionListener(new ActionListener() {
 
             @Override
@@ -220,7 +222,6 @@
         typeFilter.setSelected(plugin.isFilter());
         optionsTab.add(typeFilter, gbc);
         gbc.gridy = 3;
-        typeBash = new JCheckBox("reference in the manual run list");
         typeBash.addActionListener(new ActionListener() {
 
             @Override
@@ -253,9 +254,12 @@
             }
         });
         optionsTab.add(exportButton, gbc);
-        tabs.add("Options", optionsTab);
+        return optionsTab;
+    }
+
+    @NotNull
+    private Component createParameterTab() {
         final Container parameterTab = new JPanel(new BorderLayout());
-        paramTable = new JPanel(new GridBagLayout());
         redrawTable();
         plugin.addChangeListener(new ChangeListener() {
 
@@ -266,7 +270,6 @@
         });
         final Component scrollPane1 = new JScrollPane(paramTable);
         parameterTab.add(scrollPane1, BorderLayout.CENTER);
-        //parameterTab.add(paramTable, BorderLayout.CENTER);
         final Container paramButtons = new JPanel();
         paramButtons.setLayout(new StackLayout(5));
         final AbstractButton addParameter = new JButton("Add parameter");
@@ -277,7 +280,6 @@
                 plugin.newParameter();
             }
         });
-        removeParameter = new JButton("Remove parameter");
         removeParameter.addActionListener(new ActionListener() {
 
             @Override
@@ -301,8 +303,12 @@
         paramButtons.add(addParameter);
         paramButtons.add(removeParameter);
         parameterTab.add(paramButtons, BorderLayout.EAST);
-        tabs.addTab("Manual run parameters", parameterTab);
-        code = new RSyntaxTextArea();
+        return parameterTab;
+    }
+
+    @NotNull
+    private RSyntaxTextArea createCode() {
+        final RSyntaxTextArea code = new RSyntaxTextArea();
         code.setText(plugin.getCode());
         code.setFont(new Font("Monospaced", Font.PLAIN, 14));
         code.getDocument().addDocumentListener(new DocumentListener() {
@@ -323,7 +329,12 @@
             }
         });
         code.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
-        final Component scrollPane2 = new RTextScrollPane(code);
+        return code;
+    }
+
+    @NotNull
+    private Component createCodePanel(@NotNull final PluginController<G, A, R> pluginController) {
+        final Component scrollPane2 = new RTextScrollPane(createCode());
         final Container codePanel = new JPanel(new BorderLayout());
         codePanel.add(scrollPane2, BorderLayout.CENTER);
         final Container codeBottom = new JPanel(new FlowLayout());
@@ -337,7 +348,7 @@
         });
         codeBottom.add(test);
         codePanel.add(codeBottom, BorderLayout.SOUTH);
-        tabs.addTab("Code", codePanel);
+        return codePanel;
     }
 
     public void selectTableComponent(@NotNull final Component c) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.