From: <ez...@us...> - 2009-12-02 22:01:52
|
Revision: 16593 http://jedit.svn.sourceforge.net/jedit/?rev=16593&view=rev Author: ezust Date: 2009-12-02 22:01:44 +0000 (Wed, 02 Dec 2009) Log Message: ----------- svn merge -c 16591 $JEDITSVN/jEdit/trunk Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java Property Changed: ---------------- jEdit/branches/4.3.x/ jEdit/branches/4.3.x/doc/news43/ jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-02 21:44:38 UTC (rev 16592) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-02 22:01:44 UTC (rev 16593) @@ -2,6 +2,7 @@ {{{ Version 4.3.0 + Thanks to Bj\xF6rn "Vampire" Kautler, Marcelo Vanzin, Matthieu Casanova and Eric Le Lay for contributing to this release. @@ -11,6 +12,9 @@ resolve resources like instances associated with a JAR file (fix for Xerces). The context ClassLoader for jedit server thread is now a JARClassLoader. +- Fixed bug #2907139: Upgrading from 4.2final to 4.3pre18 causes freeze at + startup (Shlomy Reinstein) + }}} {{{ Miscellaneous Property changes on: jEdit/branches/4.3.x/doc/news43 ___________________________________________________________________ Modified: svn:mergeinfo - + /jEdit/trunk/doc/news43:16591-16592 Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java 2009-12-02 21:44:38 UTC (rev 16592) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java 2009-12-02 22:01:44 UTC (rev 16593) @@ -1778,6 +1778,8 @@ { String path = (String)obj; buffer = jEdit.getBuffer(path); + if (buffer == null) + buffer = jEdit.openFile(this, path); } if(buffer == null) Property changes on: jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework/org/gjt/sp/jedit/io/BufferLocalEncodingDetector.java:13128-13258 + /jEdit/branches/docking_framework/org/gjt/sp/jedit/io/BufferLocalEncodingDetector.java:13128-13258 /jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java:16591-16592 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2009-12-03 16:37:05
|
Revision: 16595 http://jedit.svn.sourceforge.net/jedit/?rev=16595&view=rev Author: k_satoda Date: 2009-12-03 16:36:55 +0000 (Thu, 03 Dec 2009) Log Message: ----------- Removed useless but annoying svn:mergeinfo, which were likely created by early versions of Subversion 1.5.x. http://svn.collab.net/repos/svn/tags/1.5.5/CHANGES > * do not create mergeinfo for wc-wc moves or copies (r34184, -585) This is the same change as r16594 on trunk. Property Changed: ---------------- jEdit/branches/4.3.x/doc/news43/ jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java Property changes on: jEdit/branches/4.3.x/doc/news43 ___________________________________________________________________ Deleted: svn:mergeinfo - /jEdit/trunk/doc/news43:16591-16592 Property changes on: jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java ___________________________________________________________________ Deleted: svn:mergeinfo - /jEdit/branches/docking_framework/org/gjt/sp/jedit/io/BufferLocalEncodingDetector.java:13128-13258 /jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java:16591-16592 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-12-03 18:53:32
|
Revision: 16599 http://jedit.svn.sourceforge.net/jedit/?rev=16599&view=rev Author: shlomy Date: 2009-12-03 18:53:23 +0000 (Thu, 03 Dec 2009) Log Message: ----------- Fixed bug #2897104: Comment char not defined in cmake mode using patch attached to the item. Modified Paths: -------------- jEdit/branches/4.3.x/modes/cmake.xml Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597 Modified: jEdit/branches/4.3.x/modes/cmake.xml =================================================================== --- jEdit/branches/4.3.x/modes/cmake.xml 2009-12-03 18:50:43 UTC (rev 16598) +++ jEdit/branches/4.3.x/modes/cmake.xml 2009-12-03 18:53:23 UTC (rev 16599) @@ -11,7 +11,7 @@ --> <MODE> <PROPS> - <PROPERTY NAME="lineCommenti" VALUE="#"/> + <PROPERTY NAME="lineComment" VALUE="#"/> <PROPERTY NAME="indentSize" VALUE="4"/> <PROPERTY NAME="firstlineGlob" VALUE=""/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-12-03 18:59:59
|
Revision: 16601 http://jedit.svn.sourceforge.net/jedit/?rev=16601&view=rev Author: shlomy Date: 2009-12-03 18:59:48 +0000 (Thu, 03 Dec 2009) Log Message: ----------- Fixed Fixed bug #: 'ELSEIF' missing in CMake using patch attached to the item. Modified Paths: -------------- jEdit/branches/4.3.x/modes/cmake.xml Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600 Modified: jEdit/branches/4.3.x/modes/cmake.xml =================================================================== --- jEdit/branches/4.3.x/modes/cmake.xml 2009-12-03 18:58:19 UTC (rev 16600) +++ jEdit/branches/4.3.x/modes/cmake.xml 2009-12-03 18:59:48 UTC (rev 16601) @@ -82,6 +82,7 @@ <!-- conditionals --> <KEYWORD4>FOREACH</KEYWORD4> <KEYWORD4>ELSE</KEYWORD4> + <KEYWORD4>ELSEIF</KEYWORD4> <KEYWORD4>IF</KEYWORD4> <KEYWORD4>MACRO</KEYWORD4> <KEYWORD4>ENDIF</KEYWORD4> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2009-12-10 00:00:48
|
Revision: 16625 http://jedit.svn.sourceforge.net/jedit/?rev=16625&view=rev Author: ezust Date: 2009-12-10 00:00:39 +0000 (Thu, 10 Dec 2009) Log Message: ----------- Merged rev# 16624 from trunk, to fix printing which was broken by patch#2876132. (Eric Le Lay) Revision Links: -------------- http://jedit.svn.sourceforge.net/jedit/?rev=16624&view=rev Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/JARClassLoader.java Property Changed: ---------------- jEdit/branches/4.3.x/ jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600 + /jEdit/branches/4.3.x:16624 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-09 21:00:28 UTC (rev 16624) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-10 00:00:39 UTC (rev 16625) @@ -8,9 +8,13 @@ {{{ Bug Fixes +- Merged rev# 16624 from trunk, to fix printing which was broken by + patch#2876132. (Eric Le Lay) + - Applied patch #2876132 - anonymous instances of JARClassLoader will now resolve resources like instances associated with a JAR file (fix for Xerces). The context ClassLoader for jedit server thread is now a JARClassLoader. + (Eric Le Lay) - Fixed bug #2907139: Upgrading from 4.2final to 4.3pre18 causes freeze at startup (Shlomy Reinstein) Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/JARClassLoader.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/JARClassLoader.java 2009-12-09 21:00:28 UTC (rev 16624) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/JARClassLoader.java 2009-12-10 00:00:39 UTC (rev 16625) @@ -181,7 +181,16 @@ { JARClassLoader classLoader = (JARClassLoader)obj; return classLoader.getResource(name); - } else return findResource(name); + } else + { + URL ret = getSystemResource(name); + if(ret != null) + { + Log.log(Log.DEBUG,JARClassLoader.class,"Would have returned null for getResource("+name+")"); + Log.log(Log.DEBUG,JARClassLoader.class,"returning("+ret+")"); + } + return ret; + } } catch(IOException io) { Property changes on: jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java ___________________________________________________________________ Added: svn:mergeinfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2009-12-10 00:10:45
|
Revision: 16626 http://jedit.svn.sourceforge.net/jedit/?rev=16626&view=rev Author: ezust Date: 2009-12-10 00:10:38 +0000 (Thu, 10 Dec 2009) Log Message: ----------- Improved Python edit mode (Bj?\195?\182rn "Vampire" Kautler) w.r.t. electricKeys. Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/modes/python.xml Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-10 00:00:39 UTC (rev 16625) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-10 00:10:38 UTC (rev 16626) @@ -50,7 +50,8 @@ }}} {{{ Editing -- Removed : from electricKeys property in python.xml edit mode. (Alan Ezust) +- Improved Python edit mode (Bj\xF6rn "Vampire" Kautler) w.r.t. electricKeys. + }}} }}} Modified: jEdit/branches/4.3.x/modes/python.xml =================================================================== --- jEdit/branches/4.3.x/modes/python.xml 2009-12-10 00:00:39 UTC (rev 16625) +++ jEdit/branches/4.3.x/modes/python.xml 2009-12-10 00:10:38 UTC (rev 16626) @@ -20,10 +20,12 @@ <MODE> <PROPS> <PROPERTY NAME="indentNextLines" VALUE="\s*[^#]{3,}:\s*(#.*)?" /> + <PROPERTY NAME="indentOpenBrackets" VALUE="{[" /> + <PROPERTY NAME="indentCloseBrackets" VALUE="}]" /> <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" /> <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" /> - <PROPERTY NAME="unindentNextLines" VALUE="^\s*(pass|else\s*:|elif\s.*:|except(\s.*)?:|finally\s*:)$" /> - <PROPERTY NAME="unindentThisLine" VALUE="^\s*(else|elif\s.*|except(\s.*)?|finally)\s*:" /> + <PROPERTY NAME="unindentNextLines" VALUE="^\s*(pass|else\s*:|elif\s.*:|except(\s.*)?:|finally\s*:)\s*(#.*)?$" /> + <PROPERTY NAME="unindentThisLine" VALUE="^\s*(else|elif\s.*|except(\s.*)?|finally)\s*:\s*(#.*)?" /> <PROPERTY NAME="lineComment" VALUE="#" /> <PROPERTY NAME="electricKeys" VALUE=":" /> <PROPERTY NAME="ignoreWhitespace" VALUE="false" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2009-12-14 17:02:38
|
Revision: 16638 http://jedit.svn.sourceforge.net/jedit/?rev=16638&view=rev Author: k_satoda Date: 2009-12-14 17:02:24 +0000 (Mon, 14 Dec 2009) Log Message: ----------- Removed useless but annoying svn:mergeinfo, which appeared on r16625. Property Changed: ---------------- jEdit/branches/4.3.x/ jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/4.3.x:16624 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624 Property changes on: jEdit/branches/4.3.x/org/gjt/sp/jedit/io/RegexEncodingDetector.java ___________________________________________________________________ Deleted: svn:mergeinfo - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2009-12-17 17:12:24
|
Revision: 16651 http://jedit.svn.sourceforge.net/jedit/?rev=16651&view=rev Author: k_satoda Date: 2009-12-17 17:12:06 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Reviewed and accepted SF.net merge request #2913870: Reverted a change for jsp mode, which was made on 4.3pre17 to fix a bug, since it doesn't work any more. Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/modes/jsp.xml Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-17 15:58:21 UTC (rev 16650) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-17 17:12:06 UTC (rev 16651) @@ -52,6 +52,9 @@ - Improved Python edit mode (Bj\xF6rn "Vampire" Kautler) w.r.t. electricKeys. +- Reverted a change for jsp mode, which was made on 4.3pre17 to fix a + bug, since it doesn't work any more. (see SF.net bug #846913) + }}} }}} @@ -494,6 +497,7 @@ - Fix for jsp mode (tracker 846913), syntax highlighting doesn't ignore comments and strings, where a single line java comment on the same line as a scriptlet terminator improperly highlighted the terminator as a comment (Dale Anson) + (Note: This change was reverted on 4.3.0) - HTML mode: Fix delegation of "style" attribute to CSS mode and delegate on* attributes to JavaScript mode (Daniel Hahler) Modified: jEdit/branches/4.3.x/modes/jsp.xml =================================================================== --- jEdit/branches/4.3.x/modes/jsp.xml 2009-12-17 15:58:21 UTC (rev 16650) +++ jEdit/branches/4.3.x/modes/jsp.xml 2009-12-17 17:12:06 UTC (rev 16651) @@ -14,15 +14,6 @@ <END>--%></END> </SPAN> - <!-- Java comment within a jsp scriplet block. There might be a better - way to do this. The situation this is attempting to fix is a scriptlet - block like this: - < } // end of if %> - This should make the java line comment end at the %, and not include - the percent, so the %> are colored correctly as the end of the - scriptlet block. --> - <SEQ_REGEXP TYPE="COMMENT1" HASH_CHAR="/" AT_WORD_START="FALSE">/[/](.*?)(?=[%][>])</SEQ_REGEXP> - <!-- JSP directive --> <SPAN TYPE="KEYWORD1" DELEGATE="DIRECTIVES"> <BEGIN><%@</BEGIN> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2009-12-23 01:08:55
|
Revision: 16709 http://jedit.svn.sourceforge.net/jedit/?rev=16709&view=rev Author: Vampire0 Date: 2009-12-23 01:08:45 +0000 (Wed, 23 Dec 2009) Log Message: ----------- Updated the version number to 4.3.1. Modified Paths: -------------- jEdit/branches/4.3.x/build.xml jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java Modified: jEdit/branches/4.3.x/build.xml =================================================================== --- jEdit/branches/4.3.x/build.xml 2009-12-22 23:12:01 UTC (rev 16708) +++ jEdit/branches/4.3.x/build.xml 2009-12-23 01:08:45 UTC (rev 16709) @@ -10,9 +10,9 @@ <!-- jEdit Version --> <property name="jedit.version" - value="4.3" /> + value="4.3.1" /> <property name="jedit.build.number" - value="04.03.99.00" /> + value="04.03.99.01" /> <!-- Target Java Versions --> <property name="target.java.version" Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-22 23:12:01 UTC (rev 16708) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-23 01:08:45 UTC (rev 16709) @@ -1,8 +1,30 @@ JEDIT 4.3 VERSION HISTORY +{{{ Version 4.3.1 + +Thanks to Bj\xF6rn "Vampire" Kautler for contributing to this release. + +{{{ Bug Fixes + + +}}} +{{{ Miscellaneous + + +}}} +{{{ API Changes + + +}}} +{{{ Editing + + +}}} + +}}} + {{{ Version 4.3 - Thanks to Bj\xF6rn "Vampire" Kautler, Marcelo Vanzin, Matthieu Casanova, Alan Ezust, Eric Berry, and Eric Le Lay for contributing to this release. Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java 2009-12-22 23:12:01 UTC (rev 16708) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java 2009-12-23 01:08:45 UTC (rev 16709) @@ -91,7 +91,7 @@ public static String getBuild() { // (major).(minor).(<99 = preX, 99 = "final").(bug fix) - return "04.03.99.00"; + return "04.03.99.01"; } //}}} //{{{ main() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2009-12-28 04:13:19
|
Revision: 16756 http://jedit.svn.sourceforge.net/jedit/?rev=16756&view=rev Author: ezust Date: 2009-12-28 04:13:08 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Merging rev 16754, 16755 into 4.3.x branch. Revision Links: -------------- http://jedit.svn.sourceforge.net/jedit/?rev=16754&view=rev Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/PluginJAR.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16754-16755 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-28 04:04:11 UTC (rev 16755) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-28 04:13:08 UTC (rev 16756) @@ -6,7 +6,11 @@ {{{ Bug Fixes +======= +- Fix # 2921611 - PluginSets fail to load grand-dependencies. (Damien Kog13) +- Fix # 2920287 - Macro recording for home/end actions fixed. (Alan Ezust) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/PluginJAR.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/PluginJAR.java 2009-12-28 04:04:11 UTC (rev 16755) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/PluginJAR.java 2009-12-28 04:13:08 UTC (rev 16756) @@ -185,7 +185,7 @@ for (String jarName: pluginLoadList) { String jarPath = findPlugin(jarName); - load(jarPath, false); + load(jarPath, true); } } // Load extra jars that are part of this plugin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2009-12-28 16:20:42
|
Revision: 16763 http://jedit.svn.sourceforge.net/jedit/?rev=16763&view=rev Author: k_satoda Date: 2009-12-28 16:20:33 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Reviewed and accepted SF.net merge request #2920347: Fixed macro recording for home/end actions. (SF.net bug #2920287) This also fixes some documentation and white space problems around the fix itself. Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/JEditTextArea.java jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16754-16755 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16737-16738,16754-16755 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-28 16:07:37 UTC (rev 16762) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-28 16:20:33 UTC (rev 16763) @@ -2,12 +2,15 @@ {{{ Version 4.3.1 -Thanks to Bj\xF6rn "Vampire" Kautler for contributing to this release. +Thanks to Bj\xF6rn "Vampire" Kautler, and Alan Ezust for contributing to +this release. {{{ Bug Fixes - Fix # 2921611 - PluginSets fail to load grand-dependencies. (Damien Kog13) +- Fix # 2920287 - Macro recording for home/end actions fixed. (Alan Ezust) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/JEditTextArea.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/JEditTextArea.java 2009-12-28 16:07:37 UTC (rev 16762) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/JEditTextArea.java 2009-12-28 16:20:33 UTC (rev 16763) @@ -77,12 +77,57 @@ return foldPainter; } //}}} + // {{{ Overrides for macro recording. + //{{{ home() method + /** + * An override to record the acutual action taken for home(). + */ + @Override + public void home(boolean select) + { + Macros.Recorder recorder = view.getMacroRecorder(); + switch(getInputHandler().getLastActionCount() % 2) + { + case 1: + if(recorder != null) + recorder.record("textArea.goToStartOfWhiteSpace(" + select + ");"); + goToStartOfWhiteSpace(select); + break; + default: + if(recorder != null) + recorder.record("textArea.goToStartOfLine(" + select + ");"); + goToStartOfLine(select); + break; + } + } //}}} + + //{{{ end() method + /** + * An override to record the acutual action taken for end(). + */ + @Override + public void end(boolean select) + { + Macros.Recorder recorder = view.getMacroRecorder(); + + switch(getInputHandler().getLastActionCount() % 2) + { + case 1: + if(recorder != null) + recorder.record("textArea.goToEndOfWhiteSpace(" + select + ");"); + goToEndOfWhiteSpace(select); + break; + default: + if(recorder != null) + recorder.record("textArea.goToEndOfLine(" + select + ");"); + goToEndOfLine(select); + break; + } + } //}}} + //{{{ smartHome() method /** - * On subsequent invocations, first moves the caret to the first - * non-whitespace character of the line, then the beginning of the - * line, then to the first visible line. - * @since jEdit 2.7pre2 + * An override to record the acutual action taken for smartHome(). */ @Override public void smartHome(boolean select) @@ -114,10 +159,7 @@ //{{{ smartEnd() method /** - * On subsequent invocations, first moves the caret to the last - * non-whitespace character of the line, then the end of the - * line, then to the last visible line. - * @since jEdit 2.7pre2 + * An override to record the acutual action taken for smartHome(). */ @Override public void smartEnd(boolean select) @@ -145,6 +187,7 @@ break; } } //}}} + // }}} // {{{ overrides from the base class that are EditBus aware public void goToBufferEnd(boolean select) Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java 2009-12-28 16:07:37 UTC (rev 16762) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java 2009-12-28 16:20:33 UTC (rev 16763) @@ -2924,9 +2924,9 @@ goToStartOfLine(select); break; } - }// }}} + } //}}} - // {{{ end() method + //{{{ end() method /** * a dumb end action which only has 2 states: * end of whitespace or end of line @@ -2944,7 +2944,7 @@ goToEndOfLine(select); break; } - }//}}} + } //}}} //{{{ smartHome() method /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2009-12-29 15:42:12
|
Revision: 16772 http://jedit.svn.sourceforge.net/jedit/?rev=16772&view=rev Author: k_satoda Date: 2009-12-29 15:41:55 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Reviewed and accepted SF.net merge request #2921370: Fixed a bug which prevented to disable "Restore previously open files on startup". (SF.net bug #2920352) Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16737-16738,16754-16755 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-29 14:33:22 UTC (rev 16771) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2009-12-29 15:41:55 UTC (rev 16772) @@ -2,8 +2,8 @@ {{{ Version 4.3.1 -Thanks to Bj\xF6rn "Vampire" Kautler, and Alan Ezust for contributing to -this release. +Thanks to Bj\xF6rn "Vampire" Kautler, Alan Ezust, and Shlomy Reinstein for +contributing to this release. {{{ Bug Fixes @@ -11,6 +11,9 @@ - Fix # 2920287 - Macro recording for home/end actions fixed. (Alan Ezust) +- Fixed #2920352: Can't disable "Restore previously open files on startup". + (Shlomy Reinstein) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java 2009-12-29 14:33:22 UTC (rev 16771) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java 2009-12-29 15:41:55 UTC (rev 16772) @@ -1268,8 +1268,6 @@ if(!OperatingSystem.isMacOS()) title.append(jEdit.getProperty("view.title")); - boolean unsavedChanges = false; - for(int i = 0; i < buffers.size(); i++) { if(i != 0) @@ -1279,10 +1277,7 @@ title.append(showFullPath && !buffer.isNewFile() ? buffer.getPath(true) : buffer.getName()); if(buffer.isDirty()) - { - unsavedChanges = true; title.append(jEdit.getProperty("view.title.dirty")); - } } setTitle(title.toString()); @@ -1779,7 +1774,10 @@ String path = (String)obj; buffer = jEdit.getBuffer(path); if (buffer == null) - buffer = jEdit.openFile(this, path); + { + int untitledCount = jEdit.getNextUntitledBufferId(); + buffer = jEdit.openFile(this,null,"Untitled-" + untitledCount,true,null); + } } if(buffer == null) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2010-01-02 08:09:30
|
Revision: 16814 http://jedit.svn.sourceforge.net/jedit/?rev=16814&view=rev Author: ezust Date: 2010-01-02 08:09:17 +0000 (Sat, 02 Jan 2010) Log Message: ----------- Fix for 2924261, BufferLocal ignores request to change encoding. (Dale Anson) Merged from rev16805. Revision Links: -------------- http://jedit.svn.sourceforge.net/jedit/?rev=16805&view=rev Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/menu/ReloadWithEncodingProvider.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-02 07:45:29 UTC (rev 16813) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-02 08:09:17 UTC (rev 16814) @@ -7,6 +7,9 @@ {{{ Bug Fixes +- Fix for 2924261, BufferLocal ignores request to change encoding. (Dale +Anson) + - Fix # 2921611 - PluginSets fail to load grand-dependencies. (Damien Kog13) - Fix # 2920287 - Macro recording for home/end actions fixed. (Alan Ezust) Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/menu/ReloadWithEncodingProvider.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/menu/ReloadWithEncodingProvider.java 2010-01-02 07:45:29 UTC (rev 16813) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/menu/ReloadWithEncodingProvider.java 2010-01-02 08:09:17 UTC (rev 16814) @@ -148,6 +148,7 @@ // Disable auto-detect because user explicitly // specify an encoding. props.put(Buffer.ENCODING_AUTODETECT, false); + view.getBuffer().setStringProperty(Buffer.ENCODING, encoding); } String path = view.getBuffer().getPath(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2010-01-14 20:34:34
|
Revision: 16930 http://jedit.svn.sourceforge.net/jedit/?rev=16930&view=rev Author: ezust Date: 2010-01-14 20:34:28 +0000 (Thu, 14 Jan 2010) Log Message: ----------- Merge request 2926392: Fix for bug #2915720 Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/search/PatternSearchMatcher.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-14 17:49:29 UTC (rev 16929) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-14 20:34:28 UTC (rev 16930) @@ -8,6 +8,9 @@ {{{ Bug Fixes +- Searching for regex "^\s*.*$" missed every second line of adjacent + matching lines. (SF.net bug #2915720 - Kazutoshi Satoda) + - Fix for 2924261, BufferLocal ignores request to change encoding. (Dale Anson) @@ -175,6 +178,7 @@ - Applied patch #2844750: line height correction (disappearing underscores), using OpenJDK (Suraj Kurapati) + }}} {{{ Miscellaneous - New Macro - "Text/Compose Tag". (Gordon Hollenbeck # 2644277) Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/search/PatternSearchMatcher.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/search/PatternSearchMatcher.java 2010-01-14 17:49:29 UTC (rev 16929) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/search/PatternSearchMatcher.java 2010-01-14 20:34:28 UTC (rev 16930) @@ -104,17 +104,27 @@ if (re == null) re = Pattern.compile(pattern, flags); + // if the pattern begins with "^", avoid spurious match at the + // start of input sequence which is not a start of line. + int matchStart = 0; + if (!start && re.pattern().charAt(0) == '^') + { + Matcher sol = Pattern.compile("^", flags).matcher(text); + // Ignore the first match since it is not a start of line. + sol.find(); + // If the second match is not found, the real pattern also + // can't match. + if (!sol.find()) + return null; + // Skip the text to the second match, which can be the first + // match for the real pattern. + matchStart = sol.start(); + } + Matcher match = re.matcher(text); - if (!match.find()) + if (!match.find(matchStart)) return null; - // if we're not at the start of the buffer, and the pattern - // begins with "^" and matched the beginning of the region - // being matched, ignore the match and try the next one. - if (!start && match.start() == 0 - && re.pattern().charAt(0) == '^' && !match.find()) - return null; - // Special care for zero width matches. Without this care, // the caller will fall into an infinite loop, for non-reverse // search. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2010-01-17 04:39:55
|
Revision: 16939 http://jedit.svn.sourceforge.net/jedit/?rev=16939&view=rev Author: ezust Date: 2010-01-17 04:39:49 +0000 (Sun, 17 Jan 2010) Log Message: ----------- Added logtalk.xml mode file (#1945284 - Paulo Moura) Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/modes/catalog Added Paths: ----------- jEdit/branches/4.3.x/modes/logtalk.xml Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,16938 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-17 04:32:21 UTC (rev 16938) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-17 04:39:49 UTC (rev 16939) @@ -32,6 +32,7 @@ }}} {{{ Editing +- Added logtalk.xml mode file (#1945284 - Paulo Moura) }}} Modified: jEdit/branches/4.3.x/modes/catalog =================================================================== --- jEdit/branches/4.3.x/modes/catalog 2010-01-17 04:32:21 UTC (rev 16938) +++ jEdit/branches/4.3.x/modes/catalog 2010-01-17 04:39:49 UTC (rev 16939) @@ -259,6 +259,9 @@ <MODE NAME="literate-haskell" FILE="literate-haskell.xml" FILE_NAME_GLOB="*.lhs" /> +<MODE NAME="logtalk" FILE="logtalk.xml" + FILE_NAME_GLOB="*.lgt" /> + <MODE NAME="lotos" FILE="lotos.xml" FILE_NAME_GLOB="*.{lot,lotos}"/> Copied: jEdit/branches/4.3.x/modes/logtalk.xml (from rev 16938, jEdit/trunk/modes/logtalk.xml) =================================================================== --- jEdit/branches/4.3.x/modes/logtalk.xml (rev 0) +++ jEdit/branches/4.3.x/modes/logtalk.xml 2010-01-17 04:39:49 UTC (rev 16939) @@ -0,0 +1,397 @@ +<?xml version="1.0"?> + +<!DOCTYPE MODE SYSTEM "xmode.dtd"> + +<!-- jEdit 4.3 Logtalk syntax file + + written by Paulo Moura + version 1.92 + created on 5 May 2002 + last revised 5 December 2009 + + To install, copy this file to the "modes" subdirectory in jEdit + directory installation. Next, check the "catalog" file in the + same subdirectory and add (if not present) the following entry: + + <MODE NAME="logtalk" FILE="logtalk.xml" FILE_NAME_GLOB="*.{lgt}" /> +--> + +<MODE> + + <PROPS> + <PROPERTY NAME="lineComment" VALUE="%" /> + <PROPERTY NAME="commentStart" VALUE="/*" /> + <PROPERTY NAME="commentEnd" VALUE="*/" /> + <PROPERTY NAME="tabSize" VALUE="4" /> + <PROPERTY NAME="indentSize" VALUE="4" /> + <!-- Auto indent --> + <PROPERTY NAME="indentNextLine" VALUE="((^\s*:-\s(object|protocol|category)\(.*,$)|.*\s:-$)" /> + </PROPS> + + <RULES SET="MAIN" IGNORE_CASE="FALSE"> + + <!-- Comments --> + <EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN> + <SPAN TYPE="COMMENT1" NO_LINE_BREAK="FALSE"> + <BEGIN>/*</BEGIN> + <END>*/</END> + </SPAN> + + <!-- Entity directives --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(category|object|protocol)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\send_(category|object|protocol)(?=[.])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\smodule(?=[(])</SEQ_REGEXP> + <!-- Predicate scope directives --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sp(ublic|r(otected|ivate))(?=[(])</SEQ_REGEXP> + <!-- Conditional compilation directives --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(el)?if(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\se(lse|ndif)(?=[.])</SEQ_REGEXP> + <!-- Other directives --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\se(n(coding|sure_loaded)|xport)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sin(fo|itialization)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(dynamic|synchronized|threaded)(?=[.])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(alias|d(ynamic|iscontiguous)|m(eta_predicate|ode|ultifile)|s(et_(logtalk|prolog)_flag|ynchronized))(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sop(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(calls|reexport|use(s|_module))(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])</SEQ_REGEXP> + + <!-- Event handlers --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(after|before)(?=[(])</SEQ_REGEXP> + <!-- Method execution context --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(parameter|this|se(lf|nder))(?=[(])</SEQ_REGEXP> + <!-- Reflection --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_predicate|predicate_property)(?=[(])</SEQ_REGEXP> + <!-- DCGs --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP> + <!-- Entity --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(object|protocol|category)_property(?=[(])</SEQ_REGEXP> + <!-- Entity relations --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bcomplements_object(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bextends_(object|protocol|category)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bimp(lements_protocol|orts_category)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(instantiat|specializ)es_class(?=[(])</SEQ_REGEXP> + <!-- Events --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_event|(abolish|define)_events)(?=[(])</SEQ_REGEXP> + <!-- Flags --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current|set)_logtalk_flag(?=[(])</SEQ_REGEXP> + <!-- Compiling, loading, and library paths --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\blogtalk_(compile|l(ibrary_path|oad))(?=[(])</SEQ_REGEXP> + <!-- Database --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(clause|retract(all)?)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\ba(bolish|ssert(a|z))(?=[(])</SEQ_REGEXP> + <!-- Control --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(ca(ll|tch)|throw)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(fail|true)\b</SEQ_REGEXP> + <!-- All solutions --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b((bag|set)of|f(ind|or)all)(?=[(])</SEQ_REGEXP> + <!-- Multi-threading meta-predicates --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bthreaded(_(call|once|ignore|exit|peek|wait|notify))?(?=[(])</SEQ_REGEXP> + <!-- Term unification --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bunify_with_occurs_check(?=[(])</SEQ_REGEXP> + <!-- Term creation and decomposition --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(functor|arg|copy_term)(?=[(])</SEQ_REGEXP> + <!-- Evaluable functors --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(rem|mod|abs|sign)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bfloat(_(integer|fractional)_part)?(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(floor|truncate|round|ceiling)(?=[(])</SEQ_REGEXP> + <!-- Other arithmetic functors --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(cos|atan|exp|log|s(in|qrt))(?=[(])</SEQ_REGEXP> + <!-- Term testing --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])</SEQ_REGEXP> + <!-- Stream selection and control --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current|set)_(in|out)put(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(open|close)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bflush_output(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(flush_output|at_end_of_stream)\b</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(stream_property|at_end_of_stream|set_stream_position)(?=[(])</SEQ_REGEXP> + <!-- Character and byte input/output --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(nl|(get|peek|put)_(byte|c(har|ode)))(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bnl\b</SEQ_REGEXP> + <!-- Term input/output --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bread(_term)?(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bwrite(q|_(canonical|term))?(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_)?op(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_)?char_conversion(?=[(])</SEQ_REGEXP> + <!-- Atomic term processing --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\batom_(length|c(hars|o(ncat|des)))(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(char_code|sub_atom)(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bnumber_c(hars|odes)(?=[(])</SEQ_REGEXP> + <!-- Implementation defined hooks functions --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(set|current)_prolog_flag(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bhalt\b</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bhalt(?=[(])</SEQ_REGEXP> + <!-- Logic and control --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bonce(?=[(])</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\brepeat\b</SEQ_REGEXP> + + <!-- Variables --> + <SEQ_REGEXP HASH_CHARS="_ABCDEFGHIJKLMNOPQRSTUVWXYZ" AT_WORD_START="TRUE" TYPE="MARKUP">[_A-Z]+[a-zA-Z0-9]*</SEQ_REGEXP> + + <!-- String literals --> + <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE"> + <BEGIN>'</BEGIN> + <END>'</END> + </SPAN> + <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE"> + <BEGIN>"</BEGIN> + <END>"</END> + </SPAN> + + <!-- External call --> + <SPAN TYPE="OPERATOR" DELEGATE="MAIN"> + <BEGIN>{</BEGIN> + <END>}</END> + </SPAN> + + <!-- Character code constants --> + <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0'.</SEQ_REGEXP> + <!-- Binary, octal, and hexadecimal numbers --> + <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0b[0-1]+</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0o[0-7]+</SEQ_REGEXP> + <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0x\p{XDigit}+</SEQ_REGEXP> + <!-- Numbers --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="DIGIT">\d+(\.\d+)?([eE]([-+])?\d+)?</SEQ_REGEXP> + + <!-- Logtalk message sending operators --> + <SEQ TYPE="OPERATOR">::</SEQ> + <SEQ TYPE="OPERATOR">^^</SEQ> + + <!-- Other Logtalk control construct operators --> + <SEQ_REGEXP TYPE="OPERATOR">:(?![:-])</SEQ_REGEXP> + + <!-- Control constructs --> + <SEQ TYPE="OPERATOR">!</SEQ> + <SEQ TYPE="OPERATOR">,</SEQ> + <SEQ TYPE="OPERATOR">;</SEQ> + <SEQ TYPE="OPERATOR">--></SEQ> + <SEQ TYPE="OPERATOR">-></SEQ> + + <!-- Term unification --> + <SEQ TYPE="OPERATOR">=</SEQ> + <SEQ TYPE="OPERATOR">\=</SEQ> + + <!-- Term comparison --> + <SEQ TYPE="OPERATOR">@=<</SEQ> + <SEQ TYPE="OPERATOR">==</SEQ> + <SEQ TYPE="OPERATOR">\==</SEQ> + <SEQ TYPE="OPERATOR">@<</SEQ> + <SEQ TYPE="OPERATOR">@></SEQ> + <SEQ TYPE="OPERATOR">@>=</SEQ> + + <!-- Term creation and decomposition --> + <SEQ TYPE="OPERATOR">=..</SEQ> + + <!-- Arithemtic evaluation --> + <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="OPERATOR">\bis\b</SEQ_REGEXP> + + <!-- Arithemtic comparison --> + <SEQ TYPE="OPERATOR">=:=</SEQ> + <SEQ TYPE="OPERATOR">=\=</SEQ> + <SEQ TYPE="OPERATOR"><</SEQ> + <SEQ TYPE="OPERATOR">=<</SEQ> + <SEQ TYPE="OPERATOR">></SEQ> + <SEQ TYPE="OPERATOR">>=</SEQ> + + <!-- Logic and control --> + <SEQ TYPE="OPERATOR">\+</SEQ> + + <!-- Evaluable functors --> + <SEQ TYPE="OPERATOR">+</SEQ> + <SEQ TYPE="OPERATOR">-</SEQ> + <SEQ TYPE="OPERATOR">*</SEQ> + <SEQ TYPE="OPERATOR">//</SEQ> + <SEQ TYPE="OPERATOR">/</SEQ> + + <!-- Other arithemtic functors --> + <SEQ TYPE="OPERATOR">**</SEQ> + + <!-- Bitwise functors --> + <SEQ TYPE="OPERATOR">>></SEQ> + <SEQ TYPE="OPERATOR"><<</SEQ> + <SEQ TYPE="OPERATOR">/\</SEQ> + <SEQ TYPE="OPERATOR">\/</SEQ> + <SEQ TYPE="OPERATOR">\</SEQ> + + <!-- Clause operators --> + <SEQ TYPE="OPERATOR">.</SEQ> + <SEQ_REGEXP TYPE="OPERATOR">\s:-($|\s)</SEQ_REGEXP> + + <!-- Mode operators --> + <SEQ TYPE="OPERATOR">+</SEQ> + <SEQ TYPE="OPERATOR">-</SEQ> + <SEQ TYPE="OPERATOR">?</SEQ> + <SEQ TYPE="OPERATOR">@</SEQ> + + <!-- Existential quantifier operator --> + <SEQ TYPE="OPERATOR">^</SEQ> + + <KEYWORDS AT_WORD_START="TRUE"> <!-- just for code completion to work! --> + + <NULL>abolish</NULL> + <NULL>abolish_category</NULL> + <NULL>abolish_events</NULL> + <NULL>abolish_object</NULL> + <NULL>abolish_protocol</NULL> + <NULL>after</NULL> + <NULL>alias</NULL> + <NULL>arg</NULL> + <NULL>asserta</NULL> + <NULL>assertz</NULL> + <NULL>atom</NULL> + <NULL>atomic</NULL> + <NULL>atom_chars</NULL> + <NULL>atom_codes</NULL> + <NULL>atom_concat</NULL> + <NULL>atom_length</NULL> + <NULL>at_end_of_stream</NULL> + <NULL>bagof</NULL> + <NULL>before</NULL> + <NULL>call</NULL> + <NULL>calls</NULL> + <NULL>catch</NULL> + <NULL>category</NULL> + <NULL>category_property</NULL> + <NULL>char_code</NULL> + <NULL>char_conversion</NULL> + <NULL>clause</NULL> + <NULL>close</NULL> + <NULL>complements</NULL> + <NULL>complements_object</NULL> + <NULL>compound</NULL> + <NULL>copy_term</NULL> + <NULL>create_category</NULL> + <NULL>create_object</NULL> + <NULL>create_protocol</NULL> + <NULL>current_category</NULL> + <NULL>current_char_conversion</NULL> + <NULL>current_event</NULL> + <NULL>current_input</NULL> + <NULL>current_logtalk_flag</NULL> + <NULL>current_object</NULL> + <NULL>current_op</NULL> + <NULL>current_output</NULL> + <NULL>current_predicate</NULL> + <NULL>current_prolog_flag</NULL> + <NULL>current_protocol</NULL> + <NULL>define_events</NULL> + <NULL>discontiguous</NULL> + <NULL>dynamic</NULL> + <NULL>encoding</NULL> + <NULL>end_category</NULL> + <NULL>end_object</NULL> + <NULL>end_protocol</NULL> + <NULL>expand_term</NULL> + <NULL>extends</NULL> + <NULL>extends_object</NULL> + <NULL>extends_protocol</NULL> + <NULL>extends_category</NULL> + <NULL>fail</NULL> + <NULL>findall</NULL> + <NULL>float</NULL> + <NULL>flush_output</NULL> + <NULL>forall</NULL> + <NULL>functor</NULL> + <NULL>get_byte</NULL> + <NULL>get_char</NULL> + <NULL>get_code</NULL> + <NULL>halt</NULL> + <NULL>implements</NULL> + <NULL>implements_protocol</NULL> + <NULL>imports</NULL> + <NULL>imports_category</NULL> + <NULL>info</NULL> + <NULL>initialization</NULL> + <NULL>instantiates</NULL> + <NULL>instantiates_class</NULL> + <NULL>integer</NULL> + <NULL>logtalk_compile</NULL> + <NULL>logtalk_library_path</NULL> + <NULL>logtalk_load</NULL> + <NULL>meta_predicate</NULL> + <NULL>mode</NULL> + <NULL>nl</NULL> + <NULL>nonvar</NULL> + <NULL>number</NULL> + <NULL>number_chars</NULL> + <NULL>number_codes</NULL> + <NULL>object</NULL> + <NULL>object_property</NULL> + <NULL>once</NULL> + <NULL>op</NULL> + <NULL>open</NULL> + <NULL>parameter</NULL> + <NULL>peek_byte</NULL> + <NULL>peek_char</NULL> + <NULL>peek_code</NULL> + <NULL>phrase</NULL> + <NULL>predicate_property</NULL> + <NULL>private</NULL> + <NULL>protected</NULL> + <NULL>protocol</NULL> + <NULL>protocol_property</NULL> + <NULL>public</NULL> + <NULL>put_byte</NULL> + <NULL>put_char</NULL> + <NULL>put_code</NULL> + <NULL>read</NULL> + <NULL>read_term</NULL> + <NULL>repeat</NULL> + <NULL>retract</NULL> + <NULL>retractall</NULL> + <NULL>self</NULL> + <NULL>sender</NULL> + <NULL>setof</NULL> + <NULL>set_input</NULL> + <NULL>set_logtalk_flag</NULL> + <NULL>set_output</NULL> + <NULL>set_prolog_flag</NULL> + <NULL>set_stream_position</NULL> + <NULL>specializes</NULL> + <NULL>specializes_class</NULL> + <NULL>stream_property</NULL> + <NULL>sub_atom</NULL> + <NULL>synchronized</NULL> + <NULL>goal_expansion</NULL> + <NULL>term_expansion</NULL> + <NULL>this</NULL> + <NULL>threaded</NULL> + <NULL>threaded_call</NULL> + <NULL>threaded_once</NULL> + <NULL>threaded_ignore</NULL> + <NULL>threaded_exit</NULL> + <NULL>threaded_peek</NULL> + <NULL>threaded_wait</NULL> + <NULL>threaded_notify</NULL> + <NULL>throw</NULL> + <NULL>true</NULL> + <NULL>unify_with_occurs_check</NULL> + <NULL>uses</NULL> + <NULL>var</NULL> + <NULL>write</NULL> + <NULL>writeq</NULL> + <NULL>write_canonical</NULL> + <NULL>abs</NULL> + <NULL>atan</NULL> + <NULL>ceiling</NULL> + <NULL>cos</NULL> + <NULL>exp</NULL> + <NULL>float_fractional_part</NULL> + <NULL>float_integer_part</NULL> + <NULL>floor</NULL> + <NULL>log</NULL> + <NULL>mod</NULL> + <NULL>rem</NULL> + <NULL>round</NULL> + <NULL>sign</NULL> + <NULL>sin</NULL> + <NULL>sqrt</NULL> + <NULL>truncate</NULL> + + </KEYWORDS> + + </RULES> + +</MODE> + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2010-01-23 23:45:12
|
Revision: 17051 http://jedit.svn.sourceforge.net/jedit/?rev=17051&view=rev Author: ezust Date: 2010-01-23 23:45:05 +0000 (Sat, 23 Jan 2010) Log Message: ----------- Removed logtalk.xml mode since it only goes in jedit 4.4. Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/modes/catalog Removed Paths: ------------- jEdit/branches/4.3.x/modes/logtalk.xml Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-23 23:31:59 UTC (rev 17050) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-23 23:45:05 UTC (rev 17051) @@ -32,8 +32,6 @@ }}} {{{ Editing -- Added logtalk.xml mode file (#1945284 - Paulo Moura) - }}} }}} Modified: jEdit/branches/4.3.x/modes/catalog =================================================================== --- jEdit/branches/4.3.x/modes/catalog 2010-01-23 23:31:59 UTC (rev 17050) +++ jEdit/branches/4.3.x/modes/catalog 2010-01-23 23:45:05 UTC (rev 17051) @@ -259,9 +259,6 @@ <MODE NAME="literate-haskell" FILE="literate-haskell.xml" FILE_NAME_GLOB="*.lhs" /> -<MODE NAME="logtalk" FILE="logtalk.xml" - FILE_NAME_GLOB="*.lgt" /> - <MODE NAME="lotos" FILE="lotos.xml" FILE_NAME_GLOB="*.{lot,lotos}"/> Deleted: jEdit/branches/4.3.x/modes/logtalk.xml =================================================================== --- jEdit/branches/4.3.x/modes/logtalk.xml 2010-01-23 23:31:59 UTC (rev 17050) +++ jEdit/branches/4.3.x/modes/logtalk.xml 2010-01-23 23:45:05 UTC (rev 17051) @@ -1,397 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE MODE SYSTEM "xmode.dtd"> - -<!-- jEdit 4.3 Logtalk syntax file - - written by Paulo Moura - version 1.92 - created on 5 May 2002 - last revised 5 December 2009 - - To install, copy this file to the "modes" subdirectory in jEdit - directory installation. Next, check the "catalog" file in the - same subdirectory and add (if not present) the following entry: - - <MODE NAME="logtalk" FILE="logtalk.xml" FILE_NAME_GLOB="*.{lgt}" /> ---> - -<MODE> - - <PROPS> - <PROPERTY NAME="lineComment" VALUE="%" /> - <PROPERTY NAME="commentStart" VALUE="/*" /> - <PROPERTY NAME="commentEnd" VALUE="*/" /> - <PROPERTY NAME="tabSize" VALUE="4" /> - <PROPERTY NAME="indentSize" VALUE="4" /> - <!-- Auto indent --> - <PROPERTY NAME="indentNextLine" VALUE="((^\s*:-\s(object|protocol|category)\(.*,$)|.*\s:-$)" /> - </PROPS> - - <RULES SET="MAIN" IGNORE_CASE="FALSE"> - - <!-- Comments --> - <EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN> - <SPAN TYPE="COMMENT1" NO_LINE_BREAK="FALSE"> - <BEGIN>/*</BEGIN> - <END>*/</END> - </SPAN> - - <!-- Entity directives --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(category|object|protocol)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\send_(category|object|protocol)(?=[.])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\smodule(?=[(])</SEQ_REGEXP> - <!-- Predicate scope directives --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sp(ublic|r(otected|ivate))(?=[(])</SEQ_REGEXP> - <!-- Conditional compilation directives --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(el)?if(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\se(lse|ndif)(?=[.])</SEQ_REGEXP> - <!-- Other directives --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\se(n(coding|sure_loaded)|xport)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sin(fo|itialization)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(dynamic|synchronized|threaded)(?=[.])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(alias|d(ynamic|iscontiguous)|m(eta_predicate|ode|ultifile)|s(et_(logtalk|prolog)_flag|ynchronized))(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sop(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(calls|reexport|use(s|_module))(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])</SEQ_REGEXP> - - <!-- Event handlers --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(after|before)(?=[(])</SEQ_REGEXP> - <!-- Method execution context --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(parameter|this|se(lf|nder))(?=[(])</SEQ_REGEXP> - <!-- Reflection --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_predicate|predicate_property)(?=[(])</SEQ_REGEXP> - <!-- DCGs --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP> - <!-- Entity --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(object|protocol|category)_property(?=[(])</SEQ_REGEXP> - <!-- Entity relations --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bcomplements_object(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bextends_(object|protocol|category)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bimp(lements_protocol|orts_category)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(instantiat|specializ)es_class(?=[(])</SEQ_REGEXP> - <!-- Events --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_event|(abolish|define)_events)(?=[(])</SEQ_REGEXP> - <!-- Flags --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current|set)_logtalk_flag(?=[(])</SEQ_REGEXP> - <!-- Compiling, loading, and library paths --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\blogtalk_(compile|l(ibrary_path|oad))(?=[(])</SEQ_REGEXP> - <!-- Database --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(clause|retract(all)?)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\ba(bolish|ssert(a|z))(?=[(])</SEQ_REGEXP> - <!-- Control --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(ca(ll|tch)|throw)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(fail|true)\b</SEQ_REGEXP> - <!-- All solutions --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b((bag|set)of|f(ind|or)all)(?=[(])</SEQ_REGEXP> - <!-- Multi-threading meta-predicates --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bthreaded(_(call|once|ignore|exit|peek|wait|notify))?(?=[(])</SEQ_REGEXP> - <!-- Term unification --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bunify_with_occurs_check(?=[(])</SEQ_REGEXP> - <!-- Term creation and decomposition --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(functor|arg|copy_term)(?=[(])</SEQ_REGEXP> - <!-- Evaluable functors --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(rem|mod|abs|sign)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bfloat(_(integer|fractional)_part)?(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(floor|truncate|round|ceiling)(?=[(])</SEQ_REGEXP> - <!-- Other arithmetic functors --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(cos|atan|exp|log|s(in|qrt))(?=[(])</SEQ_REGEXP> - <!-- Term testing --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])</SEQ_REGEXP> - <!-- Stream selection and control --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current|set)_(in|out)put(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(open|close)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bflush_output(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(flush_output|at_end_of_stream)\b</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(stream_property|at_end_of_stream|set_stream_position)(?=[(])</SEQ_REGEXP> - <!-- Character and byte input/output --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(nl|(get|peek|put)_(byte|c(har|ode)))(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bnl\b</SEQ_REGEXP> - <!-- Term input/output --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bread(_term)?(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bwrite(q|_(canonical|term))?(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_)?op(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_)?char_conversion(?=[(])</SEQ_REGEXP> - <!-- Atomic term processing --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\batom_(length|c(hars|o(ncat|des)))(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(char_code|sub_atom)(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bnumber_c(hars|odes)(?=[(])</SEQ_REGEXP> - <!-- Implementation defined hooks functions --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(set|current)_prolog_flag(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bhalt\b</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bhalt(?=[(])</SEQ_REGEXP> - <!-- Logic and control --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bonce(?=[(])</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\brepeat\b</SEQ_REGEXP> - - <!-- Variables --> - <SEQ_REGEXP HASH_CHARS="_ABCDEFGHIJKLMNOPQRSTUVWXYZ" AT_WORD_START="TRUE" TYPE="MARKUP">[_A-Z]+[a-zA-Z0-9]*</SEQ_REGEXP> - - <!-- String literals --> - <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE"> - <BEGIN>'</BEGIN> - <END>'</END> - </SPAN> - <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE"> - <BEGIN>"</BEGIN> - <END>"</END> - </SPAN> - - <!-- External call --> - <SPAN TYPE="OPERATOR" DELEGATE="MAIN"> - <BEGIN>{</BEGIN> - <END>}</END> - </SPAN> - - <!-- Character code constants --> - <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0'.</SEQ_REGEXP> - <!-- Binary, octal, and hexadecimal numbers --> - <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0b[0-1]+</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0o[0-7]+</SEQ_REGEXP> - <SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0x\p{XDigit}+</SEQ_REGEXP> - <!-- Numbers --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="DIGIT">\d+(\.\d+)?([eE]([-+])?\d+)?</SEQ_REGEXP> - - <!-- Logtalk message sending operators --> - <SEQ TYPE="OPERATOR">::</SEQ> - <SEQ TYPE="OPERATOR">^^</SEQ> - - <!-- Other Logtalk control construct operators --> - <SEQ_REGEXP TYPE="OPERATOR">:(?![:-])</SEQ_REGEXP> - - <!-- Control constructs --> - <SEQ TYPE="OPERATOR">!</SEQ> - <SEQ TYPE="OPERATOR">,</SEQ> - <SEQ TYPE="OPERATOR">;</SEQ> - <SEQ TYPE="OPERATOR">--></SEQ> - <SEQ TYPE="OPERATOR">-></SEQ> - - <!-- Term unification --> - <SEQ TYPE="OPERATOR">=</SEQ> - <SEQ TYPE="OPERATOR">\=</SEQ> - - <!-- Term comparison --> - <SEQ TYPE="OPERATOR">@=<</SEQ> - <SEQ TYPE="OPERATOR">==</SEQ> - <SEQ TYPE="OPERATOR">\==</SEQ> - <SEQ TYPE="OPERATOR">@<</SEQ> - <SEQ TYPE="OPERATOR">@></SEQ> - <SEQ TYPE="OPERATOR">@>=</SEQ> - - <!-- Term creation and decomposition --> - <SEQ TYPE="OPERATOR">=..</SEQ> - - <!-- Arithemtic evaluation --> - <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="OPERATOR">\bis\b</SEQ_REGEXP> - - <!-- Arithemtic comparison --> - <SEQ TYPE="OPERATOR">=:=</SEQ> - <SEQ TYPE="OPERATOR">=\=</SEQ> - <SEQ TYPE="OPERATOR"><</SEQ> - <SEQ TYPE="OPERATOR">=<</SEQ> - <SEQ TYPE="OPERATOR">></SEQ> - <SEQ TYPE="OPERATOR">>=</SEQ> - - <!-- Logic and control --> - <SEQ TYPE="OPERATOR">\+</SEQ> - - <!-- Evaluable functors --> - <SEQ TYPE="OPERATOR">+</SEQ> - <SEQ TYPE="OPERATOR">-</SEQ> - <SEQ TYPE="OPERATOR">*</SEQ> - <SEQ TYPE="OPERATOR">//</SEQ> - <SEQ TYPE="OPERATOR">/</SEQ> - - <!-- Other arithemtic functors --> - <SEQ TYPE="OPERATOR">**</SEQ> - - <!-- Bitwise functors --> - <SEQ TYPE="OPERATOR">>></SEQ> - <SEQ TYPE="OPERATOR"><<</SEQ> - <SEQ TYPE="OPERATOR">/\</SEQ> - <SEQ TYPE="OPERATOR">\/</SEQ> - <SEQ TYPE="OPERATOR">\</SEQ> - - <!-- Clause operators --> - <SEQ TYPE="OPERATOR">.</SEQ> - <SEQ_REGEXP TYPE="OPERATOR">\s:-($|\s)</SEQ_REGEXP> - - <!-- Mode operators --> - <SEQ TYPE="OPERATOR">+</SEQ> - <SEQ TYPE="OPERATOR">-</SEQ> - <SEQ TYPE="OPERATOR">?</SEQ> - <SEQ TYPE="OPERATOR">@</SEQ> - - <!-- Existential quantifier operator --> - <SEQ TYPE="OPERATOR">^</SEQ> - - <KEYWORDS AT_WORD_START="TRUE"> <!-- just for code completion to work! --> - - <NULL>abolish</NULL> - <NULL>abolish_category</NULL> - <NULL>abolish_events</NULL> - <NULL>abolish_object</NULL> - <NULL>abolish_protocol</NULL> - <NULL>after</NULL> - <NULL>alias</NULL> - <NULL>arg</NULL> - <NULL>asserta</NULL> - <NULL>assertz</NULL> - <NULL>atom</NULL> - <NULL>atomic</NULL> - <NULL>atom_chars</NULL> - <NULL>atom_codes</NULL> - <NULL>atom_concat</NULL> - <NULL>atom_length</NULL> - <NULL>at_end_of_stream</NULL> - <NULL>bagof</NULL> - <NULL>before</NULL> - <NULL>call</NULL> - <NULL>calls</NULL> - <NULL>catch</NULL> - <NULL>category</NULL> - <NULL>category_property</NULL> - <NULL>char_code</NULL> - <NULL>char_conversion</NULL> - <NULL>clause</NULL> - <NULL>close</NULL> - <NULL>complements</NULL> - <NULL>complements_object</NULL> - <NULL>compound</NULL> - <NULL>copy_term</NULL> - <NULL>create_category</NULL> - <NULL>create_object</NULL> - <NULL>create_protocol</NULL> - <NULL>current_category</NULL> - <NULL>current_char_conversion</NULL> - <NULL>current_event</NULL> - <NULL>current_input</NULL> - <NULL>current_logtalk_flag</NULL> - <NULL>current_object</NULL> - <NULL>current_op</NULL> - <NULL>current_output</NULL> - <NULL>current_predicate</NULL> - <NULL>current_prolog_flag</NULL> - <NULL>current_protocol</NULL> - <NULL>define_events</NULL> - <NULL>discontiguous</NULL> - <NULL>dynamic</NULL> - <NULL>encoding</NULL> - <NULL>end_category</NULL> - <NULL>end_object</NULL> - <NULL>end_protocol</NULL> - <NULL>expand_term</NULL> - <NULL>extends</NULL> - <NULL>extends_object</NULL> - <NULL>extends_protocol</NULL> - <NULL>extends_category</NULL> - <NULL>fail</NULL> - <NULL>findall</NULL> - <NULL>float</NULL> - <NULL>flush_output</NULL> - <NULL>forall</NULL> - <NULL>functor</NULL> - <NULL>get_byte</NULL> - <NULL>get_char</NULL> - <NULL>get_code</NULL> - <NULL>halt</NULL> - <NULL>implements</NULL> - <NULL>implements_protocol</NULL> - <NULL>imports</NULL> - <NULL>imports_category</NULL> - <NULL>info</NULL> - <NULL>initialization</NULL> - <NULL>instantiates</NULL> - <NULL>instantiates_class</NULL> - <NULL>integer</NULL> - <NULL>logtalk_compile</NULL> - <NULL>logtalk_library_path</NULL> - <NULL>logtalk_load</NULL> - <NULL>meta_predicate</NULL> - <NULL>mode</NULL> - <NULL>nl</NULL> - <NULL>nonvar</NULL> - <NULL>number</NULL> - <NULL>number_chars</NULL> - <NULL>number_codes</NULL> - <NULL>object</NULL> - <NULL>object_property</NULL> - <NULL>once</NULL> - <NULL>op</NULL> - <NULL>open</NULL> - <NULL>parameter</NULL> - <NULL>peek_byte</NULL> - <NULL>peek_char</NULL> - <NULL>peek_code</NULL> - <NULL>phrase</NULL> - <NULL>predicate_property</NULL> - <NULL>private</NULL> - <NULL>protected</NULL> - <NULL>protocol</NULL> - <NULL>protocol_property</NULL> - <NULL>public</NULL> - <NULL>put_byte</NULL> - <NULL>put_char</NULL> - <NULL>put_code</NULL> - <NULL>read</NULL> - <NULL>read_term</NULL> - <NULL>repeat</NULL> - <NULL>retract</NULL> - <NULL>retractall</NULL> - <NULL>self</NULL> - <NULL>sender</NULL> - <NULL>setof</NULL> - <NULL>set_input</NULL> - <NULL>set_logtalk_flag</NULL> - <NULL>set_output</NULL> - <NULL>set_prolog_flag</NULL> - <NULL>set_stream_position</NULL> - <NULL>specializes</NULL> - <NULL>specializes_class</NULL> - <NULL>stream_property</NULL> - <NULL>sub_atom</NULL> - <NULL>synchronized</NULL> - <NULL>goal_expansion</NULL> - <NULL>term_expansion</NULL> - <NULL>this</NULL> - <NULL>threaded</NULL> - <NULL>threaded_call</NULL> - <NULL>threaded_once</NULL> - <NULL>threaded_ignore</NULL> - <NULL>threaded_exit</NULL> - <NULL>threaded_peek</NULL> - <NULL>threaded_wait</NULL> - <NULL>threaded_notify</NULL> - <NULL>throw</NULL> - <NULL>true</NULL> - <NULL>unify_with_occurs_check</NULL> - <NULL>uses</NULL> - <NULL>var</NULL> - <NULL>write</NULL> - <NULL>writeq</NULL> - <NULL>write_canonical</NULL> - <NULL>abs</NULL> - <NULL>atan</NULL> - <NULL>ceiling</NULL> - <NULL>cos</NULL> - <NULL>exp</NULL> - <NULL>float_fractional_part</NULL> - <NULL>float_integer_part</NULL> - <NULL>floor</NULL> - <NULL>log</NULL> - <NULL>mod</NULL> - <NULL>rem</NULL> - <NULL>round</NULL> - <NULL>sign</NULL> - <NULL>sin</NULL> - <NULL>sqrt</NULL> - <NULL>truncate</NULL> - - </KEYWORDS> - - </RULES> - -</MODE> - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2010-01-28 23:26:59
|
Revision: 17128 http://jedit.svn.sourceforge.net/jedit/?rev=17128&view=rev Author: Vampire0 Date: 2010-01-28 23:26:49 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Updated the version number to 4.3.2. Modified Paths: -------------- jEdit/branches/4.3.x/build.xml jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java Modified: jEdit/branches/4.3.x/build.xml =================================================================== --- jEdit/branches/4.3.x/build.xml 2010-01-28 23:07:01 UTC (rev 17127) +++ jEdit/branches/4.3.x/build.xml 2010-01-28 23:26:49 UTC (rev 17128) @@ -10,9 +10,9 @@ <!-- jEdit Version --> <property name="jedit.version" - value="4.3.1" /> + value="4.3.2" /> <property name="jedit.build.number" - value="04.03.99.01" /> + value="04.03.99.02" /> <!-- Target Java Versions --> <property name="target.java.version" Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-28 23:07:01 UTC (rev 17127) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-01-28 23:26:49 UTC (rev 17128) @@ -1,5 +1,28 @@ JEDIT 4.3 VERSION HISTORY +{{{ Version 4.3.2 + +Thanks to Bj\xF6rn "Vampire" Kautler for contributing to this release. + +{{{ Bug Fixes + + +}}} +{{{ Miscellaneous + + +}}} +{{{ API Changes + + +}}} +{{{ Editing + + +}}} + +}}} + {{{ Version 4.3.1 Thanks to Bj\xF6rn "Vampire" Kautler, Alan Ezust, Damien Radtke, @@ -22,20 +45,9 @@ (Shlomy Reinstein) }}} -{{{ Miscellaneous - }}} -{{{ API Changes - -}}} -{{{ Editing - -}}} - -}}} - {{{ Version 4.3 Thanks to Bj\xF6rn "Vampire" Kautler, Marcelo Vanzin, Matthieu Casanova, Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java 2010-01-28 23:07:01 UTC (rev 17127) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/jEdit.java 2010-01-28 23:26:49 UTC (rev 17128) @@ -91,7 +91,7 @@ public static String getBuild() { // (major).(minor).(<99 = preX, 99 = "final").(bug fix) - return "04.03.99.01"; + return "04.03.99.02"; } //}}} //{{{ main() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2010-02-18 18:35:58
|
Revision: 17316 http://jedit.svn.sourceforge.net/jedit/?rev=17316&view=rev Author: ezust Date: 2010-02-18 18:35:52 +0000 (Thu, 18 Feb 2010) Log Message: ----------- back-patched bug #2927555: beanshell load() fails w/ exception. Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/bsh/commands/load.bsh Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-02-18 18:19:38 UTC (rev 17315) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-02-18 18:35:52 UTC (rev 17316) @@ -5,8 +5,8 @@ Thanks to Bj\xF6rn "Vampire" Kautler for contributing to this release. {{{ Bug Fixes +Fixed bug #2927555: beanshell load() fails w/ exception (Shlomy Reinstein) - }}} {{{ Miscellaneous Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/bsh/commands/load.bsh =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/bsh/commands/load.bsh 2010-02-18 18:19:38 UTC (rev 17315) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/bsh/commands/load.bsh 2010-02-18 18:35:52 UTC (rev 17316) @@ -12,7 +12,7 @@ import org.gjt.sp.jedit.bsh.Capabilities; -if ( Capabilities.classExists("bsh.ClassGeneratorImpl") ) +if ( Capabilities.classExists("org.gjt.sp.jedit.bsh.ClassGeneratorImpl") ) { public class BshObjectInputStream extends ObjectInputStream { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2010-03-01 20:55:36
|
Revision: 17409 http://jedit.svn.sourceforge.net/jedit/?rev=17409&view=rev Author: ezust Date: 2010-03-01 20:55:30 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Display java.vendor in the about dialog box. Modified Paths: -------------- jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/AboutDialog.java jEdit/branches/4.3.x/org/gjt/sp/jedit/jedit_gui.props Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17408 Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/AboutDialog.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/AboutDialog.java 2010-03-01 20:25:00 UTC (rev 17408) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/AboutDialog.java 2010-03-01 20:55:30 UTC (rev 17409) @@ -130,7 +130,7 @@ } else mode = jEdit.getProperty("about.mode.standalone"); - String[] args = { jEdit.getVersion(), mode, System.getProperty("java.version") }; + String[] args = { jEdit.getVersion(), mode, System.getProperty("java.vendor"), System.getProperty("java.version") }; sBottomLine = jEdit.getProperty("about.version",args); setFont(defaultFont); fm = getFontMetrics(defaultFont); Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/jedit_gui.props 2010-03-01 20:25:00 UTC (rev 17408) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/jedit_gui.props 2010-03-01 20:55:30 UTC (rev 17409) @@ -943,7 +943,7 @@ #{{{ About dialog about.title=About jEdit -about.version=jEdit {0} {1} mode, using Java {2} +about.version=jEdit {0} {1} mode, using {2} Java {3} about.mode.standalone=standalone about.mode.server=server about.mode.server-background=server-background This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2010-03-18 20:01:18
|
Revision: 17493 http://jedit.svn.sourceforge.net/jedit/?rev=17493&view=rev Author: kpouer Date: 2010-03-18 20:01:11 +0000 (Thu, 18 Mar 2010) Log Message: ----------- merge request 2938659 to fix a memory leak when removing edit pane Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-18 04:42:11 UTC (rev 17492) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-18 20:01:11 UTC (rev 17493) @@ -44,6 +44,9 @@ - Fixed #2920352: Can't disable "Restore previously open files on startup". (Shlomy Reinstein) +- Fixed a memory leak which held closed View and EditPane when using + global bufferset scope. (Kazutoshi Satoda) + }}} }}} Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java 2010-03-18 04:42:11 UTC (rev 17492) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java 2010-03-18 20:01:11 UTC (rev 17493) @@ -950,6 +950,7 @@ { saveCaretInfo(); EditBus.send(new EditPaneUpdate(this,EditPaneUpdate.DESTROYED)); + bufferSet.removeBufferSetListener(this); EditBus.removeFromBus(this); textArea.dispose(); } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2010-03-18 21:47:12
|
Revision: 17494 http://jedit.svn.sourceforge.net/jedit/?rev=17494&view=rev Author: kpouer Date: 2010-03-18 21:47:05 +0000 (Thu, 18 Mar 2010) Log Message: ----------- reverting my merge that was not so well done, try again Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-18 20:01:11 UTC (rev 17493) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-18 21:47:05 UTC (rev 17494) @@ -44,9 +44,6 @@ - Fixed #2920352: Can't disable "Restore previously open files on startup". (Shlomy Reinstein) -- Fixed a memory leak which held closed View and EditPane when using - global bufferset scope. (Kazutoshi Satoda) - }}} }}} Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java 2010-03-18 20:01:11 UTC (rev 17493) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java 2010-03-18 21:47:05 UTC (rev 17494) @@ -950,7 +950,6 @@ { saveCaretInfo(); EditBus.send(new EditPaneUpdate(this,EditPaneUpdate.DESTROYED)); - bufferSet.removeBufferSetListener(this); EditBus.removeFromBus(this); textArea.dispose(); } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2010-03-19 17:20:38
|
Revision: 17498 http://jedit.svn.sourceforge.net/jedit/?rev=17498&view=rev Author: kpouer Date: 2010-03-19 17:20:31 +0000 (Fri, 19 Mar 2010) Log Message: ----------- merged revision r17061, fixing memory leak when closing an edit pane (merge request:2938659) Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17408 + /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17408 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-19 17:01:29 UTC (rev 17497) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-19 17:20:31 UTC (rev 17498) @@ -44,6 +44,9 @@ - Fixed #2920352: Can't disable "Restore previously open files on startup". (Shlomy Reinstein) +- Fixed a memory leak which held closed View and EditPane when using + global bufferset scope. (Kazutoshi Satoda) + }}} }}} Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java 2010-03-19 17:01:29 UTC (rev 17497) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/EditPane.java 2010-03-19 17:20:31 UTC (rev 17498) @@ -950,6 +950,7 @@ { saveCaretInfo(); EditBus.send(new EditPaneUpdate(this,EditPaneUpdate.DESTROYED)); + bufferSet.removeBufferSetListener(this); EditBus.removeFromBus(this); textArea.dispose(); } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2010-03-29 19:03:44
|
Revision: 17550 http://jedit.svn.sourceforge.net/jedit/?rev=17550&view=rev Author: k_satoda Date: 2010-03-29 19:03:37 +0000 (Mon, 29 Mar 2010) Log Message: ----------- Reviewed and accepted SF.net merge request #2973424: Fixed the order of setDirty() and fireContentRemoved() so that the handler can reliably test isDirty(). (SF.net bug #2944145) Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/buffer/JEditBuffer.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17408 + /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17219,17408 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-29 19:02:14 UTC (rev 17549) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-29 19:03:37 UTC (rev 17550) @@ -11,6 +11,9 @@ - Fixed a memory leak which held closed View and EditPane when using global bufferset scope. (Kazutoshi Satoda) +- When removing text from the buffer, the event contentRemoved was sent before + making the buffer dirty (oman002 #2944145) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/buffer/JEditBuffer.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/buffer/JEditBuffer.java 2010-03-29 19:02:14 UTC (rev 17549) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/buffer/JEditBuffer.java 2010-03-29 19:03:37 UTC (rev 17550) @@ -760,13 +760,14 @@ lineMgr.contentRemoved(startLine,offset,numLines,length); positionMgr.contentRemoved(offset,length); + setDirty(true); + fireContentRemoved(startLine,offset,numLines,length); /* otherwise it will be delivered later */ if(!undoInProgress && !insideCompoundEdit()) fireTransactionComplete(); - setDirty(true); } finally { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2010-03-31 17:49:19
|
Revision: 17563 http://jedit.svn.sourceforge.net/jedit/?rev=17563&view=rev Author: k_satoda Date: 2010-03-31 17:49:11 +0000 (Wed, 31 Mar 2010) Log Message: ----------- Reviewed and accepted SF.net merge request #2971638: Fixed a NPE that happened when an error occurs before the view is loaded. (SF.net bug #2905487) Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/ErrorListDialog.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17219,17408 + /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16754-16755,16805,16846,17219,17408,17479 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-31 17:12:48 UTC (rev 17562) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2010-03-31 17:49:11 UTC (rev 17563) @@ -6,6 +6,9 @@ {{{ Bug Fixes +- Fixed a NPE that happens when an error occurs before the view is loaded + (Matthieu Casanova #2905487) + - Fixed bug #2927555: beanshell load() fails w/ exception (Shlomy Reinstein) - Fixed a memory leak which held closed View and EditPane when using Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/ErrorListDialog.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/ErrorListDialog.java 2010-03-31 17:12:48 UTC (rev 17562) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/gui/ErrorListDialog.java 2010-03-31 17:49:11 UTC (rev 17563) @@ -123,10 +123,10 @@ JTextPane errors = new JTextPane(); errors.setEditable(false); - errors.setForeground( jEdit.getColorProperty("view.fgColor") ); - errors.setBackground( jEdit.getColorProperty("view.bgColor") ); - errors.setCaretColor( jEdit.getActiveView().getEditPane().getTextArea().getPainter().getCaretColor() ); - errors.setSelectionColor( jEdit.getActiveView().getEditPane().getTextArea().getPainter().getSelectionColor() ); + errors.setForeground(jEdit.getColorProperty("view.fgColor")); + errors.setBackground(jEdit.getColorProperty("view.bgColor")); + errors.setCaretColor(jEdit.getColorProperty("view.caretColor")); + errors.setSelectionColor(jEdit.getColorProperty("view.selectionColor")); StyledDocument doc = errors.getStyledDocument(); Font plainFont = new JLabel().getFont(); SimpleAttributeSet plainFontAttrSet = new SimpleAttributeSet(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2010-04-02 12:10:09
|
Revision: 17573 http://jedit.svn.sourceforge.net/jedit/?rev=17573&view=rev Author: Vampire0 Date: 2010-04-02 12:10:02 +0000 (Fri, 02 Apr 2010) Log Message: ----------- updating project files for IDEA 9 Modified Paths: -------------- jEdit/branches/4.3.x/jEdit.iml jEdit/branches/4.3.x/jEdit.ipr Modified: jEdit/branches/4.3.x/jEdit.iml =================================================================== --- jEdit/branches/4.3.x/jEdit.iml 2010-04-02 04:21:09 UTC (rev 17572) +++ jEdit/branches/4.3.x/jEdit.iml 2010-04-02 12:10:02 UTC (rev 17573) @@ -1,21 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/build/jedit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - </component> -</module> - +<?xml version="1.0" encoding="UTF-8"?> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/build/jedit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + </component> +</module> + Modified: jEdit/branches/4.3.x/jEdit.ipr =================================================================== --- jEdit/branches/4.3.x/jEdit.ipr 2010-04-02 04:21:09 UTC (rev 17572) +++ jEdit/branches/4.3.x/jEdit.ipr 2010-04-02 12:10:02 UTC (rev 17573) @@ -1,722 +1,1732 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project relativePaths="true" version="4"> - <component name="AntConfiguration"> - <defaultAnt bundledAnt="true" /> - <buildFile url="file://$PROJECT_DIR$/build.xml"> - <additionalClassPath /> - <antReference projectDefault="true" /> - <customJdkName value="" /> - <maximumHeapSize value="128" /> - <maximumStackSize value="32" /> - <properties /> - <executeOn event="beforeRun" target="build" runConfigurationType="Application" runConfigurationName="jEdit" /> - </buildFile> - <buildFile url="file://$PROJECT_DIR$/jars/LatestVersion/build.xml"> - <additionalClassPath /> - <antReference projectDefault="true" /> - <customJdkName value="" /> - <maximumHeapSize value="128" /> - <maximumStackSize value="32" /> - <properties /> - </buildFile> - <buildFile url="file://$PROJECT_DIR$/jars/MacOSX/build.xml"> - <additionalClassPath /> - <antReference projectDefault="true" /> - <customJdkName value="" /> - <maximumHeapSize value="128" /> - <maximumStackSize value="32" /> - <properties /> - </buildFile> - <buildFile url="file://$PROJECT_DIR$/jars/QuickNotepad/build.xml"> - <additionalClassPath /> - <antReference projectDefault="true" /> - <customJdkName value="" /> - <maximumHeapSize value="128" /> - <maximumStackSize value="32" /> - <properties /> - </buildFile> - </component> - <component name="BuildJarProjectSettings"> - <option name="BUILD_JARS_ON_MAKE" value="false" /> - </component> - <component name="CodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS"> - <value> - <ADDITIONAL_INDENT_OPTIONS fileType="java"> - <option name="INDENT_SIZE" value="4" /> - <option name="CONTINUATION_INDENT_SIZE" value="8" /> - <option name="TAB_SIZE" value="4" /> - <option name="USE_TAB_CHARACTER" value="false" /> - <option name="SMART_TABS" value="false" /> - <option name="LABEL_INDENT_SIZE" value="0" /> - <option name="LABEL_INDENT_ABSOLUTE" value="false" /> - </ADDITIONAL_INDENT_OPTIONS> - <ADDITIONAL_INDENT_OPTIONS fileType="xml"> - <option name="INDENT_SIZE" value="4" /> - <option name="CONTINUATION_INDENT_SIZE" value="8" /> - <option name="TAB_SIZE" value="4" /> - <option name="USE_TAB_CHARACTER" value="false" /> - <option name="SMART_TABS" value="false" /> - <option name="LABEL_INDENT_SIZE" value="0" /> - <option name="LABEL_INDENT_ABSOLUTE" value="false" /> - </ADDITIONAL_INDENT_OPTIONS> - </value> - </option> - <option name="USE_PER_PROJECT_SETTINGS" value="false" /> - </component> - <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="DEPLOY_AFTER_MAKE" value="1" /> - <resourceExtensions> - <entry name=".+\.(properties|xml|html|dtd|tld)" /> - <entry name=".+\.(gif|png|jpeg|jpg)" /> - </resourceExtensions> - <wildcardResourcePatterns> - <entry name="?*.properties" /> - <entry name="?*.props" /> - <entry name="?*.xml" /> - <entry name="?*.gif" /> - <entry name="?*.png" /> - <entry name="?*.jpeg" /> - <entry name="?*.jpg" /> - <entry name="?*.html" /> - <entry name="?*.dtd" /> - <entry name="?*.tld" /> - <entry name="?*.ftl" /> - </wildcardResourcePatterns> - </component> - <component name="DependencyValidationManager"> - <scope name="jEdit Sourcefiles" pattern="file[jEdit]:org//*.java" /> - <scope name="Modes" pattern="file[jEdit]:modes//*.xml" /> - <scope name="Macros" pattern="file[jEdit]:macros//*.bsh" /> - <scope name="LatestVersion Sourcefiles" pattern="file[LatestVersion]:*.java" /> - <scope name="MacOSX Sourcefiles" pattern="file[MacOSX]:macosx//*.java" /> - <scope name="QuickNotepad Sourcefiles" pattern="file[QuickNotepad]:*.java" /> - <option name="SKIP_IMPORT_STATEMENTS" value="false" /> - </component> - <component name="EclipseCompilerSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="true" /> - <option name="DEPRECATION" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="ISO-8859-1" /> - <component name="IdProvider" IDEtalkID="F2207F966C6969E072D5CD57D729D7EA" /> - <component name="InspectionProjectProfileManager"> - <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> - <scopes /> - <profiles> - <profile version="1.0" is_locked="false"> - <option name="myName" value="Project Default" /> - <option name="myLocal" value="false" /> - </profile> - </profiles> - <list size="0" /> - </component> - <component name="IssueNavigationConfiguration"> - <option name="links"> - <list> - <IssueNavigationLink> - <option name="issueRegexp" value="\d+" /> - <option name="linkRegexp" value="http://sourceforge.net/support/tracker.php?aid=$0" /> - </IssueNavigationLink> - </list> - </option> - </component> - <component name="JavacSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="DEPRECATION" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="JavadocGenerationManager"> - <option name="OUTPUT_DIRECTORY" /> - <option name="OPTION_SCOPE" value="protected" /> - <option name="OPTION_HIERARCHY" value="true" /> - <option name="OPTION_NAVIGATOR" value="true" /> - <option name="OPTION_INDEX" value="true" /> - <option name="OPTION_SEPARATE_INDEX" value="true" /> - <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> - <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> - <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> - <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> - <option name="OPTION_DEPRECATED_LIST" value="true" /> - <option name="OTHER_OPTIONS" value="" /> - <option name="HEAP_SIZE" /> - <option name="LOCALE" /> - <option name="OPEN_IN_BROWSER" value="true" /> - </component> - <component name="JikesSettings"> - <option name="JIKES_PATH" value="" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="DEPRECATION" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="IS_EMACS_ERRORS_MODE" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="Palette2"> - <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> - </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> - <initial-values> - <property name="text" value="Button" /> - </initial-values> - </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="RadioButton" /> - </initial-values> - </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="CheckBox" /> - </initial-values> - </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="Label" /> - </initial-values> - </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> - <preferred-size width="-1" height="20" /> - </default-constraints> - </item> - <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> - </item> - </group> - </component> - <component name="ProjectDetails"> - <option name="projectName" value="jEdit" /> - </component> - <component name="ProjectFileVersion" converted="true" /> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/jars/LatestVersion/LatestVersion.iml" filepath="$PROJECT_DIR$/jars/LatestVersion/LatestVersion.iml" /> - <module fileurl="file://$PROJECT_DIR$/jars/MacOSX/MacOSX.iml" filepath="$PROJECT_DIR$/jars/MacOSX/MacOSX.iml" /> - <module fileurl="file://$PROJECT_DIR$/jars/QuickNotepad/QuickNotepad.iml" filepath="$PROJECT_DIR$/jars/QuickNotepad/QuickNotepad.iml" /> - <module fileurl="file://$PROJECT_DIR$/jEdit.iml" filepath="$PROJECT_DIR$/jEdit.iml" /> - </modules> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/build/idea" /> - </component> - <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="jEdit" type="Application" factoryName="Application" enabled="false" merge="false" sample_coverage="true" runner="emma"> - <log_file path="$PROJECT_DIR$/build/settings/activity.log" checked="true" skipped="false" show_all="false" alias="Activity Log" /> - <option name="MAIN_CLASS_NAME" value="org.gjt.sp.jedit.jEdit" /> - <option name="VM_PARAMETERS" value="-Xmx192M" /> - <option name="PROGRAM_PARAMETERS" value="-settings="$PROJECT_DIR$/build/settings"" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" value="" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="jEdit" /> - <envs /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="1341" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="true" /> - </RunnerSettings> - <RunnerSettings RunnerId="JProfiler"> - <option name="WINDOW" value="false" /> - <option name="JVMPI" value="false" /> - <option name="INTERPRETED" value="false" /> - </RunnerSettings> - <RunnerSettings RunnerId="Run" /> - <ConfigurationWrapper RunnerId="Debug" /> - <ConfigurationWrapper RunnerId="JProfiler" /> - <ConfigurationWrapper RunnerId="Run" /> - <method> - <option name="Run Ant target" value="true" /> - <option name="Make" value="false" /> - </method> - </configuration> - </component> - <component name="RmicSettings"> - <option name="IS_EANABLED" value="false" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="GENERATE_IIOP_STUBS" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="SvnBranchConfigurationManager"> - <option name="myConfigurationMap"> - <map> - <entry key="$PROJECT_DIR$"> - <value> - <SvnBranchConfiguration> - <option name="branchMap"> - <map> - <entry key="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/branches"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1218396639209" /> - <option name="revision" value="13258" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/branches/docking_framework" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1176951697724" /> - <option name="revision" value="9462" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/branches/jedit43_nostrings" /> - </SvnBranchItem> - </list> - </value> - </entry> - <entry key="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1226862920462" /> - <option name="revision" value="14070" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre16" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1224211014440" /> - <option name="revision" value="13896" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre15" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1209312241226" /> - <option name="revision" value="12514" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre14" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1205435718427" /> - <option name="revision" value="12215" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre13" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1197063574015" /> - <option name="revision" value="11207" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre12" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1191436781626" /> - <option name="revision" value="10791" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre11" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1184190109800" /> - <option name="revision" value="10009" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre10" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172940160439" /> - <option name="revision" value="9074" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172938815897" /> - <option name="revision" value="9072" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-3-2-2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172934922377" /> - <option name="revision" value="9070" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172934620160" /> - <option name="revision" value="9069" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre7" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172934093879" /> - <option name="revision" value="9068" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172933950791" /> - <option name="revision" value="9067" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172930175040" /> - <option name="revision" value="9066" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre12" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172929632216" /> - <option name="revision" value="9065" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre9" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172929477203" /> - <option name="revision" value="9064" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre8" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172929096756" /> - <option name="revision" value="9063" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1169312622101" /> - <option name="revision" value="8692" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre9" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1163001311391" /> - <option name="revision" value="7992" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre8" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1159851355117" /> - <option name="revision" value="7163" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre7" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1155747706518" /> - <option name="revision" value="6701" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1152311295000" /> - <option name="revision" value="5556" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/after_bsh-2-0b4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1152266138000" /> - <option name="revision" value="5554" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/before_bsh-2-0b4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1152181828000" /> - <option name="revision" value="5542" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1152180149000" /> - <option name="revision" value="5540" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1152122425000" /> - <option name="revision" value="5531" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1150397246000" /> - <option name="revision" value="5442" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit_43_with_gnuregexp_microstarxml" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1147475209000" /> - <option name="revision" value="5388" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1136173007000" /> - <option name="revision" value="5329" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1110595434000" /> - <option name="revision" value="5202" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1108074918000" /> - <option name="revision" value="5182" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/before-fast-scroll" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1104528786000" /> - <option name="revision" value="5165" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-3-pre1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1094326374000" /> - <option name="revision" value="5129" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/before-selection-manager" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1094264677000" /> - <option name="revision" value="5124" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/before-screen-line-refactoring" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1093748323000" /> - <option name="revision" value="5111" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1090047563000" /> - <option name="revision" value="5085" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre15" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1086297068000" /> - <option name="revision" value="5058" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre14" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1084575691000" /> - <option name="revision" value="5043" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre13" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1079804107000" /> - <option name="revision" value="5002" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre11" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1079764835000" /> - <option name="revision" value="5000" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre10" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1072501334000" /> - <option name="revision" value="4944" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/beanshell-2-0b1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1070236854000" /> - <option name="revision" value="4927" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre7" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1067201848000" /> - <option name="revision" value="4907" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1061570577000" /> - <option name="revision" value="4867" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/crazy-pos-mgr" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1059967153000" /> - <option name="revision" value="4844" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1058223654000" /> - <option name="revision" value="4827" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/bsh-13b2-merge" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1057542014000" /> - <option name="revision" value="4821" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1054263177000" /> - <option name="revision" value="4749" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1052174343000" /> - <option name="revision" value="4685" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/beanshell-1-3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1051837211000" /> - <option name="revision" value="4676" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-2-pre1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1045976885000" /> - <option name="revision" value="4511" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/macos-2_0_4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1045871364000" /> - <option name="revision" value="4508" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre11" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1045820614000" /> - <option name="revision" value="4504" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/macos-2_0_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1045271361000" /> - <option name="revision" value="4482" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre10" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1043802516000" /> - <option name="revision" value="4451" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre9" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1042258598000" /> - <option name="revision" value="4425" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre8" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1037919166000" /> - <option name="revision" value="4380" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1029873100000" /> - <option name="revision" value="4318" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1024812657000" /> - <option name="revision" value="4284" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1024133719000" /> - <option name="revision" value="4256" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-1-pre1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1018587320000" /> - <option name="revision" value="4140" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1017715362000" /> - <option name="revision" value="4125" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre9" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1017050868000" /> - <option name="revision" value="4114" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre8" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1015742549000" /> - <option name="revision" value="4084" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre7" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1014103275000" /> - <option name="revision" value="4052" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1012890490000" /> - <option name="revision" value="4013" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1011744082000" /> - <option name="revision" value="3993" /> - <option name="url" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags/jedit-4-0-pre4" /> - </SvnBranchItem> - </list> - </value> - </entry> - </map> - </option> - <option name="branchUrls"> - <list> - <option value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/branches" /> - <option value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/tags" /> - </list> - </option> - <option name="trunkUrl" value="https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk" /> - </SvnBranchConfiguration> - </value> - </entry> - </map> - </option> - <option name="myVersion" value="124" /> - </component> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="svn" /> - </component> -</project> - +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + <buildFile url="file://$PROJECT_DIR$/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <maximumStackSize value="32" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/jars/LatestVersion/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <maximumStackSize value="32" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/jars/MacOSX/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <maximumStackSize value="32" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/jars/QuickNotepad/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <maximumStackSize value="32" /> + <properties /> + </buildFile> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS"> + <value> + <ADDITIONAL_INDENT_OPTIONS fileType="java"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="jsp"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="xml"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + </value> + </option> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.props" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + <entry name="?*.ftl" /> + </wildcardResourcePatterns> + <annotationProcessing enabled="false" useClasspath="true" /> + </component> + <component name="CopyrightManager" default="GPL v2"> + <copyright> + <option name="notice" value="jEdit - Programmer's Text Editor :tabSize=8:indentSize=8:noTabs=false: :folding=explicit:collapseFolds=1: Copyright © &#36;today.year jEdit contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." /> + <option name="keyword" value="Copyright" /> + <option name="allowReplaceKeyword" value="" /> + <option name="myName" value="GPL v2" /> + <option name="myLocal" value="true" /> + </copyright> + <module2copyright /> + <LanguageOptions name="HTML"> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="2" /> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </LanguageOptions> + <LanguageOptions name="JSP"> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="2" /> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </LanguageOptions> + <LanguageOptions name="JSPX"> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="2" /> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </LanguageOptions> + <LanguageOptions name="XML"> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="2" /> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </LanguageOptions> + </component> + <component name="DependencyValidationManager"> + <scope name="jEdit Sourcefiles" pattern="file[jEdit]:org//*.java" /> + <scope name="Modes" pattern="file[jEdit]:modes//*.xml" /> + <scope name="Macros" pattern="file[jEdit]:macros//*.bsh" /> + <scope name="LatestVersion Sourcefiles" pattern="file[LatestVersion]:*.java" /> + <scope name="MacOSX Sourcefiles" pattern="file[MacOSX]:macosx//*.java" /> + <scope name="QuickNotepad Sourcefiles" pattern="file[QuickNotepad]:*.java" /> + <option name="SKIP_IMPORT_STATEMENTS" value="false" /> + </component> + <component name="EclipseCompilerSettings"> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + </component> + <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="ISO-8859-1" /> + <component name="IdProvider" IDEtalkID="F2207F966C6969E072D5CD57D729D7EA" /> + <component name="InspectionProjectProfileManager"> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <inspection_tool class="AbstractClassNeverImplemented" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AbstractClassWithOnlyOneDirectInheritor" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AbstractClassWithoutAbstractMethods" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AbstractMethodCallInConstructor" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AbstractMethodOverridesAbstractMethod" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AbstractMethodOverridesConcreteMethod" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AbstractMethodWithMissingImplementations" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AccessToNonThreadSafeStaticFieldFromInstance" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="nonThreadSafeTypes" value="java.text.DateFormat,java.util.Calendar" /> + </inspection_tool> + <inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AnnotationNamingConvention" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="m_regex" value="[A-Z][A-Za-z\d]*" /> + <option name="m_minLength" value="8" /> + <option name="m_maxLength" value="64" /> + </inspection_tool> + <inspection_tool class="AnonymousClassMethodCount" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="m_limit" value="3" /> + </inspection_tool> + <inspection_tool class="AnonymousClassVariableHidesContainingMethodVariable" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AnonymousFunctionJS" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AnonymousInnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AntMissingPropertiesFileInspection" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="ArchaicSystemPropertyAccess" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="ArithmeticOnVolatileField" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="ArrayLengthInLoopCondition" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AssertAsName" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AssertsWithoutMessages" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AssignmentResultUsedJS" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AssignmentToCatchBlockParameter" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="AssignmentToCollectionFieldFromParameter" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="ignorePrivateMethods" value="true" /> + </inspection_tool> + <inspection_tool class="AssignmentToDateFieldFromParameter" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="ignorePrivateMethods" value="true" /> + </inspection_tool> + <inspection_tool class="AssignmentToForLoopParameter" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="m_checkForeachPa... [truncated message content] |