From: <jp...@us...> - 2007-07-24 02:40:33
|
Revision: 10117 http://svn.sourceforge.net/jedit/?rev=10117&view=rev Author: jpavel Date: 2007-07-23 19:40:31 -0700 (Mon, 23 Jul 2007) Log Message: ----------- Configurable popup rows. Modified Paths: -------------- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CompletionPopup.java plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.java plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.jfd Modified: plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java =================================================================== --- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java 2007-07-24 02:04:50 UTC (rev 10116) +++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java 2007-07-24 02:40:31 UTC (rev 10117) @@ -30,6 +30,7 @@ groups -> Map<String (groupname), List<OptionPanel.OptionGroup>> cache -> Boolean.(TRUE|FALSE) update -> Boolean.(TRUE|FALSE) + popup-rows -> Integer */ private static HashMap<String,Object> optionsMap; @@ -87,6 +88,9 @@ optionsMap.put("cache", Boolean.TRUE); if (!optionsMap.containsKey("update")) optionsMap.put("update", Boolean.FALSE); + if (!optionsMap.containsKey("popup-rows")) + optionsMap.put("popup-rows", new Integer(12)); + for (String engineName : enginesOptionsMap.keySet()) { EngineGroup eg = new EngineGroup(); @@ -238,7 +242,7 @@ } static void deleteEngine(String engineName) { - if (engineMap.size() <= 1) + if (enginesOptionsMap.size() <= 1) return; enginesOptionsMap.remove(engineName); Modified: plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CompletionPopup.java =================================================================== --- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CompletionPopup.java 2007-07-24 02:04:50 UTC (rev 10116) +++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CompletionPopup.java 2007-07-24 02:40:31 UTC (rev 10117) @@ -168,7 +168,8 @@ this.candidates = candidates; list.setModel(new CandidateListModel()); - list.setVisibleRowCount(Math.min(candidates.getSize(),12)); + list.setVisibleRowCount(Math.min(candidates.getSize(), + ((Integer)CamelCompletePlugin.getOption("popup-rows")).intValue())); pack(); setLocation(fitInScreen(getLocation(null),this, view.getTextArea().getPainter().getFontMetrics().getHeight())); Modified: plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.java =================================================================== --- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.java 2007-07-24 02:04:50 UTC (rev 10116) +++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.java 2007-07-24 02:40:31 UTC (rev 10117) @@ -11,6 +11,8 @@ import javax.swing.*; import com.illengineer.com.jgoodies.forms.factories.*; import com.illengineer.com.jgoodies.forms.layout.*; +// import com.jgoodies.forms.factories.*; +// import com.jgoodies.forms.layout.*; import org.gjt.sp.jedit.AbstractOptionPane; import org.gjt.sp.jedit.GUIUtilities; @@ -67,6 +69,8 @@ loadEngines(); cacheCheck.setSelected(((Boolean)CamelCompletePlugin.getOption("cache")).booleanValue()); updateCheck.setSelected(((Boolean)CamelCompletePlugin.getOption("update")).booleanValue()); + ((SpinnerNumberModel)popupRowsSpinner.getModel()).setValue( + (Integer)CamelCompletePlugin.getOption("popup-rows")); addComponent(mainPanel); } @@ -75,6 +79,7 @@ saveOptionGroups(); CamelCompletePlugin.setOption("cache", Boolean.valueOf(cacheCheck.isSelected())); CamelCompletePlugin.setOption("update", Boolean.valueOf(updateCheck.isSelected())); + CamelCompletePlugin.setOption("popup-rows", popupRowsSpinner.getValue()); } // }}} @@ -394,6 +399,7 @@ // {{{ JFormDesigner initComponents() private void initComponents() { // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents + // Generated using JFormDesigner non-commercial license mainPanel = new JPanel(); optionPanel = new JPanel(); panel7 = new JPanel(); @@ -439,6 +445,9 @@ regexIgnoreCaseCheck = new JCheckBox(); addTokenizerButton = new JButton(); removeTokenizerButton = new JButton(); + panel1 = new JPanel(); + label9 = new JLabel(); + popupRowsSpinner = new JSpinner(); panel4 = new JPanel(); ignoreCaseCheck = new JCheckBox(); label5 = new JLabel(); @@ -726,6 +735,21 @@ } optionPanel.add(panel3, cc.xy(5, 9)); + //======== panel1 ======== + { + panel1.setLayout(new BorderLayout(3, 3)); + + //---- label9 ---- + label9.setText("Popup List Rows"); + panel1.add(label9, BorderLayout.NORTH); + + //---- popupRowsSpinner ---- + popupRowsSpinner.setModel(new SpinnerNumberModel(new Integer(12), new Integer(4), null, new Integer(1))); + popupRowsSpinner.setPreferredSize(new Dimension(60, 20)); + panel1.add(popupRowsSpinner, BorderLayout.WEST); + } + optionPanel.add(panel1, cc.xy(1, 11)); + //======== panel4 ======== { panel4.setLayout(new FormLayout( @@ -753,7 +777,7 @@ panel4.add(label5, cc.xy(5, 1)); //---- minpartsSpinner ---- - minpartsSpinner.setModel(new SpinnerNumberModel(2, 1, null, 1)); + minpartsSpinner.setModel(new SpinnerNumberModel(new Integer(2), new Integer(1), null, new Integer(1))); panel4.add(minpartsSpinner, cc.xy(7, 1)); //---- label4 ---- @@ -766,7 +790,7 @@ panel4.add(label8, cc.xy(5, 3)); //---- maxpartsSpinner ---- - maxpartsSpinner.setModel(new SpinnerNumberModel(8, 2, null, 1)); + maxpartsSpinner.setModel(new SpinnerNumberModel(new Integer(8), new Integer(2), null, new Integer(1))); panel4.add(maxpartsSpinner, cc.xy(7, 3)); } optionPanel.add(panel4, cc.xywh(3, 11, 3, 1)); @@ -815,6 +839,7 @@ // {{{ JFormDesigner variables // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables + // Generated using JFormDesigner non-commercial license JPanel mainPanel; JPanel optionPanel; JPanel panel7; @@ -860,6 +885,9 @@ JCheckBox regexIgnoreCaseCheck; JButton addTokenizerButton; JButton removeTokenizerButton; + JPanel panel1; + JLabel label9; + JSpinner popupRowsSpinner; JPanel panel4; JCheckBox ignoreCaseCheck; JLabel label5; Modified: plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.jfd =================================================================== --- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.jfd 2007-07-24 02:04:50 UTC (rev 10116) +++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.jfd 2007-07-24 02:40:31 UTC (rev 10117) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<java version="1.5.0_07" class="java.beans.XMLDecoder"> +<java version="1.5.0_11" class="java.beans.XMLDecoder"> <object class="com.jformdesigner.model.FormModel"> <void property="contentType"> <string>form/swing</string> @@ -970,6 +970,88 @@ <object class="com.jformdesigner.model.FormContainer"> <string>javax.swing.JPanel</string> <object class="com.jformdesigner.model.FormLayoutManager"> + <class>java.awt.BorderLayout</class> + <void method="setProperty"> + <string>hgap</string> + <int>3</int> + </void> + <void method="setProperty"> + <string>vgap</string> + <int>3</int> + </void> + </object> + <void property="name"> + <string>panel1</string> + </void> + <void method="add"> + <object class="com.jformdesigner.model.FormComponent"> + <string>javax.swing.JLabel</string> + <void method="setProperty"> + <string>text</string> + <string>Popup List Rows</string> + </void> + <void property="name"> + <string>label9</string> + </void> + </object> + <object class="com.jformdesigner.model.FormLayoutConstraints"> + <class>java.lang.String</class> + <void method="setProperty"> + <string>value</string> + <string>North</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.jformdesigner.model.FormComponent"> + <string>javax.swing.JSpinner</string> + <void method="setProperty"> + <string>model</string> + <object class="javax.swing.SpinnerNumberModel"> + <void property="minimum"> + <int>4</int> + </void> + <void property="value"> + <int>12</int> + </void> + </object> + </void> + <void method="setProperty"> + <string>preferredSize</string> + <object class="java.awt.Dimension"> + <int>60</int> + <int>20</int> + </object> + </void> + <void property="name"> + <string>popupRowsSpinner</string> + </void> + </object> + <object class="com.jformdesigner.model.FormLayoutConstraints"> + <class>java.lang.String</class> + <void method="setProperty"> + <string>value</string> + <string>West</string> + </void> + </object> + </void> + </object> + <object class="com.jformdesigner.model.FormLayoutConstraints"> + <class>com.jgoodies.forms.layout.CellConstraints</class> + <void method="setProperty"> + <string>gridX</string> + <int>1</int> + </void> + <void method="setProperty"> + <string>gridY</string> + <int>11</int> + </void> + </object> + </void> + <void method="add"> + <object class="com.jformdesigner.model.FormContainer"> + <string>javax.swing.JPanel</string> + <object class="com.jformdesigner.model.FormLayoutManager"> <class>com.jgoodies.forms.layout.FormLayout</class> <void method="setProperty"> <string>$columnSpecs</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |