[ jEdit-commits ] SF.net SVN: jedit: [10086] plugins/CamelComplete/trunk/src/com/illengineer/ jcc/jedit

[<jp...@us...>]

Revision: 10086
          http://svn.sourceforge.net/jedit/?rev=10086&view=rev
Author:   jpavel
Date:     2007-07-20 15:21:47 -0700 (Fri, 20 Jul 2007)

Log Message:
-----------
Made the Option pane work with new methods.

Modified Paths:
--------------
    plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelComplete.props
    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

Modified: plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelComplete.props
===================================================================
--- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelComplete.props	2007-07-20 21:39:28 UTC (rev 10085)
+++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelComplete.props	2007-07-20 22:21:47 UTC (rev 10086)
@@ -8,7 +8,7 @@
 plugin.com.illengineer.jcc.jedit.CamelCompletePlugin.author=Jesse Pavel
 
 # version number
-plugin.com.illengineer.jcc.jedit.CamelCompletePlugin.version=1.2.1
+plugin.com.illengineer.jcc.jedit.CamelCompletePlugin.version=1.2.2
 
 # online help
 plugin.com.illengineer.jcc.jedit.CamelCompletePlugin.docs=CamelComplete.html

Modified: plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java
===================================================================
--- plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java	2007-07-20 21:39:28 UTC (rev 10085)
+++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CamelCompletePlugin.java	2007-07-20 22:21:47 UTC (rev 10086)
@@ -17,7 +17,7 @@
 	public static final String NAME = "camelcomplete";
 	public static final String OPTION_PREFIX = "options.camelcomplete.";
 
-	private static boolean debug = false;
+	private static boolean debug = true;
 	private static PrintWriter debugWriter;
 	
 	/*  This Map will contain all the options and configuration set in the OptionPane
@@ -42,6 +42,8 @@
 		} catch (IOException ex) {}
 	    }
 	    
+	    // try {
+	    
 	    optionsMap = null;
 	    InputStream i;
 
@@ -60,7 +62,7 @@
 		if (failed)
 		    optionsMap = null;
 	    }
-	    if (optionsMap == null) {
+	    if (optionsMap == null || !optionsMap.containsKey("engines")) {
 		optionsMap = new HashMap<String,Object>();
 		HashMap<String,List<OptionPanel.OptionGroup>> _enginesMap = 
 		    new HashMap<String,List<OptionPanel.OptionGroup>>();
@@ -69,6 +71,8 @@
 	    }
 	    
 	    engineMap = new HashMap<String,EngineGroup>();
+	    engines = new ArrayList<CompletionEngine>();
+	    
 	    Map<String,List<OptionPanel.OptionGroup>> _enginesMap = 
 		(Map<String,List<OptionPanel.OptionGroup>>)optionsMap.get("engines");
 	    for (String engineName : _enginesMap.keySet()) {
@@ -88,6 +92,11 @@
 		engineMap.put(engineName, eg);
 		engines.add(eg.engine);
 	    }
+	    
+	    // } catch (Exception ex) {
+		// ex.printStackTrace(debugWriter);
+		// debugWriter.flush();
+	    // }
 	}
 	
 	public void stop() {
@@ -184,6 +193,9 @@
 	}
 	
 	static void deleteEngine(String engineName) {
+	    if (engineName.equals("default"))
+		return;
+		
 	    Map<String,List<OptionPanel.OptionGroup>> _enginesMap = 
 		(Map<String,List<OptionPanel.OptionGroup>>)optionsMap.get("engines");
 	    _enginesMap.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-20 21:39:28 UTC (rev 10085)
+++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/CompletionPopup.java	2007-07-20 22:21:47 UTC (rev 10086)
@@ -168,7 +168,7 @@
 
 		this.candidates = candidates;
 		list.setModel(new CandidateListModel());
-		list.setVisibleRowCount(Math.min(candidates.getSize(),8));
+		list.setVisibleRowCount(Math.min(candidates.getSize(),12));
 		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-20 21:39:28 UTC (rev 10085)
+++ plugins/CamelComplete/trunk/src/com/illengineer/jcc/jedit/OptionPanel.java	2007-07-20 22:21:47 UTC (rev 10086)
@@ -25,6 +25,7 @@
 	private DefaultListModel providerModel, tokenizerModel;
 	
 	private HashMap<String, List<OptionGroup>> optionGroupMap;
+	private String currentEngineName = "default";
 	
 	private MessageDialog msgDialog;
 	// }}}
@@ -57,12 +58,12 @@
 		b.addActionListener(this);
 	    
 	    loadOptionGroups();
-	    loadOptions((List<OptionGroup>)CamelCompletePlugin.getOption("providers"));
+	    loadCurrentEngine();
 	    addComponent(mainPanel);
 	}
 	
 	protected void _save() {
-	    CamelCompletePlugin.setOption("providers", saveOptions());
+	    saveCurrentEngine(); // TODO, save all engines
 	    saveOptionGroups();
 	}
 	
@@ -174,10 +175,10 @@
 	    }
 	    // }}}
 	    else if (source == processButton) {
-		CamelCompletePlugin.setOption("providers", saveOptions());
+		saveCurrentEngine();
 		showMsg("Updating identifier lists...");
 		try {
-		    CamelCompletePlugin.processConfiguration();
+		    CamelCompletePlugin.processConfiguration(currentEngineName);
 		} catch (Exception ex) {
 		    showMsg("Error: " + ex.getMessage());
 		    return;
@@ -275,6 +276,19 @@
 		    optionGroupCombo.addItem(key);
 	    }
 	}
+	
+	private void saveCurrentEngine() {
+	    Map<String,List<OptionPanel.OptionGroup>> _enginesMap =
+		(Map<String,List<OptionPanel.OptionGroup>>)CamelCompletePlugin.getOption("engines");
+	    _enginesMap.put(currentEngineName, saveOptions());
+	}
+	
+	private void loadCurrentEngine() {
+	    Map<String,List<OptionPanel.OptionGroup>> _enginesMap =
+		(Map<String,List<OptionPanel.OptionGroup>>)CamelCompletePlugin.getOption("engines");
+	    loadOptions((List<OptionGroup>)_enginesMap.get(currentEngineName));
+	}
+	    
 	// }}}
 
 	// }}}


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