From: <kp...@us...> - 2008-10-21 21:18:43
|
Revision: 13910 http://jedit.svn.sourceforge.net/jedit/?rev=13910&view=rev Author: kpouer Date: 2008-10-21 21:18:41 +0000 (Tue, 21 Oct 2008) Log Message: ----------- When splitting the view, using editpane scope for bufferSet the new editPane contained all buffers instead of having only buffers from the active EditPane (#2152509) (Matthieu Casanova) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/EditPane.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-10-20 10:08:11 UTC (rev 13909) +++ jEdit/trunk/doc/CHANGES.txt 2008-10-21 21:18:41 UTC (rev 13910) @@ -83,6 +83,10 @@ - Replace in selection which ends at middle of line for regex which ends with "$" could wrongly match the end of selection. (Kazutoshi Satoda) + +- When splitting the view, using editpane scope for bufferSet the new editPane + contained all buffers instead of having only buffers from the active EditPane + (#2152509) (Matthieu Casanova) }}} {{{ Miscellaneous - Added the absolute caret position in the caret status of the status bar Modified: jEdit/trunk/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2008-10-20 10:08:11 UTC (rev 13909) +++ jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2008-10-21 21:18:41 UTC (rev 13910) @@ -680,18 +680,34 @@ String action = jEdit.getProperty("editpane.bufferset.new"); BufferSetManager.NewBufferSetAction bufferSetAction = BufferSetManager.NewBufferSetAction.fromString(action); + View activeView = jEdit.getActiveView(); switch (bufferSetAction) { case copy: if (this.bufferSet == null) - bufferSetManager.addAllBuffers(bufferSet); + { + EditPane editPane = view.getEditPane(); + if (editPane == null) + { + if (activeView != null) + editPane = activeView.getEditPane(); + + } + if (editPane == null) + { + bufferSetManager.addAllBuffers(bufferSet); + } + else + { + bufferSetManager.mergeBufferSet(bufferSet, editPane.bufferSet); + } + } else bufferSetManager.mergeBufferSet(bufferSet, this.bufferSet); break; case empty: break; case currentbuffer: - View activeView = jEdit.getActiveView(); if (activeView == null) break; EditPane editPane = activeView.getEditPane(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2008-10-25 14:23:59
|
Revision: 13929 http://jedit.svn.sourceforge.net/jedit/?rev=13929&view=rev Author: k_satoda Date: 2008-10-25 14:23:41 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Introduced a special XML PI "illegal-xml-character" to allow U+0000 in killring.xml. This also prevents possible other corruptions with control characters. Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/JEditKillRing.java jEdit/trunk/org/gjt/sp/util/XMLUtilities.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-10-25 12:38:31 UTC (rev 13928) +++ jEdit/trunk/doc/CHANGES.txt 2008-10-25 14:23:41 UTC (rev 13929) @@ -87,6 +87,9 @@ - When splitting the view, using editpane scope for bufferSet the new editPane contained all buffers instead of having only buffers from the active EditPane (#2152509) (Matthieu Casanova) + +- killring.xml or other XML files could be corrupted with control characters. + (Kazutoshi Satoda) }}} {{{ Miscellaneous - Added the absolute caret position in the caret status of the status bar Modified: jEdit/trunk/org/gjt/sp/jedit/JEditKillRing.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/JEditKillRing.java 2008-10-25 12:38:31 UTC (rev 13928) +++ jEdit/trunk/org/gjt/sp/jedit/JEditKillRing.java 2008-10-25 14:23:41 UTC (rev 13929) @@ -170,6 +170,29 @@ charData.append(ch, start, length); } + @Override + public void processingInstruction(String target, String data) + { + if ("illegal-xml-character".equals(target)) + { + char ch; + try + { + ch = (char)Integer.parseInt(data.trim()); + } + catch (Exception e) + { + Log.log(Log.ERROR, this, + "Failed to get character from PI" + + "\"" + target + "\"" + + " with \"" + data + "\"" + + ": " + e); + return; + } + characters(new char[] {ch}, 0, 1); + } + } + private final StringBuilder charData = new StringBuilder(); private boolean inEntry; } //}}} Modified: jEdit/trunk/org/gjt/sp/util/XMLUtilities.java =================================================================== --- jEdit/trunk/org/gjt/sp/util/XMLUtilities.java 2008-10-25 12:38:31 UTC (rev 13928) +++ jEdit/trunk/org/gjt/sp/util/XMLUtilities.java 2008-10-25 14:23:41 UTC (rev 13929) @@ -67,9 +67,23 @@ char ch = str.charAt(i); // control characters, excluding \t, \r and \n - if (xml11 && ch < 32 && ch != '\r' && ch != '\n' && ch != '\t') + // See: http://www.w3.org/International/questions/qa-controls + if (((0x00 <= ch && ch <= 0x1F) || (0x7F <= ch && ch <= 0x9F)) + && ch != '\r' && ch != '\n' && ch != '\t') { - buf.append("&#").append((int)ch).append(';'); + if (xml11 && ch != 0x00) + { + buf.append("&#").append((int)ch).append(';'); + } + else + { + // The character is illegal. + // But put a PI instead, to make it + // recoverable in certain apps. + buf.append("<?illegal-xml-character ") + .append((int)ch) + .append("?>"); + } continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2008-10-31 23:05:45
|
Revision: 13979 http://jedit.svn.sourceforge.net/jedit/?rev=13979&view=rev Author: kpouer Date: 2008-10-31 23:05:42 +0000 (Fri, 31 Oct 2008) Log Message: ----------- When the bufferSet were not sorted it was possible to have two time the same buffer in a bufferSet Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-10-31 22:47:21 UTC (rev 13978) +++ jEdit/trunk/doc/CHANGES.txt 2008-10-31 23:05:42 UTC (rev 13979) @@ -7,6 +7,9 @@ Jeff Robertson, Kevin Hunter, and Eric Berry for contributing to this release. {{{ Bug Fixes +- When the bufferSet were not sorted it was possible to have two time the same + buffer in a bufferSet (Matthieu Casanova) + - When changing the antialiasing mode to none, jEdit do not need to be restarted anymore (patch #2115400) (Dakshinamurthy Karra) Modified: jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java 2008-10-31 22:47:21 UTC (rev 13978) +++ jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java 2008-10-31 23:05:42 UTC (rev 13979) @@ -101,6 +101,8 @@ sorter = null; if (sorter != null) { + if (buffers.contains(buffer)) + return; buffers.add(buffer); Collections.sort(buffers, sorter); position = buffers.indexOf(buffer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2008-11-03 19:57:42
|
Revision: 14000 http://jedit.svn.sourceforge.net/jedit/?rev=14000&view=rev Author: k_satoda Date: 2008-11-03 18:53:34 +0000 (Mon, 03 Nov 2008) Log Message: ----------- Removed a JVM option "-Xms64M" from Windows installation because it makes bad memory footprint which is far larger than jEdit actually needs. Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/package-files/windows/win32installer.iss Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-03 18:26:06 UTC (rev 13999) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-03 18:53:34 UTC (rev 14000) @@ -169,6 +169,9 @@ - Added a combo box to the Docking option pane (in the Global Options dialog) for selecting the set of dockables to configure (plugin / core / all). (feature #2199003) (Shlomy Reinstein) + +- Removed a JVM option "-Xms64M" from Windows installation, which + consumed too much memory. (Kazutoshi Satoda) }}} {{{ Docker Plugin features merged into jEdit Core - New actions: View - Docking - Load|Save docking layout (of current mode) Modified: jEdit/trunk/package-files/windows/win32installer.iss =================================================================== --- jEdit/trunk/package-files/windows/win32installer.iss 2008-11-03 18:26:06 UTC (rev 13999) +++ jEdit/trunk/package-files/windows/win32installer.iss 2008-11-03 18:53:34 UTC (rev 14000) @@ -223,7 +223,7 @@ // Returns JVM options to be used for launch jEdit. function jvmOptions(Param: String): String; begin - Result := '-Xms64M -Xmx192M'; + Result := '-Xmx192M'; end; // updates the batch file for commandline usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2008-11-04 20:58:51
|
Revision: 14005 http://jedit.svn.sourceforge.net/jedit/?rev=14005&view=rev Author: k_satoda Date: 2008-11-04 20:58:27 +0000 (Tue, 04 Nov 2008) Log Message: ----------- Removed the default accessibility to non-public members from BeanShell codes. It was an unexpected side effect of class declaration introduced in r5562, which was removed in r13869. See also the comment in ClassGeneratorImpl.generateClassImpl(). Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/startup/startup.bsh Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-04 14:03:24 UTC (rev 14004) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-04 20:58:27 UTC (rev 14005) @@ -93,6 +93,9 @@ - killring.xml or other XML files could be corrupted with control characters. (Kazutoshi Satoda) + +- BeanShell codes could access non-public members by default. + (Kazutoshi Satoda) }}} {{{ Miscellaneous - Added the absolute caret position in the caret status of the status bar Modified: jEdit/trunk/startup/startup.bsh =================================================================== --- jEdit/trunk/startup/startup.bsh 2008-11-04 14:03:24 UTC (rev 14004) +++ jEdit/trunk/startup/startup.bsh 2008-11-04 20:58:27 UTC (rev 14005) @@ -22,12 +22,6 @@ e = Math.E; pi = Math.PI; -/* Allow accessibility to non-public Java elements - * Previously, this was done indirectly during startup by the - * getGraphicsEnvironment.bsh macro. - */ -ac(); - /* I use this for scripting various search and replace operations. */ s(search,replace,flags) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2008-11-10 17:46:55
|
Revision: 14023 http://jedit.svn.sourceforge.net/jedit/?rev=14023&view=rev Author: k_satoda Date: 2008-11-10 17:46:53 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Removed a JVM option "-Xms64M" from all platforms. This is a follow up of r14000, which removed it only for Windows installation, assuming the same reasoning are also true on all modern JVMs. See more details in the following thread on jedit-devel. "Removing -Xms JVM option" http://www.nabble.com/Removing--Xms-JVM-option-tt20353337.html Modified Paths: -------------- jEdit/trunk/build.xml jEdit/trunk/doc/CHANGES.txt jEdit/trunk/installer/OperatingSystem.java jEdit/trunk/package-files/linux/jedit jEdit/trunk/package-files/os2/jedit.cmd Modified: jEdit/trunk/build.xml =================================================================== --- jEdit/trunk/build.xml 2008-11-10 05:33:42 UTC (rev 14022) +++ jEdit/trunk/build.xml 2008-11-10 17:46:53 UTC (rev 14023) @@ -954,7 +954,7 @@ signature="JESP" stubfile="jedit" version="${jedit.version}" - vmoptions="-Xms64M -Xmx192M"> + vmoptions="-Xmx192M"> <javaproperty name="apple.awt.antialiasing" value="true" /> <javaproperty name="apple.awt.textantialiasing" Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-10 05:33:42 UTC (rev 14022) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-10 17:46:53 UTC (rev 14023) @@ -173,8 +173,8 @@ for selecting the set of dockables to configure (plugin / core / all). (feature #2199003) (Shlomy Reinstein) -- Removed a JVM option "-Xms64M" from Windows installation, which - consumed too much memory. (Kazutoshi Satoda) +- Removed a JVM option "-Xms64M" from installed startup commands/scripts, + which consumed too much memory. (Kazutoshi Satoda) }}} {{{ Docker Plugin features merged into jEdit Core - New actions: View - Docking - Load|Save docking layout (of current mode) Modified: jEdit/trunk/installer/OperatingSystem.java =================================================================== --- jEdit/trunk/installer/OperatingSystem.java 2008-11-10 05:33:42 UTC (rev 14022) +++ jEdit/trunk/installer/OperatingSystem.java 2008-11-10 17:46:53 UTC (rev 14023) @@ -182,7 +182,6 @@ out.write("#\n"); out.write("\n"); out.write("# Set jvm heap initial and maximum sizes (in megabytes).\n"); - out.write("JAVA_HEAP_INIT_SIZE=64\n"); out.write("JAVA_HEAP_MAX_SIZE=192\n"); out.write("\n"); out.write("DEFAULT_JAVA_HOME=\"" @@ -198,7 +197,6 @@ String jar = installDir + File.separator + name.toLowerCase() + ".jar"; out.write("\texec \"$JAVA_HOME/bin/java\"" + - " -Xms${JAVA_HEAP_INIT_SIZE}M" + " -Xmx${JAVA_HEAP_MAX_SIZE}M -jar " + jar + " -reuseview \"$1\" \"$2\"" + " \"$3\" \"$4\" \"$5\" \"$6\"" + @@ -206,7 +204,6 @@ out.write("\tshift 9\n"); out.write("done\n"); out.write("exec \"$JAVA_HOME/bin/java\"" + - " -Xms${JAVA_HEAP_INIT_SIZE}M" + " -Xmx${JAVA_HEAP_MAX_SIZE}M -jar " + jar + " -reuseview \"$1\" \"$2\"" + " \"$3\" \"$4\" \"$5\" \"$6\"" + Modified: jEdit/trunk/package-files/linux/jedit =================================================================== --- jEdit/trunk/package-files/linux/jedit 2008-11-10 05:33:42 UTC (rev 14022) +++ jEdit/trunk/package-files/linux/jedit 2008-11-10 17:46:53 UTC (rev 14023) @@ -4,7 +4,6 @@ # # Set jvm heap initial and maximum sizes (in megabytes). -JAVA_HEAP_INIT_SIZE=64 JAVA_HEAP_MAX_SIZE=192 # Find a java installation. @@ -25,4 +24,4 @@ # Launch application. -exec $JAVA -Xms${JAVA_HEAP_INIT_SIZE}M -Xmx${JAVA_HEAP_MAX_SIZE}M -jar /usr/share/jEdit/@jar.filename@ -reuseview "$@" & +exec $JAVA -Xmx${JAVA_HEAP_MAX_SIZE}M -jar /usr/share/jEdit/@jar.filename@ -reuseview "$@" & Modified: jEdit/trunk/package-files/os2/jedit.cmd =================================================================== --- jEdit/trunk/package-files/os2/jedit.cmd 2008-11-10 05:33:42 UTC (rev 14022) +++ jEdit/trunk/package-files/os2/jedit.cmd 2008-11-10 17:46:53 UTC (rev 14023) @@ -20,9 +20,9 @@ jedit_dir = GetExecPath() if (iMajor = 1 & iMid <= 1) then - 'java -Xms64M -Xmx192M -classpath %classpath%;'jedit_dir'\jedit.jar org.gjt.sp.jedit.jEdit 'arguments + 'java -Xmx192M -classpath %classpath%;'jedit_dir'\jedit.jar org.gjt.sp.jedit.jEdit 'arguments else - 'java -Xms64M -Xmx192M -jar 'jedit_dir'\jedit.jar 'arguments + 'java -Xmx192M -jar 'jedit_dir'\jedit.jar 'arguments return 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2008-11-14 19:51:41
|
Revision: 14038 http://jedit.svn.sourceforge.net/jedit/?rev=14038&view=rev Author: Vampire0 Date: 2008-11-14 19:51:31 +0000 (Fri, 14 Nov 2008) Log Message: ----------- Disabled the MacOS plugin by default for now. Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/jedit.props Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-14 19:47:47 UTC (rev 14037) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-14 19:51:31 UTC (rev 14038) @@ -101,6 +101,8 @@ }}} {{{ Miscellaneous +- Disabled the MacOS plugin by default for now. (Bj\xF6rn "Vampire" Kautler) + - Added the absolute caret position in the caret status of the status bar (Matthieu Casanova) Modified: jEdit/trunk/org/gjt/sp/jedit/jedit.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit.props 2008-11-14 19:47:47 UTC (rev 14037) +++ jEdit/trunk/org/gjt/sp/jedit/jedit.props 2008-11-14 19:51:31 UTC (rev 14038) @@ -438,6 +438,7 @@ plugin-manager.mirror.id=switch plugin-manager.deleteDownloads=true plugin-manager.hide-libraries.toggle=true +plugin-blacklist.MacOS.jar=true #}}} #{{{ Hidden settings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dal...@us...> - 2008-11-17 05:08:09
|
Revision: 14073 http://jedit.svn.sourceforge.net/jedit/?rev=14073&view=rev Author: daleanson Date: 2008-11-17 05:08:06 +0000 (Mon, 17 Nov 2008) Log Message: ----------- a few updates to complete bug 2220025, adding GUI configuration to the caret position info in the status bar. Updated StatusBarOptionPane to get the string values for the checkboxes from the jedit_gui.props file, updated StatusBar to change the display of the caret position info when the checkboxes change, and updated the user guide to describe the meaning of each item in the caret position display. Modified Paths: -------------- jEdit/trunk/doc/users-guide/basics.xml jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java Modified: jEdit/trunk/doc/users-guide/basics.xml =================================================================== --- jEdit/trunk/doc/users-guide/basics.xml 2008-11-17 03:38:56 UTC (rev 14072) +++ jEdit/trunk/doc/users-guide/basics.xml 2008-11-17 05:08:06 UTC (rev 14073) @@ -12,17 +12,17 @@ window. It is possible to have multiple views open at once, and each View can be split into multiple panes. jEdit remembers the state of open views between editing sessions.</para> - + <para>An open file is referred to as a <firstterm>Buffer</firstterm>. Unlike some editors where each buffer gets its own View, jEdit completely separates the two concepts. A buffer might be visible in several views, or none at all.</para> - <para>A <firstterm>TextArea</firstterm> is an editor for a buffer. - An <firstterm>EditPane</firstterm> contains a TextArea plus optional buffer switcher. + <para>A <firstterm>TextArea</firstterm> is an editor for a buffer. + An <firstterm>EditPane</firstterm> contains a TextArea plus optional buffer switcher. A View contains one EditPane by default, and additional panes are created whenever the View is split. </para> - + <para>The drop-down buffer switcher list at the top of each EditPane shows a buffer set which by default includes all open buffers. Selecting a buffer on this list will make it visible in the TextArea. Different @@ -104,18 +104,18 @@ <para><guimenu>View</guimenu>><guimenuitem>Go to Next Text Area</guimenuitem> (shortcut: <keycap>A+PAGE_DOWN</keycap>) shifts keyboard focus to the next TextArea.</para> - + <para><guimenu>Macros</guimenu>><guimenu>Interface</guimenu>> <guimenu>Splitpane Grow</guimenu> grows the size of the currently focused TextArea. </para> - + </sect1> <sect1 id="buffers"> <title>Switching Buffers</title> <para>Each EditPane has an optional drop-down BufferSwitcher at the top. - The BufferSwitcher shows the current buffer and can also be used to + The BufferSwitcher shows the current buffer and can also be used to switch the current buffer, using menu item commands and their keyboard shortcuts.</para> <para><guimenu>View</guimenu>><guimenuitem>Go to Previous @@ -180,49 +180,49 @@ <para> The buffer sets feature helps keep the buffer lists local and manageable when using jEdit in a multiple-View and multiple-EditPane environment. </para> - + <para> As mentioned in the previous section, each EditPane can show a Buffer Switcher, which displays the contents of a BufferSet. In jEdit 4.2, all EditPane buffer switchers - showed the same BufferSet: a global list of all buffers that were opened from any EditPane in any View. + showed the same BufferSet: a global list of all buffers that were opened from any EditPane in any View. When using many Views and EditPanes, this resulted in large lists of buffers, and made - the next/previous buffer actions useless with many views, EditPanes and buffers. + the next/previous buffer actions useless with many views, EditPanes and buffers. </para> - + <para> In jEdit 4.3, it is possible to have more narrow scopes for the BufferSets of an EditPane. This makes the 'next-buffer' and 'previous-buffer' actions switch between buffers that are local to the view or pane. </para> - + <para> The three BufferSet scopes are: </para> - + <orderedlist> <listitem><para> <emphasis role="bold">Global</emphasis>: Includes all buffers open from any EditPane. </para></listitem> <listitem><para> <emphasis role="bold">View</emphasis>: EditPanes in the same View share the same BufferSet. Opening a buffer in one View will not affect the non-global scope BufferSets in EditPanes of - other Views. </para></listitem> + other Views. </para></listitem> <listitem><para><emphasis role="bold">EditPane</emphasis>: Each EditPane can have its own independent BufferSet. </para></listitem> </orderedlist> - + <para> The default Buffer Set scope for newly created EditPanes is global by default, and can be changed from <guimenu>Utilities</guimenu>><guimenuitem>Global Options</guimenuitem> > <guimenuitem>View</guimenuitem> > <guilabel>BufferSet scope for new EditPanes</guilabel>. </para> - <para> New BufferSets are initially empty, or populated with a copy of the - existing BufferSet. This behavior can be changed from - <guimenuitem>Global Options</guimenuitem> > <guimenuitem>View</guimenuitem> > + <para> New BufferSets are initially empty, or populated with a copy of the + existing BufferSet. This behavior can be changed from + <guimenuitem>Global Options</guimenuitem> > <guimenuitem>View</guimenuitem> > <guilabel>New BufferSets contain: copies of current BufferSet</guilabel>. </para> - + <para> <guimenu>File</guimenu> > <guimenuitem>Close</guimenuitem> behavior has changed in 4.3pre15: now it will remove the current buffer from the EditPane's BufferSet only. If it was the last BufferSet to contain that buffer, the buffer is also closed. </para> <para> The <guimenu> File </guimenu> > <guimenuitem>Close (global)</guimenuitem> action closes the buffer in all EditPanes, as the regular <guimenu> File </guimenu> > <guimenuitem>Close</guimenuitem> action did before. </para> - + <para> <guimenuitem>Clear BufferSet except active</guimenuitem> will clear the BufferSet of the - current EditPane by performing a <guimenuitem>Close</guimenuitem> on all items except those buffers which are displayed in another active EditPane. </para> - + current EditPane by performing a <guimenuitem>Close</guimenuitem> on all items except those buffers which are displayed in another active EditPane. </para> + <bridgehead> Switching Bufferset Scopes at runtime (experimental) </bridgehead> - - <para> The statusbar shows you which BufferSet scope is active for the current EditPane + + <para> The statusbar shows you which BufferSet scope is active for the current EditPane (look for the letter "G", "E" or "V"). Double-clicking on that will allow you to change the buffer set. Also, the scope for the current EditPane BufferSet can be changed from <guimenu>View</guimenu>><guimenu>Buffer Sets</guimenu> > <guimenu>(Global|View|EditPane) Buffer Set</guimenu>. </para> @@ -230,11 +230,11 @@ <para> A new BufferSet can be created in a number of ways, such as when a new View is created (and the default BufferSet scope is not global) or when the View is split (and the default BufferSet scope is EditPane), or when the - BufferSet scope is changed to EditPane via the statusbar or menu action. </para> + BufferSet scope is changed to EditPane via the statusbar or menu action. </para> </sect1> - + <sect1 id="docking"> <title>Window Docking</title> @@ -300,23 +300,44 @@ <itemizedlist> <listitem> - <para>The line number containing the caret</para> - </listitem> + <para>Caret position information:</para> + <itemizedlist> + <listitem> + <para>The offset of the caret from the beginning of the file</para> + </listitem> - <listitem> - <para>The column position of the caret, with the leftmost column - being 1.</para> + <listitem> + <para>The line number containing the caret</para> + </listitem> - <para>If the line contains tabs, the <firstterm>file</firstterm> - position (where a hard tab is counted as one column) is shown - first, followed by the <firstterm>screen</firstterm> position - (where each tab counts for the number of columns until the next - tab stop).</para> + <listitem> + <para>The column position of the caret, with the leftmost column + being 1.</para> + <para>If the line contains tabs, the <firstterm>file</firstterm> + position (where a hard tab is counted as one column) is shown + first, followed by the <firstterm>screen</firstterm> position + (where each tab counts for the number of columns until the next + tab stop).</para> + </listitem> + + <listitem> + <para>The percent offset of the caret from the start of the file. + This is based on the line number of the caret and the total number + of lines in the file, so this is the same as the relative position + of the right scroll bar in the main text area.</para> + </listitem> + + </itemizedlist> + <para> + All of the above information is configurable in the Global Options + for the status bar. + </para> <para>Double-clicking on the caret location indicator displays the <guimenu>Edit</guimenu>><guimenuitem>Go to Line</guimenuitem> dialog box; see <xref - linkend="lines" />.</para> + linkend="lines" />. + </para> </listitem> <listitem> @@ -381,12 +402,12 @@ <para>Line separator - see <xref linkend="line-separators" />.</para> </listitem> - + <listitem> <para>Buffer Set Scope - see <xref linkend="buffersets" />.</para> </listitem> - + </itemizedlist> </listitem> Modified: jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2008-11-17 03:38:56 UTC (rev 14072) +++ jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2008-11-17 05:08:06 UTC (rev 14073) @@ -122,6 +122,7 @@ Dimension dim = new Dimension(fm.stringWidth(caretTestStr), fm.getHeight()); caretStatus.setPreferredSize(dim); + updateCaretStatus(); } else panel.remove(caretStatus); Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-11-17 03:38:56 UTC (rev 14072) +++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-11-17 05:08:06 UTC (rev 14073) @@ -2011,6 +2011,11 @@ options.status.edit.widgetRadioButton=widget options.status.edit.labelLabel=Type a label: options.status.edit.widgetLabel=Choose a widget: +options.status.caret.offset=Show caret offset from start of file +options.status.caret.linenumber=Show caret line number +options.status.caret.dot=Show caret offset from start of line +options.status.caret.virtual=Show caret virtual offset from start of line +options.status.caret.percent=Show relative position (%) of caret within buffer #}}} #{{{ Syntax Highlighting pane Modified: jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java 2008-11-17 03:38:56 UTC (rev 14072) +++ jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java 2008-11-17 05:08:06 UTC (rev 14073) @@ -95,7 +95,7 @@ GridBagConstraints.VERTICAL); optionsPanel.addSeparator(); - optionsPanel.addComponent(new JLabel("Caret position display options:")); + optionsPanel.addComponent(new JLabel(jEdit.getProperty("options.status.caret.title", "Caret position display options:"))); /* view.status.show-caret-offset -- true shows caret offset from start of buffer @@ -104,11 +104,16 @@ view.status.show-caret-virtual -- true shows virtual offset in line for caret view.status.show-caret-percent -- true shows relative position of the caret within the buffer */ - show_caret_offset = new JCheckBox("Show caret offset from start of file", jEdit.getBooleanProperty("view.status.show-caret-offset", true)); - show_caret_linenumber = new JCheckBox("Show caret line number", jEdit.getBooleanProperty("view.status.show-caret-linenumber", true)); - show_caret_dot = new JCheckBox("Show caret offset from start of line", jEdit.getBooleanProperty("view.status.show-caret-dot", true)); - show_caret_virtual = new JCheckBox("Show caret virtual offset from start of line", jEdit.getBooleanProperty("view.status.show-caret-virtual", true)); - show_caret_percent = new JCheckBox("Show relative position (%) of caret within buffer", jEdit.getBooleanProperty("view.status.show-caret-percent", true)); + show_caret_offset = new JCheckBox(jEdit.getProperty("options.status.caret.offset", "Show caret offset from start of file"), + jEdit.getBooleanProperty("view.status.show-caret-offset", true)); + show_caret_linenumber = new JCheckBox(jEdit.getProperty("options.status.caret.linenumber", "Show caret line number"), + jEdit.getBooleanProperty("view.status.show-caret-linenumber", true)); + show_caret_dot = new JCheckBox(jEdit.getProperty("options.status.caret.dot", "Show caret offset from start of line"), + jEdit.getBooleanProperty("view.status.show-caret-dot", true)); + show_caret_virtual = new JCheckBox(jEdit.getProperty("options.status.caret.virtual", "Show caret virtual offset from start of line"), + jEdit.getBooleanProperty("view.status.show-caret-virtual", true)); + show_caret_percent = new JCheckBox(jEdit.getProperty("options.status.caret.percent", "Show relative position (%) of caret within buffer"), + jEdit.getBooleanProperty("view.status.show-caret-percent", true)); optionsPanel.addComponent(show_caret_offset); optionsPanel.addComponent(show_caret_linenumber); optionsPanel.addComponent(show_caret_dot); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2008-11-19 19:32:41
|
Revision: 14083 http://jedit.svn.sourceforge.net/jedit/?rev=14083&view=rev Author: Vampire0 Date: 2008-11-19 19:32:34 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Updated the version number to 4.3pre17. Modified Paths: -------------- jEdit/trunk/build.xml jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/jEdit.java Modified: jEdit/trunk/build.xml =================================================================== --- jEdit/trunk/build.xml 2008-11-18 23:48:06 UTC (rev 14082) +++ jEdit/trunk/build.xml 2008-11-19 19:32:34 UTC (rev 14083) @@ -10,9 +10,9 @@ <!-- jEdit Version --> <property name="jedit.version" - value="4.3pre16" /> + value="4.3pre17" /> <property name="jedit.build.number" - value="04.03.16.00" /> + value="04.03.17.00" /> <!-- Target Java Versions --> <property name="target.java.version" Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-18 23:48:06 UTC (rev 14082) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-19 19:32:34 UTC (rev 14083) @@ -2,37 +2,39 @@ {{{ Version 4.3pre17 +Thanks to Bj\xF6rn "Vampire" Kautler and Dale Anson for contributing to this +release. + {{{ Bug Fixes - Fix for caret position display in status bar (tracker 2220033), relative -position was not always correct. In conjunction with this, added checkboxes -in the Status Bar option pane to make the various items in the caret position -display configurable (tracker 737187) (Dale Anson). + position was not always correct. In conjunction with this, added checkboxes + in the Status Bar option pane to make the various items in the caret position + display configurable (tracker 737187) (Dale Anson). - Fix for files in buffer switcher not ordered (tracker 2183929). Sorting is -now immediate on changing the preferences in the option dialog (Dale Anson) + now immediate on changing the preferences in the option dialog (Dale Anson) - Fix for View->Show Buffer Switcher does not show the buffer switcher (tracker -2179149) (Dale Anson) This menu item is intended to show the buffer switcher -drop down, which isn't necessary if the buffer switcher is not visible. Now the -visibility of this menu item is the same as the visibility of the buffer -switcher. + 2179149) (Dale Anson) This menu item is intended to show the buffer switcher + drop down, which isn't necessary if the buffer switcher is not visible. Now + the visibility of this menu item is the same as the visibility of the buffer + switcher. }}} +{{{ Miscellaneous -{{{ Syntax Highlighting - - Fix for java mode (tracker 737187), method name not always highlighted if -there were one or more spaces or tabs following the method name (Dale Anson) + there were one or more spaces or tabs following the method name (Dale Anson) - 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) + 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) }}} }}} - + {{{ Version 4.3pre16 Thanks to Bj\xF6rn "Vampire" Kautler, Kazutoshi Satoda, Dakshinamurthy Karra, Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2008-11-18 23:48:06 UTC (rev 14082) +++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2008-11-19 19:32:34 UTC (rev 14083) @@ -91,7 +91,7 @@ public static String getBuild() { // (major).(minor).(<99 = preX, 99 = final).(bug fix) - return "04.03.16.00"; + return "04.03.17.00"; } //}}} //{{{ main() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2008-11-22 20:04:26
|
Revision: 14090 http://jedit.svn.sourceforge.net/jedit/?rev=14090&view=rev Author: kpouer Date: 2008-11-22 20:04:17 +0000 (Sat, 22 Nov 2008) Log Message: ----------- The keybindings are reloaded when the properties are changed in the standalone textarea, and the StandaloneActionSet now takes an url to the actions.xml as constructor parameter (patch #2304608) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-22 02:34:54 UTC (rev 14089) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-22 20:04:17 UTC (rev 14090) @@ -2,8 +2,8 @@ {{{ Version 4.3pre17 -Thanks to Bj\xF6rn "Vampire" Kautler and Dale Anson for contributing to this -release. +Thanks to Bj\xF6rn "Vampire" Kautler, Dakshinamurthy Karra and Dale Anson for +contributing to this release. {{{ Bug Fixes @@ -32,9 +32,15 @@ terminator improperly highlighted the terminator as a comment (Dale Anson) }}} +{{{ API Changes +- The keybindings are reloaded when the properties are changed in the standalone + textarea, and the StandaloneActionSet now takes an url to the actions.xml + as constructor parameter (patch #2304608) (Dakshinamurthy Karra) +}}} + }}} - + {{{ Version 4.3pre16 Thanks to Bj\xF6rn "Vampire" Kautler, Kazutoshi Satoda, Dakshinamurthy Karra, Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java 2008-11-22 02:34:54 UTC (rev 14089) +++ jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java 2008-11-22 20:04:17 UTC (rev 14090) @@ -31,6 +31,7 @@ import java.awt.event.MouseEvent; import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.util.Properties; import javax.swing.AbstractAction; @@ -122,7 +123,7 @@ // todo : make TextareaTransferHandler standalone // textArea.setTransferHandler(new TextAreaTransferHandler()); - JEditActionSet<JEditBeanShellAction> actionSet = new StandaloneActionSet(propertyManager, this); + JEditActionSet<JEditBeanShellAction> actionSet = new StandaloneActionSet(propertyManager, this, TextArea.class.getResource("textarea.actions.xml")); addActionSet(actionSet); actionSet.load(); @@ -488,6 +489,12 @@ @Override public void propertiesChanged() { + getInputHandler().removeAllKeyBindings(); + JEditActionSet<JEditBeanShellAction>[] actionSets = getActionContext().getActionSets(); + for (JEditActionSet<JEditBeanShellAction> actionSet : actionSets) + { + actionSet.initKeyBindings(); + } initBuffer(); initTextArea(); super.propertiesChanged(); @@ -614,14 +621,14 @@ * The actionSet for standalone textArea. * @author Matthieu Casanova */ - private static class StandaloneActionSet extends JEditActionSet<JEditBeanShellAction> + protected static class StandaloneActionSet extends JEditActionSet<JEditBeanShellAction> { private final IPropertyManager iPropertyManager; private final TextArea textArea; - StandaloneActionSet(IPropertyManager iPropertyManager, TextArea textArea) + public StandaloneActionSet(IPropertyManager iPropertyManager, TextArea textArea, URL url) { - super(null, TextArea.class.getResource("textarea.actions.xml")); + super(null, url); this.iPropertyManager = iPropertyManager; this.textArea = textArea; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2008-11-22 20:31:26
|
Revision: 14091 http://jedit.svn.sourceforge.net/jedit/?rev=14091&view=rev Author: kpouer Date: 2008-11-22 20:31:20 +0000 (Sat, 22 Nov 2008) Log Message: ----------- Added jEdit.openFile(EditPane, ....) methods to explicitely choose an editPane to open a file When having split view, dropping a file on the inactive textArea was opening it to the active textArea (#2321838) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/Macros.java jEdit/trunk/org/gjt/sp/jedit/jEdit.java jEdit/trunk/org/gjt/sp/jedit/textarea/TextAreaTransferHandler.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-22 20:04:17 UTC (rev 14090) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-22 20:31:20 UTC (rev 14091) @@ -21,6 +21,9 @@ the visibility of this menu item is the same as the visibility of the buffer switcher. +- When having split view, dropping a file on the inactive textArea was opening + it to the active textArea (#2321838) (Matthieu Casanova) + }}} {{{ Miscellaneous @@ -36,6 +39,9 @@ - The keybindings are reloaded when the properties are changed in the standalone textarea, and the StandaloneActionSet now takes an url to the actions.xml as constructor parameter (patch #2304608) (Dakshinamurthy Karra) + +- Added jEdit.openFile(EditPane, ....) methods to explicitely choose an editPane + to open a file (Matthieu Casanova) }}} Modified: jEdit/trunk/org/gjt/sp/jedit/Macros.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/Macros.java 2008-11-22 20:04:17 UTC (rev 14090) +++ jEdit/trunk/org/gjt/sp/jedit/Macros.java 2008-11-22 20:31:20 UTC (rev 14091) @@ -491,7 +491,7 @@ return; } - Buffer buffer = jEdit.openFile(null,settings + File.separator + Buffer buffer = jEdit.openFile((View)null,settings + File.separator + "macros","Temporary_Macro.bsh",true,null); if(buffer == null) @@ -531,7 +531,7 @@ name = name.replace(' ','_'); - Buffer buffer = jEdit.openFile(null,null, + Buffer buffer = jEdit.openFile((View) null,null, MiscUtilities.constructPath(settings,"macros", name + ".bsh"),true,null); Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2008-11-22 20:04:17 UTC (rev 14090) +++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2008-11-22 20:31:20 UTC (rev 14091) @@ -1418,7 +1418,7 @@ continue; } - lastBuffer = openFile(null,parent,arg,false,null); + lastBuffer = openFile((View)null,parent,arg,false,null); if(retVal == null && lastBuffer != null) retVal = lastBuffer; @@ -1466,6 +1466,7 @@ { return openFile(view,parent,path,newFile,props); } + /** * Opens a file. This may return null if the buffer could not be * opened for some reason. @@ -1485,10 +1486,45 @@ public static Buffer openFile(View view, String parent, String path, boolean newFile, Hashtable props) { + return openFile(view.getEditPane(), parent, path, newFile, props); + } + + /** + * Opens a file. Note that as of jEdit 2.5pre1, this may return + * null if the buffer could not be opened. + * @param editPane the EditPane to open the file in. + * @param path The file path + * + * @return the buffer, or null if jEdit was unable to load it + * + * @since jEdit 4.3pre17 + */ + public static Buffer openFile(EditPane editPane, String path) + { + return openFile(editPane,null,path,false,new Hashtable()); + } + + /** + * Opens a file. This may return null if the buffer could not be + * opened for some reason. + * @param editPane the EditPane to open the file in. + * @param parent The parent directory of the file + * @param path The path name of the file + * @param newFile True if the file should not be loaded from disk + * be prompted if it should be reloaded + * @param props Buffer-local properties to set in the buffer + * + * @return the buffer, or null if jEdit was unable to load it + * + * @since jEdit 4.3pre17 + */ + public static Buffer openFile(EditPane editPane, String parent, + String path, boolean newFile, Hashtable props) + { PerspectiveManager.setPerspectiveDirty(true); - if(view != null && parent == null) - parent = view.getBuffer().getDirectory(); + if(editPane != null && parent == null) + parent = editPane.getBuffer().getDirectory(); try { @@ -1510,13 +1546,14 @@ synchronized (editBusOrderingLock) { + View view = editPane == null ? null : editPane.getView(); synchronized(bufferListLock) { Buffer buffer = getBuffer(path); if(buffer != null) { - if(view != null) - view.setBuffer(buffer,true); + if(editPane != null) + editPane.setBuffer(buffer,true); return buffer; } @@ -1526,8 +1563,8 @@ if(!newBuffer.load(view,false)) return null; addBufferToList(newBuffer); - if (view != null) - bufferSetManager.addBuffer(view, newBuffer); + if (editPane != null) + bufferSetManager.addBuffer(editPane.getBufferSet(), newBuffer); else bufferSetManager.addBuffer(jEdit.getActiveView(), newBuffer); } @@ -1535,8 +1572,8 @@ EditBus.send(new BufferUpdate(newBuffer,view,BufferUpdate.CREATED)); } - if(view != null) - view.setBuffer(newBuffer,true); + if(editPane != null) + editPane.setBuffer(newBuffer,true); return newBuffer; } //}}} Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextAreaTransferHandler.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/textarea/TextAreaTransferHandler.java 2008-11-22 20:04:17 UTC (rev 14090) +++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextAreaTransferHandler.java 2008-11-22 20:31:20 UTC (rev 14091) @@ -25,6 +25,7 @@ //{{{ Imports import org.gjt.sp.jedit.*; +import org.gjt.sp.jedit.visitors.JEditVisitorAdapter; import org.gjt.sp.jedit.bufferset.BufferSetManager; import org.gjt.sp.jedit.browser.VFSBrowser; import org.gjt.sp.jedit.io.FileVFS; @@ -475,7 +476,19 @@ } public void run() { - jEdit.openFile(textArea.getView(),url); + EditPane editPane = null; + // this search is necessary because we want to open the file to the textarea where the + // file was dropped, not to the first textArea of the view + EditPane[] editPanes = textArea.getView().getEditPanes(); + for (EditPane pane : editPanes) + { + if (pane.getTextArea() == textArea) + { + editPane = pane; + break; + } + } + jEdit.openFile(editPane,url); } } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2008-11-23 13:10:57
|
Revision: 14096 http://jedit.svn.sourceforge.net/jedit/?rev=14096&view=rev Author: kpouer Date: 2008-11-23 13:10:54 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Added jEdit.newFile(EditPane, ...) methods to explicitely choose an EditPane to create a new file Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/EditPane.java jEdit/trunk/org/gjt/sp/jedit/EditServer.java jEdit/trunk/org/gjt/sp/jedit/jEdit.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-23 12:02:03 UTC (rev 14095) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-23 13:10:54 UTC (rev 14096) @@ -42,6 +42,9 @@ - Added jEdit.openFile(EditPane, ....) methods to explicitely choose an editPane to open a file (Matthieu Casanova) + +- Added jEdit.newFile(EditPane, ...) methods to explicitely choose an EditPane + to create a new file (Matthieu Casanova) }}} Modified: jEdit/trunk/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2008-11-23 12:02:03 UTC (rev 14095) +++ jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2008-11-23 13:10:54 UTC (rev 14096) @@ -722,16 +722,13 @@ } if (buffer != null) bufferSetManager.addBuffer(bufferSet, buffer); + + this.bufferSet = bufferSet; if (bufferSet.size() == 0) { - int untitledCount = jEdit.getNextUntitledBufferId(); - Buffer newEmptyBuffer = jEdit.openTemporary(jEdit.getActiveView(), null, - "Untitled-" + untitledCount,true, null); - jEdit.commitTemporary(newEmptyBuffer); - bufferSetManager.addBuffer(bufferSet, newEmptyBuffer); + jEdit.newFile(this); } - this.bufferSet = bufferSet; bufferSet.addBufferSetListener(this); if (bufferSwitcher != null) { Modified: jEdit/trunk/org/gjt/sp/jedit/EditServer.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/EditServer.java 2008-11-23 12:02:03 UTC (rev 14095) +++ jEdit/trunk/org/gjt/sp/jedit/EditServer.java 2008-11-23 13:10:54 UTC (rev 14096) @@ -205,7 +205,7 @@ Buffer buffer = jEdit.openFiles(null,parent,args); if(jEdit.getBufferCount() == 0) - jEdit.newFile(null); + jEdit.newFile((EditPane) null); boolean restoreFiles = restore && jEdit.getBooleanProperty("restore") Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2008-11-23 12:02:03 UTC (rev 14095) +++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2008-11-23 13:10:54 UTC (rev 14096) @@ -1523,7 +1523,7 @@ { PerspectiveManager.setPerspectiveDirty(true); - if(editPane != null && parent == null) + if(editPane != null && parent == null && editPane.getBuffer() != null) parent = editPane.getBuffer().getDirectory(); try @@ -1669,7 +1669,7 @@ EditBus.send(new BufferUpdate(buffer,null,BufferUpdate.LOADED)); } //}}} - //{{{ newFile() method + //{{{ newFile() methods /** * Creates a new `untitled' file. * @@ -1679,24 +1679,9 @@ */ public static Buffer newFile(View view) { - String path; + return newFile(view == null ? null : view.getEditPane()); + } - if(view != null && view.getBuffer() != null) - { - path = view.getBuffer().getDirectory(); - VFS vfs = VFSManager.getVFSForPath(path); - // don't want 'New File' to create a read only buffer - // if current file is on SQL VFS or something - if((vfs.getCapabilities() & VFS.WRITE_CAP) == 0) - path = System.getProperty("user.home"); - } - else - path = null; - - return newFile(view,path); - } //}}} - - //{{{ newFile() method /** * Creates a new `untitled' file. * @param view The view to create the file in @@ -1721,7 +1706,48 @@ editPane = v.getEditPane(); } } + return newFile(editPane, dir); + } + /** + * Creates a new `untitled' file. + * + * @param editPane The editPane to create the file in + * + * @return the new buffer + * @since jEdit 4.3pre17 + */ + public static Buffer newFile(EditPane editPane) + { + String path; + + if(editPane != null && editPane.getBuffer() != null) + { + path = editPane.getBuffer().getDirectory(); + VFS vfs = VFSManager.getVFSForPath(path); + // don't want 'New File' to create a read only buffer + // if current file is on SQL VFS or something + if((vfs.getCapabilities() & VFS.WRITE_CAP) == 0) + path = System.getProperty("user.home"); + } + else + path = null; + + return newFile(editPane,path); + } + + /** + * Creates a new `untitled' file. + * + * @param editPane The editPane to create the file in + * @param dir The directory to create the file in + * + * @return the new buffer + * + * @since jEdit 4.3pre17 + */ + public static Buffer newFile(EditPane editPane, String dir) + { if (editPane != null) { BufferSet bufferSet = editPane.getBufferSet(); @@ -1739,7 +1765,7 @@ // Find the highest Untitled-n file int untitledCount = getNextUntitledBufferId(); - return openFile(view,dir,"Untitled-" + untitledCount,true,null); + return openFile(editPane,dir,"Untitled-" + untitledCount,true,null); } //}}} //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2008-11-25 00:54:32
|
Revision: 14101 http://jedit.svn.sourceforge.net/jedit/?rev=14101&view=rev Author: ezust Date: 2008-11-25 00:54:28 +0000 (Tue, 25 Nov 2008) Log Message: ----------- Removed redundant TextArea:EditPane map in EditPane.java in favor of a linear search through parent container linked list. Modified Paths: -------------- jEdit/trunk/README.SRC.txt jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/EditPane.java Modified: jEdit/trunk/README.SRC.txt =================================================================== --- jEdit/trunk/README.SRC.txt 2008-11-24 20:40:37 UTC (rev 14100) +++ jEdit/trunk/README.SRC.txt 2008-11-25 00:54:28 UTC (rev 14101) @@ -169,14 +169,17 @@ -* Tips for Eclipse users: +* Tips for Eclipse/NetBeans/IDE users: Some of the source directories are only needed for building packages on certain platforms. If you add jEdit source to an IDE like Eclipse that tries to build everything, you'll get some errors from these directories unless you have the right libraries. However, if you tell Eclipse to exclude these -directories, you can still build jEdit from source. Follow these steps: +directories, you can still build and run/debug jEdit from source. +Follow these steps: - Project properties - Java build path - Source - Excluded dirs - Edit - Add multiple - Add these subdirs: jars, net, de, build + + Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-24 20:40:37 UTC (rev 14100) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-25 00:54:28 UTC (rev 14101) @@ -33,6 +33,8 @@ - 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) + +- Removed redundant TextArea:EditPane map in EditPane.java in favor of a linear search through parent container linked list. (Alan Ezust) }}} {{{ API Changes Modified: jEdit/trunk/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2008-11-24 20:40:37 UTC (rev 14100) +++ jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2008-11-25 00:54:28 UTC (rev 14101) @@ -25,6 +25,7 @@ //{{{ Imports import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Container; import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; @@ -56,6 +57,7 @@ import org.gjt.sp.jedit.textarea.TextAreaExtension; import org.gjt.sp.jedit.textarea.TextAreaPainter; import org.gjt.sp.jedit.textarea.TextAreaTransferHandler; +import org.gjt.sp.util.Log; import org.gjt.sp.util.SyntaxUtilities; //}}} @@ -101,6 +103,23 @@ return view; } //}}} + // {{{ get(TextArea) method + /** @return the EditPane containing the TextArea. + */ + public static EditPane get(TextArea ta) + { + if (ta == null) return null; + Container c = ta.getParent(); + while (c != null) + { + if (c instanceof EditPane) + return ((EditPane)c); + c = c.getParent(); + } + Log.log(Log.ERROR, ta, "EditPane.get(): no EditPane in TextArea parent list?"); + return null; + } // }}} + //{{{ getBuffer() method /** * Returns the current buffer. @@ -873,7 +892,6 @@ textArea = new JEditTextArea(view); - paneMap.put(textArea, this); textArea.getPainter().setAntiAlias(new AntiAlias(jEdit.getProperty("view.antiAlias"))); textArea.setMouseHandler(new MouseHandler(textArea)); textArea.setTransferHandler(new TextAreaTransferHandler()); @@ -902,17 +920,12 @@ //{{{ close() method void close() { - paneMap.remove(textArea); saveCaretInfo(); EditBus.send(new EditPaneUpdate(this,EditPaneUpdate.DESTROYED)); EditBus.removeFromBus(this); textArea.dispose(); } //}}} - public static EditPane get(TextArea ta) - { - return paneMap.get(ta); - } //}}} @@ -922,7 +935,6 @@ private boolean init; /** The View where the edit pane is. */ private final View view; - private static final Map<TextArea, EditPane> paneMap = new HashMap<TextArea, EditPane>(); private BufferSet bufferSet; /** The current buffer. */ private Buffer buffer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2008-11-26 18:23:32
|
Revision: 14107 http://jedit.svn.sourceforge.net/jedit/?rev=14107&view=rev Author: k_satoda Date: 2008-11-26 18:23:27 +0000 (Wed, 26 Nov 2008) Log Message: ----------- Replaced the use of deprecated MiscUtilities.MenuItemCompare with a new preferred alternative; org.gjt.sp.jedit.menu.MenuItemTextComparator. (SF.net patch #2308329) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java jEdit/trunk/org/gjt/sp/jedit/menu/MacrosProvider.java jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java jEdit/trunk/org/gjt/sp/jedit/menu/RecentDirectoriesProvider.java jEdit/trunk/org/gjt/sp/jedit/menu/RecentFilesProvider.java Added Paths: ----------- jEdit/trunk/org/gjt/sp/jedit/menu/MenuItemTextComparator.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/doc/CHANGES.txt 2008-11-26 18:23:27 UTC (rev 14107) @@ -38,6 +38,7 @@ }}} {{{ API Changes + - The keybindings are reloaded when the properties are changed in the standalone textarea, and the StandaloneActionSet now takes an url to the actions.xml as constructor parameter (patch #2304608) (Dakshinamurthy Karra) @@ -47,6 +48,11 @@ - Added jEdit.newFile(EditPane, ...) methods to explicitely choose an EditPane to create a new file (Matthieu Casanova) + +- Added org.gjt.sp.jedit.menu.MenuItemTextComparator as the preferred + alternative for deprecated MiscUtilities.MenuItemCompare. + (Eric Berry - SF.net patch #2308329) + }}} Modified: jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -46,7 +46,7 @@ import org.gjt.sp.util.IOUtilities; import org.gjt.sp.util.XMLUtilities; -import org.gjt.sp.jedit.menu.EnhancedMenuItem; +import org.gjt.sp.jedit.menu.MenuItemTextComparator; //}}} /** @@ -1431,22 +1431,16 @@ //{{{ MenuItemCompare class /** * Compares menu item labels. + * @deprecated Replaced with {@link org.gjt.sp.menu.compare.MenuItemTextComparator} */ @Deprecated public static class MenuItemCompare implements Compare { + private MenuItemTextComparator comparator = new MenuItemTextComparator(); + public int compare(Object obj1, Object obj2) { - boolean obj1E, obj2E; - obj1E = obj1 instanceof EnhancedMenuItem; - obj2E = obj2 instanceof EnhancedMenuItem; - if(obj1E && !obj2E) - return 1; - else if(obj2E && !obj1E) - return -1; - else - return StandardUtilities.compareStrings(((JMenuItem)obj1).getText(), - ((JMenuItem)obj2).getText(),true); + return comparator.compare((JMenuItem)obj1, (JMenuItem)obj2); } } //}}} Modified: jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -30,6 +30,7 @@ import org.gjt.sp.jedit.io.*; import org.gjt.sp.jedit.*; +import org.gjt.sp.jedit.menu.MenuItemTextComparator; //}}} /** @@ -242,7 +243,7 @@ } Collections.sort(encodingMenuItemList, - new MiscUtilities.MenuItemCompare()); + new MenuItemTextComparator()); Iterator iter = encodingMenuItemList.iterator(); while(iter.hasNext()) Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -40,6 +40,7 @@ import org.gjt.sp.jedit.*; import org.gjt.sp.jedit.buffer.JEditBuffer; import org.gjt.sp.util.Log; +import org.gjt.sp.jedit.menu.MenuItemTextComparator; //}}} /** @@ -951,7 +952,7 @@ if (!vec.isEmpty()) { - Collections.sort(vec,new MiscUtilities.MenuItemCompare()); + Collections.sort(vec,new MenuItemTextComparator()); for(int i = 0; i < vec.size(); i++) pluginMenu.add(vec.get(i)); } Modified: jEdit/trunk/org/gjt/sp/jedit/menu/MacrosProvider.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/menu/MacrosProvider.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/menu/MacrosProvider.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -80,7 +80,7 @@ } } - Collections.sort(menuItems,new MiscUtilities.MenuItemCompare()); + Collections.sort(menuItems, new MenuItemTextComparator()); for(int i = 0; i < menuItems.size(); i++) { menu.add((JMenuItem)menuItems.get(i)); Added: jEdit/trunk/org/gjt/sp/jedit/menu/MenuItemTextComparator.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/menu/MenuItemTextComparator.java (rev 0) +++ jEdit/trunk/org/gjt/sp/jedit/menu/MenuItemTextComparator.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -0,0 +1,65 @@ +/* + * MenuItemTextComparator.java - Compares the text values of two JMenuItems + * :tabSize=8:indentSize=8:noTabs=false: + * :folding=explicit:collapseFolds=1: + * + * Copyright (C) 2008 Eric Berry + * Portions copyright (C) 1999, 2005 Slava Pestov + * Portions copyright (C) 2000 Richard S. Hall + * Portions copyright (C) 2001 Dirk Moebius + * + * 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. + */ +package org.gjt.sp.jedit.menu; + +//{{{ Imports +import java.util.Comparator; + +import javax.swing.JMenuItem; + +import org.gjt.sp.util.StandardUtilities; + +//}}} +/** + * MenuItemTextComparator implements java.util.Comparator, and compares the text + * value of JMenuItems using the case-insensitive smart comparison of + * StandardUtilities.compareStrings. If one of the JMenuItems is an + * EnhancedMenuItem it is given a higher comparison value. + */ +public class MenuItemTextComparator implements Comparator<JMenuItem> +{ + + // {{{ Compare Method. + public int compare(JMenuItem obj1, JMenuItem obj2) + { + int compareValue = 0; + boolean obj1E = obj1 instanceof EnhancedMenuItem; + boolean obj2E = obj2 instanceof EnhancedMenuItem; + if (obj1E && !obj2E) + { + compareValue = 1; + } + else if (obj2E && !obj1E) + { + compareValue = -1; + } + else + { + compareValue = StandardUtilities.compareStrings(obj1.getText(), obj2.getText(), true); + } + return compareValue; + } // }}} + +} Modified: jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -105,8 +105,7 @@ for(int i = 0; i < letters.length; i++) { List list = letters[i]; - Collections.sort(list,new MiscUtilities - .MenuItemCompare()); + Collections.sort(list,new MenuItemTextComparator()); } int maxItems = jEdit.getIntegerProperty("menu.spillover",20); Modified: jEdit/trunk/org/gjt/sp/jedit/menu/RecentDirectoriesProvider.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/menu/RecentDirectoriesProvider.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/menu/RecentDirectoriesProvider.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -118,7 +118,7 @@ if(sort) { Collections.sort(menuItems, - new MiscUtilities.MenuItemCompare()); + new MenuItemTextComparator()); for(int i = 0; i < menuItems.size(); i++) { if(menu.getMenuComponentCount() >= maxItems Modified: jEdit/trunk/org/gjt/sp/jedit/menu/RecentFilesProvider.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/menu/RecentFilesProvider.java 2008-11-26 02:27:33 UTC (rev 14106) +++ jEdit/trunk/org/gjt/sp/jedit/menu/RecentFilesProvider.java 2008-11-26 18:23:27 UTC (rev 14107) @@ -164,7 +164,7 @@ if(sort) { - Collections.sort(menuItems, new MiscUtilities.MenuItemCompare()); + Collections.sort(menuItems, new MenuItemTextComparator()); for(int i = 0; i < menuItems.size(); i++) { if(menu.getMenuComponentCount() >= maxItems This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2008-12-18 16:59:46
|
Revision: 14185 http://jedit.svn.sourceforge.net/jedit/?rev=14185&view=rev Author: ezust Date: 2008-12-18 16:59:41 +0000 (Thu, 18 Dec 2008) Log Message: ----------- MD5 hash calculated inside read-lock. MD5 hash calculated after buffer saves. MD5 hash never calculated when option is off. Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/Buffer.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-12-18 02:02:09 UTC (rev 14184) +++ jEdit/trunk/doc/CHANGES.txt 2008-12-18 16:59:41 UTC (rev 14185) @@ -23,6 +23,9 @@ - When having split view, dropping a file on the inactive textArea was opening it to the active textArea (#2321838) (Matthieu Casanova) + +- MD5 hash calculated inside read-lock, and also after buffer saves. + (Alan Ezust) }}} {{{ Miscellaneous Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2008-12-18 02:02:09 UTC (rev 14184) +++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2008-12-18 16:59:41 UTC (rev 14185) @@ -1896,13 +1896,18 @@ /** @return an MD5 hash of the contents of the buffer */ private byte[] calculateHash() { -// Log.log(Log.DEBUG, this, "calculateHash()"); + final byte[] dummy = new byte[1]; + if (!jEdit.getBooleanProperty("useMD5forDirtyCalculation")) + return dummy; try { + readLock(); + Log.log(Log.NOTICE, this, "calculateHash()"); int length = getLength(); ByteBuffer bb = ByteBuffer.allocate(length * 2); // Chars are 2 bytes CharBuffer cb = bb.asCharBuffer(); cb.append( getSegment(0, length) ); + readUnlock(); MessageDigest digest = java.security.MessageDigest.getInstance("MD5"); digest.update( bb ); return digest.digest(); @@ -1910,21 +1915,28 @@ catch (NoSuchAlgorithmException nsae) { Log.log(Log.ERROR, this, "Can't Calculate MD5 hash!", nsae); - return null; + return dummy; } } + /** Update the buffer's members with the current hash and length, + * for later comparison. + */ + private void updateHash() + { + md5hash = calculateHash(); + initialLength = getLength(); + } + //{{{ finishLoading() method private void finishLoading() { - if (jEdit.getBooleanProperty("useMD5forDirtyCalculation")) - md5hash = calculateHash(); - else - md5hash = new byte[1]; - - initialLength = getLength(); + updateHash(); + + + parseBufferLocalProperties(); // AHA! // this is probably the only way to fix this @@ -1960,6 +1972,9 @@ String oldSymlinkPath, String path, boolean rename, boolean error) { + + + //{{{ Set the buffer's path // Caveat: won't work if save() called with a relative path. // But I don't think anyone calls it like that anyway. @@ -2051,6 +2066,8 @@ propertiesChanged(); } + updateHash(); + if (!isTemporary()) { EditBus.send(new BufferUpdate(this, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2008-12-21 23:43:12
|
Revision: 14193 http://jedit.svn.sourceforge.net/jedit/?rev=14193&view=rev Author: Vampire0 Date: 2008-12-21 23:43:05 +0000 (Sun, 21 Dec 2008) Log Message: ----------- - creating IntelliJ IDEA project files - changing run and run-debug to use a settings directory in the build directory so that it not clashes with a normal jEdit installation - fixing jedit_gui.props Modified Paths: -------------- jEdit/trunk/build.xml jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props Added Paths: ----------- jEdit/trunk/jEdit.iml jEdit/trunk/jEdit.ipr jEdit/trunk/jars/LatestVersion/LatestVersion.iml jEdit/trunk/jars/MacOS/MacOS.iml jEdit/trunk/jars/QuickNotepad/QuickNotepad.iml Modified: jEdit/trunk/build.xml =================================================================== --- jEdit/trunk/build.xml 2008-12-20 01:56:47 UTC (rev 14192) +++ jEdit/trunk/build.xml 2008-12-21 23:43:05 UTC (rev 14193) @@ -311,7 +311,7 @@ fork="true" spawn="true" maxmemory="192M"> - <arg value="-noserver" /> + <arg value="-settings=${build.dir}/settings" /> </java> </target> @@ -322,8 +322,8 @@ fork="true" spawn="true" maxmemory="192M"> - <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5000" /> - <arg value="-noserver" /> + <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=localhost:5005,timeout=60000" /> + <arg value="-settings=${build.dir}/settings" /> </java> </target> Added: jEdit/trunk/jEdit.iml =================================================================== --- jEdit/trunk/jEdit.iml (rev 0) +++ jEdit/trunk/jEdit.iml 2008-12-21 23:43:05 UTC (rev 14193) @@ -0,0 +1,21 @@ +<?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> + Added: jEdit/trunk/jEdit.ipr =================================================================== --- jEdit/trunk/jEdit.ipr (rev 0) +++ jEdit/trunk/jEdit.ipr 2008-12-21 23:43:05 UTC (rev 14193) @@ -0,0 +1,722 @@ +<?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/MacOS/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="MacOS Sourcefiles" pattern="file[MacOS]:macos//*.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/MacOS/MacOS.iml" filepath="$PROJECT_DIR$/jars/MacOS/MacOS.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> + Added: jEdit/trunk/jars/LatestVersion/LatestVersion.iml =================================================================== --- jEdit/trunk/jars/LatestVersion/LatestVersion.iml (rev 0) +++ jEdit/trunk/jars/LatestVersion/LatestVersion.iml 2008-12-21 23:43:05 UTC (rev 14193) @@ -0,0 +1,13 @@ +<?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" module-name="jEdit" /> + </component> +</module> + Added: jEdit/trunk/jars/MacOS/MacOS.iml =================================================================== --- jEdit/trunk/jars/MacOS/MacOS.iml (rev 0) +++ jEdit/trunk/jars/MacOS/MacOS.iml 2008-12-21 23:43:05 UTC (rev 14193) @@ -0,0 +1,13 @@ +<?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" module-name="jEdit" /> + </component> +</module> + Added: jEdit/trunk/jars/QuickNotepad/QuickNotepad.iml =================================================================== --- jEdit/trunk/jars/QuickNotepad/QuickNotepad.iml (rev 0) +++ jEdit/trunk/jars/QuickNotepad/QuickNotepad.iml 2008-12-21 23:43:05 UTC (rev 14193) @@ -0,0 +1,13 @@ +<?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" module-name="jEdit" /> + </component> +</module> + Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-12-20 01:56:47 UTC (rev 14192) +++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-12-21 23:43:05 UTC (rev 14193) @@ -935,7 +935,7 @@ # Hack: Since StringTokenizer treats two consequent \n as one token, we # insert a space by itself in the text to create blank lines. about.text=jEdit is brought to you by\n\ - \ \n\ + \n\ Slava Pestov\n\ Aaron Bell\n\ Adam Sawicki\n\ @@ -960,7 +960,7 @@ Bernhard Walle\n\ Bertalan Fodor\n\ Bill McMilleon\n\ - Bjrn "Vampire" Kautler\n\ + Bj\u00f6rn "Vampire" Kautler\n\ Brad Mace\n\ Brant Langer Gurganus\n\ Brett Smith\n\ @@ -1005,7 +1005,7 @@ Ian Maclean\n\ Igor Lesik\n\ Israel Olalla\n\ - Jakub Rozto\u010Dil\n\ + Jakub Rozto\u010dil\n\ Jamie LaScolea\n\ Jason Ginchereau\n\ Jean-Francois Larvoire\n\ @@ -1125,8 +1125,8 @@ Will Varfar\n\ Wiktor Adamski\n\ Wojciech Stryjewski\n\ - Wolfgang Chico-T\u00F6pfer\n\ - \ \n\ + Wolfgang Chico-T\u00f6pfer\n\ + \n\ I'd also like to thank the users for their\n\ comments, feedback and bug reports. #}}} @@ -1244,7 +1244,7 @@ badurl.title=Invalid URL # {0} - the URL # {1} - the error -badurl.message=The following URL is invalid: {0}\n +badurl.message=The following URL is invalid: {0}\n\ ({1}) #}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2008-12-22 14:38:55
|
Revision: 14194 http://jedit.svn.sourceforge.net/jedit/?rev=14194&view=rev Author: kpouer Date: 2008-12-22 14:38:45 +0000 (Mon, 22 Dec 2008) Log Message: ----------- new JavaFX edit mode Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/modes/catalog Added Paths: ----------- jEdit/trunk/modes/javafx.xml Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-12-21 23:43:05 UTC (rev 14193) +++ jEdit/trunk/doc/CHANGES.txt 2008-12-22 14:38:45 UTC (rev 14194) @@ -2,8 +2,8 @@ {{{ Version 4.3pre17 -Thanks to Bj\xF6rn "Vampire" Kautler, Dakshinamurthy Karra and Dale Anson for -contributing to this release. +Thanks to Bj\xF6rn "Vampire" Kautler, Matthieu Casanova, Dakshinamurthy Karra and +Dale Anson for contributing to this release. {{{ Bug Fixes @@ -57,8 +57,10 @@ (Eric Berry - SF.net patch #2308329) }}} +{{{ Editing +- New JavaFX edit mode (Matthieu Casanova) +}}} - }}} {{{ Version 4.3pre16 Modified: jEdit/trunk/modes/catalog =================================================================== --- jEdit/trunk/modes/catalog 2008-12-21 23:43:05 UTC (rev 14193) +++ jEdit/trunk/modes/catalog 2008-12-22 14:38:45 UTC (rev 14194) @@ -203,6 +203,9 @@ <MODE NAME="java" FILE="java.xml" FILE_NAME_GLOB="*.java" /> +<MODE NAME="javafx" FILE="javafx.xml" + FILE_NAME_GLOB="*.fx" /> + <MODE NAME="javascript" FILE="javascript.xml" FILE_NAME_GLOB="{*.js,Buildsub}" /> Added: jEdit/trunk/modes/javafx.xml =================================================================== --- jEdit/trunk/modes/javafx.xml (rev 0) +++ jEdit/trunk/modes/javafx.xml 2008-12-22 14:38:45 UTC (rev 14194) @@ -0,0 +1,89 @@ +<?xml version="1.0"?> +<!DOCTYPE MODE SYSTEM "xmode.dtd"> +<MODE> + <PROPS> + <PROPERTY NAME="indentOpenBrackets" VALUE="{" /> + <PROPERTY NAME="indentCloseBrackets" VALUE="}" /> + </PROPS> + + <RULES IGNORE_CASE="FALSE" + HIGHLIGHT_DIGITS="TRUE" + DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))"> + <!--{{{ Javadoc comment --> + <SPAN TYPE="COMMENT3" DELEGATE="java::JAVADOC"> + <BEGIN>/**</BEGIN> + <END>*/</END> + </SPAN> + <!--}}}--> + + <!-- {{{ Java comment (C style) --> + <SPAN TYPE="COMMENT1"> + <BEGIN>/*</BEGIN> + <END>*/</END> + </SPAN> + <!--}}}--> + + <!--{{{ literal --> + <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE"> + <BEGIN>"</BEGIN> + <END>"</END> + </SPAN> + <!--}}}--> + + <SEQ TYPE="OPERATOR">=</SEQ> + <SEQ TYPE="OPERATOR">!</SEQ> + <SEQ TYPE="OPERATOR">>=</SEQ> + <SEQ TYPE="OPERATOR"><=</SEQ> + <SEQ TYPE="OPERATOR">+</SEQ> + <SEQ TYPE="OPERATOR">-</SEQ> + <SEQ TYPE="OPERATOR">/</SEQ> + + <!-- workaround to stop "*" from being colorized + in import statements. --> + <SEQ TYPE="NULL">.*</SEQ> + + <SEQ TYPE="OPERATOR">*</SEQ> + <SEQ TYPE="OPERATOR">></SEQ> + <SEQ TYPE="OPERATOR"><</SEQ> + <SEQ TYPE="OPERATOR">%</SEQ> + <SEQ TYPE="OPERATOR">&</SEQ> + <SEQ TYPE="OPERATOR">|</SEQ> + <SEQ TYPE="OPERATOR">^</SEQ> + <SEQ TYPE="OPERATOR">~</SEQ> + <SEQ TYPE="OPERATOR">}</SEQ> + <SEQ TYPE="OPERATOR">{</SEQ> + <MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR" + AT_WHITESPACE_END="TRUE">:</MARK_PREVIOUS> + + <KEYWORDS> + <KEYWORD1>and</KEYWORD1> + <KEYWORD1>if</KEYWORD1> + <KEYWORD1>else</KEYWORD1> + <KEYWORD1>extends</KEYWORD1> + <KEYWORD1>function</KEYWORD1> + <KEYWORD1>not</KEYWORD1> + <KEYWORD1>or</KEYWORD1> + <KEYWORD1>override</KEYWORD1> + <KEYWORD1>protected</KEYWORD1> + <KEYWORD1>public-init</KEYWORD1> + <KEYWORD1>public</KEYWORD1> + <KEYWORD1>return</KEYWORD1> + + <KEYWORD2>as</KEYWORD2> + <KEYWORD2>bind</KEYWORD2> + <KEYWORD2>def</KEYWORD2> + <KEYWORD2>import</KEYWORD2> + <KEYWORD2>package</KEYWORD2> + <KEYWORD2>var</KEYWORD2> + <KEYWORD2>var</KEYWORD2> + + <KEYWORD3>class</KEYWORD3> + + <LITERAL2>false</LITERAL2> + <LITERAL2>null</LITERAL2> + <LITERAL2>this</LITERAL2> + <LITERAL2>true</LITERAL2> + </KEYWORDS> + </RULES> +</MODE> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2008-12-30 04:21:25
|
Revision: 14251 http://jedit.svn.sourceforge.net/jedit/?rev=14251&view=rev Author: ezust Date: 2008-12-30 04:21:21 +0000 (Tue, 30 Dec 2008) Log Message: ----------- [ 1954810 ] Patch for XSLT mode ('value' attribute) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/modes/xsl.xml Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-12-29 23:33:14 UTC (rev 14250) +++ jEdit/trunk/doc/CHANGES.txt 2008-12-30 04:21:21 UTC (rev 14251) @@ -62,6 +62,9 @@ }}} {{{ Editing - New JavaFX edit mode (Matthieu Casanova) + +- Fixes to XSLT mode (Pascal Sancho - # 1954810) + }}} }}} Modified: jEdit/trunk/modes/xsl.xml =================================================================== --- jEdit/trunk/modes/xsl.xml 2008-12-29 23:33:14 UTC (rev 14250) +++ jEdit/trunk/modes/xsl.xml 2008-12-30 04:21:21 UTC (rev 14251) @@ -247,6 +247,15 @@ <BEGIN>use[\p{Space}]*=[\p{Space}]*'</BEGIN> <END>'</END> </SPAN_REGEXP> + <!-- value --> + <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="value" DELEGATE="XPATH"> + <BEGIN>value[\p{Space}]*=[\p{Space}]*"</BEGIN> + <END>"</END> + </SPAN_REGEXP> + <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="select" DELEGATE="XPATH"> + <BEGIN>select[\p{Space}]*=[\p{Space}]*'</BEGIN> + <END>'</END> + </SPAN_REGEXP> <!-- Namespace declarations --> <SEQ TYPE="OPERATOR">xmlns:</SEQ> @@ -434,3 +443,5 @@ </RULES> </MODE> + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2008-12-30 04:30:57
|
Revision: 14252 http://jedit.svn.sourceforge.net/jedit/?rev=14252&view=rev Author: ezust Date: 2008-12-30 04:30:55 +0000 (Tue, 30 Dec 2008) Log Message: ----------- [ 1934498 ] iCalendar mode Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/modes/catalog Added Paths: ----------- jEdit/trunk/modes/ical.xml Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2008-12-30 04:21:21 UTC (rev 14251) +++ jEdit/trunk/doc/CHANGES.txt 2008-12-30 04:30:55 UTC (rev 14252) @@ -2,8 +2,9 @@ {{{ Version 4.3pre17 -Thanks to Bj\xF6rn "Vampire" Kautler, Matthieu Casanova, Dakshinamurthy Karra and -Dale Anson for contributing to this release. +Thanks to Bj\xF6rn "Vampire" Kautler, Matthieu Casanova, Dakshinamurthy Karra, +Pascal Sancho, Victor Engmark, Alan Ezust, and Dale Anson for contributing to +this release. {{{ Bug Fixes @@ -33,12 +34,6 @@ }}} {{{ Miscellaneous -- Fix for java mode (tracker 737187), method name not always highlighted if - there were one or more spaces or tabs following the method name (Dale Anson) - -- 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) - Removed redundant TextArea:EditPane map in EditPane.java in favor of a linear search through parent container linked list. (Alan Ezust) @@ -65,6 +60,16 @@ - Fixes to XSLT mode (Pascal Sancho - # 1954810) +- New icalendar mode (Victor Engmark - #1934498 + +- Fix for java mode (tracker 737187), method name not always highlighted if + there were one or more spaces or tabs following the method name (Dale Anson) + +- 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) + + }}} }}} Modified: jEdit/trunk/modes/catalog =================================================================== --- jEdit/trunk/modes/catalog 2008-12-30 04:21:21 UTC (rev 14251) +++ jEdit/trunk/modes/catalog 2008-12-30 04:30:55 UTC (rev 14252) @@ -176,6 +176,9 @@ <MODE NAME="i4gl" FILE="i4gl.xml" FILE_NAME_GLOB="*.4gl" /> +<MODE NAME="icalendar" FILE="ical.xml" + FILE_NAME_GLOB="*.ics" /> + <MODE NAME="icon" FILE="icon.xml" FILE_NAME_GLOB="*.icn" /> Added: jEdit/trunk/modes/ical.xml =================================================================== --- jEdit/trunk/modes/ical.xml (rev 0) +++ jEdit/trunk/modes/ical.xml 2008-12-30 04:30:55 UTC (rev 14252) @@ -0,0 +1,204 @@ +<?xml version="1.0"?> + +<!DOCTYPE MODE SYSTEM "xmode.dtd"> + +<!-- iCalendar mode by Victor Engmark <vic...@gm...> --> + +<MODE> + <PROPS> + <PROPERTY NAME="lineComment" VALUE="COMMENT"/> + + <PROPERTY NAME="wordBreakChars" VALUE=",;:=+/?^*&"/> + + <!-- Indentation --> + <PROPERTY NAME="maxLineLen" VALUE="75"/> + <PROPERTY NAME="wrap" VALUE="hard"/> + <PROPERTY NAME="indentSize" VALUE="1"/> + + <!-- Use single space instead of tabs --> + <PROPERTY NAME="noTabs" VALUE="1"/> + <PROPERTY NAME="tabSize" VALUE="1"/> + </PROPS> + + <!-- General rules --> + <RULES IGNORE_CASE="FALSE"> + <SPAN AT_LINE_START="TRUE" DELEGATE="VCALENDAR" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:VCALENDAR</BEGIN> + <END>END:VCALENDAR</END> + </SPAN> + </RULES> + + <!-- Entire calendar --> + <RULES SET="VCALENDAR" IGNORE_CASE="FALSE"> + <!-- Time zone settings --> + <SPAN AT_LINE_START="TRUE" DELEGATE="VTIMEZONE" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:VTIMEZONE</BEGIN> + <END>END:VTIMEZONE</END> + </SPAN> + + <!-- Event --> + <SPAN AT_LINE_START="TRUE" DELEGATE="VEVENT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:VEVENT</BEGIN> + <END>END:VEVENT</END> + </SPAN> + + <!-- TODO (treated like event for now) --> + <SPAN AT_LINE_START="TRUE" DELEGATE="VEVENT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:VTODO</BEGIN> + <END>END:VTODO</END> + </SPAN> + + <!-- Journal (treated like event for now) --> + <SPAN AT_LINE_START="TRUE" DELEGATE="VEVENT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:VJOURNAL</BEGIN> + <END>END:VJOURNAL</END> + </SPAN> + + <KEYWORDS> + <KEYWORD2>CALSCALE</KEYWORD2> + <LITERAL2>GREGORIAN</LITERAL2> + <KEYWORD2>METHOD</KEYWORD2> + <KEYWORD2>PRODID</KEYWORD2> + <KEYWORD2>VERSION</KEYWORD2> + <LITERAL2>2.0</LITERAL2> + </KEYWORDS> + </RULES> + + <!-- Time zone settings --> + <RULES SET="VTIMEZONE" IGNORE_CASE="FALSE"> + <!-- Daylight savings settings --> + <SPAN AT_LINE_START="TRUE" DELEGATE="DAYLIGHT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:DAYLIGHT</BEGIN> + <END>END:DAYLIGHT</END> + </SPAN> + + <!-- Time zone standard settings --> + <SPAN AT_LINE_START="TRUE" DELEGATE="STANDARD" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:STANDARD</BEGIN> + <END>END:STANDARD</END> + </SPAN> + + <IMPORT DELEGATE="CUSTOM_KEYWORDS"/> + + <KEYWORDS> + <KEYWORD2>TZID</KEYWORD2> + </KEYWORDS> + </RULES> + + <!-- Daylight savings settings --> + <RULES SET="DAYLIGHT" IGNORE_CASE="FALSE"> + <IMPORT DELEGATE="VCALENDAR_KEYWORDS"/> + <IMPORT DELEGATE="VTIMEZONE_KEYWORDS"/> + </RULES> + + <!-- Time zone standard settings --> + <RULES SET="STANDARD" IGNORE_CASE="FALSE"> + <IMPORT DELEGATE="VCALENDAR_KEYWORDS"/> + <IMPORT DELEGATE="VTIMEZONE_KEYWORDS"/> + </RULES> + + <!-- Event --> + <RULES SET="VEVENT" IGNORE_CASE="FALSE"> + <!-- Alarm --> + <SPAN AT_LINE_START="TRUE" DELEGATE="VALARM" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1"> + <BEGIN>BEGIN:VALARM</BEGIN> + <END>END:VALARM</END> + </SPAN> + + <IMPORT DELEGATE="VCALENDAR_KEYWORDS"/> + <IMPORT DELEGATE="CUSTOM_KEYWORDS"/> + <IMPORT DELEGATE="VEVENT_KEYWORDS"/> + + <KEYWORDS> + <KEYWORD2>ATTENDEE</KEYWORD2> + <KEYWORD2>CATEGORIES</KEYWORD2> + <KEYWORD2>CLASS</KEYWORD2> + <LITERAL2>CONFIDENTIAL</LITERAL2> + <LITERAL2>PRIVATE</LITERAL2> + <LITERAL2>PUBLIC</LITERAL2> + <KEYWORD2>COMPLETED</KEYWORD2> + <KEYWORD2>CREATED</KEYWORD2> + <KEYWORD2>DESCRIPTION</KEYWORD2> + <KEYWORD2>DTEND</KEYWORD2> + <KEYWORD2>DTSTAMP</KEYWORD2> + <KEYWORD2>DTSTART</KEYWORD2> + <KEYWORD2>DUE</KEYWORD2> + <KEYWORD2>LAST-MODIFIED</KEYWORD2> + <KEYWORD2>LOCATION</KEYWORD2> + <KEYWORD2>PERCENT-COMPLETE</KEYWORD2> + <KEYWORD2>PRIORITY</KEYWORD2> + <KEYWORD2>RECURRENCE-ID</KEYWORD2> + <KEYWORD3>RSVP</KEYWORD3> + <LITERAL3>FALSE</LITERAL3> + <LITERAL3>TRUE</LITERAL3> + <KEYWORD2>SEQUENCE</KEYWORD2> + <KEYWORD2>STATUS</KEYWORD2> + <KEYWORD2>SUMMARY</KEYWORD2> + <KEYWORD2>TRANSP</KEYWORD2> + <LITERAL2>OPAQUE</LITERAL2> + <LITERAL2>TRANSPARENT</LITERAL2> + <KEYWORD2>UID</KEYWORD2> + <KEYWORD2>URL</KEYWORD2> + <KEYWORD3>TZID</KEYWORD3> + </KEYWORDS> + </RULES> + + <!-- Alarm --> + <RULES SET="VALARM" IGNORE_CASE="FALSE"> + <IMPORT DELEGATE="RIGHT"/> + <IMPORT DELEGATE="CUSTOM_KEYWORDS"/> + <IMPORT DELEGATE="VEVENT_KEYWORDS"/> + + <KEYWORDS> + <KEYWORD2>ACTION</KEYWORD2> + <KEYWORD2>DESCRIPTION</KEYWORD2> + <KEYWORD2>TRIGGER</KEYWORD2> + </KEYWORDS> + </RULES> + + <!-- Colon + right side text --> + <RULES SET="RIGHT" IGNORE_CASE="FALSE"> + <EOL_SPAN AT_LINE_START="FALSE" MATCH_TYPE="OPERATOR" DELEGATE="RIGHT_TEXT">:</EOL_SPAN> + </RULES> + + <!-- Right side of the colon --> + <RULES SET="RIGHT_TEXT" IGNORE_CASE="FALSE" DEFAULT="LITERAL4"> + </RULES> + + <RULES SET="VCALENDAR_KEYWORDS" IGNORE_CASE="FALSE"> + <KEYWORDS> + <KEYWORD2>RRULE</KEYWORD2> + <KEYWORD4>BYDAY</KEYWORD4> + <KEYWORD4>BYMONTH</KEYWORD4> + <KEYWORD4>FREQ</KEYWORD4> + <KEYWORD4>INTERVAL</KEYWORD4> + <LITERAL4>YEARLY</LITERAL4> + </KEYWORDS> + </RULES> + + <RULES SET="VTIMEZONE_KEYWORDS" IGNORE_CASE="FALSE"> + <KEYWORDS> + <KEYWORD2>DTSTART</KEYWORD2> + <KEYWORD2>TZNAME</KEYWORD2> + <KEYWORD2>TZOFFSETFROM</KEYWORD2> + <KEYWORD2>TZOFFSETTO</KEYWORD2> + </KEYWORDS> + </RULES> + + <RULES SET="VEVENT_KEYWORDS" IGNORE_CASE="FALSE"> + <KEYWORDS> + <LITERAL2>CONFIRMED</LITERAL2> + <LITERAL2>PRIVATE</LITERAL2> + <KEYWORD3>VALUE</KEYWORD3> + <LITERAL3>DATE</LITERAL3> + <LITERAL3>DURATION</LITERAL3> + </KEYWORDS> + </RULES> + + <!-- Custom keywords --> + <RULES SET="CUSTOM_KEYWORDS" IGNORE_CASE="FALSE"> + <SEQ_REGEXP HASH_CHAR="X" AT_LINE_START="TRUE" TYPE="INVALID">X-[A-Za-z-]+</SEQ_REGEXP> + </RULES> +</MODE> + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2009-01-04 13:03:43
|
Revision: 14295 http://jedit.svn.sourceforge.net/jedit/?rev=14295&view=rev Author: k_satoda Date: 2009-01-04 13:03:39 +0000 (Sun, 04 Jan 2009) Log Message: ----------- Fixed a NPE which had prevented to switch from a loading buffer to another. Here is a stack trace of the NPE at r14287. Steps to reproduce: 1. Open a file. 2. Start loading a large file, and quickly... 3. switch to prev buffer. java.lang.NullPointerException at org.gjt.sp.jedit.buffer.JEditBuffer.markTokens(JEditBuffer.java:1304) at org.gjt.sp.jedit.textarea.ChunkCache.lineToChunkList(ChunkCache.java:782) at org.gjt.sp.jedit.textarea.ChunkCache.updateChunksUpTo(ChunkCache.java:659) at org.gjt.sp.jedit.textarea.ChunkCache.getLineInfo(ChunkCache.java:256) at org.gjt.sp.jedit.textarea.ChunkCache.getScreenLineOfOffset(ChunkCache.java:84) at org.gjt.sp.jedit.textarea.TextArea._finishCaretUpdate(TextArea.java:4876) at org.gjt.sp.jedit.textarea.TextArea.finishCaretUpdate(TextArea.java:5075) at org.gjt.sp.jedit.textarea.TextArea.setSelection(TextArea.java:1723) at org.gjt.sp.jedit.textarea.TextArea.selectNone(TextArea.java:1694) at org.gjt.sp.jedit.textarea.TextArea.setBuffer(TextArea.java:384) at org.gjt.sp.jedit.EditPane.setBuffer(EditPane.java:178) at org.gjt.sp.jedit.EditPane.setBuffer(EditPane.java:142) at org.gjt.sp.jedit.EditPane.prevBuffer(EditPane.java:238) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2009-01-04 12:30:10 UTC (rev 14294) +++ jEdit/trunk/doc/CHANGES.txt 2009-01-04 13:03:39 UTC (rev 14295) @@ -34,6 +34,9 @@ - Fix #1974620: Cannot use C+e C+BACK_QUOTE for close-docking-area. (Shlomy Reinstein) +- Fixed a NPE which had prevented to switch from a loading buffer to + another. (Kazutoshi Satoda) + }}} {{{ Miscellaneous Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2009-01-04 12:30:10 UTC (rev 14294) +++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2009-01-04 13:03:39 UTC (rev 14295) @@ -380,7 +380,7 @@ // dubious? //setFirstLine(0); - if(!buffer.isLoading()) + if(!this.buffer.isLoading()) selectNone(); caretLine = caret = caretScreenLine = 0; match = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-01-05 08:51:42
|
Revision: 14298 http://jedit.svn.sourceforge.net/jedit/?rev=14298&view=rev Author: shlomy Date: 2009-01-05 08:51:38 +0000 (Mon, 05 Jan 2009) Log Message: ----------- Fixed bug #2017514: Selection occasionally lost after right-click. Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/textarea/MouseHandler.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2009-01-05 06:55:41 UTC (rev 14297) +++ jEdit/trunk/doc/CHANGES.txt 2009-01-05 08:51:38 UTC (rev 14298) @@ -37,6 +37,8 @@ - Fixed a NPE which had prevented to switch from a loading buffer to another. (Kazutoshi Satoda) +- Fix #2017514: Selection occasionally lost after right-click. + }}} {{{ Miscellaneous Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/MouseHandler.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/textarea/MouseHandler.java 2009-01-05 06:55:41 UTC (rev 14297) +++ jEdit/trunk/org/gjt/sp/jedit/textarea/MouseHandler.java 2009-01-05 08:51:38 UTC (rev 14298) @@ -162,6 +162,7 @@ textArea.selectNone(); } + maybeDragAndDrop = false; dragged = false; } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2009-01-07 03:09:16
|
Revision: 14311 http://jedit.svn.sourceforge.net/jedit/?rev=14311&view=rev Author: ezust Date: 2009-01-07 03:09:14 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Changed "news43" to "news44" Cleaned up the doc and updated it. Modified Paths: -------------- jEdit/trunk/build.xml jEdit/trunk/doc/news44/news.xml jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java Added Paths: ----------- jEdit/trunk/doc/news44/ Removed Paths: ------------- jEdit/trunk/doc/news43/ Modified: jEdit/trunk/build.xml =================================================================== --- jEdit/trunk/build.xml 2009-01-06 22:03:29 UTC (rev 14310) +++ jEdit/trunk/build.xml 2009-01-07 03:09:14 UTC (rev 14311) @@ -387,15 +387,15 @@ unless="config.xsltproc.executable" /> <fail message="Please set the "docbook.catalog" in build.properties" unless="config.docbook.catalog" /> - <mkdir dir="${doc.output.location}/news43" /> + <mkdir dir="${doc.output.location}/news44" /> <exec executable="${config.xsltproc.executable}" dir="doc" failonerror="true"> <arg value="--output" /> - <arg value="../${doc.output.location}/news43/" /> + <arg value="../${doc.output.location}/news44/" /> <arg value="--catalogs" /> <arg value="jedithtml.xsl" /> - <arg value="news43/news.xml" /> + <arg value="news44/news.xml" /> <env key="SGML_CATALOG_FILES" file="${config.docbook.catalog}" /> </exec> @@ -468,11 +468,11 @@ type="file" /> <antcall target="generate-doc-faq" /> <dependset> - <srcfileset dir="doc/news43" /> - <targetfileset dir="${doc.output.location}/news43" /> + <srcfileset dir="doc/news44" /> + <targetfileset dir="${doc.output.location}/news44" /> </dependset> <available property="news.is.up.to.date" - file="${doc.output.location}/news43/toc.xml" + file="${doc.output.location}/news44/toc.xml" type="file" /> <antcall target="generate-doc-news" /> <dependset> @@ -1485,4 +1485,4 @@ </fileset> </delete> </target> -</project> +</project> \ No newline at end of file Property changes on: jEdit/trunk/doc/news44 ___________________________________________________________________ Added: svn:mergeinfo + Modified: jEdit/trunk/doc/news44/news.xml =================================================================== --- jEdit/trunk/doc/news43/news.xml 2009-01-06 22:03:29 UTC (rev 14310) +++ jEdit/trunk/doc/news44/news.xml 2009-01-07 03:09:14 UTC (rev 14311) @@ -8,15 +8,6 @@ <firstname>Alan</firstname> <surname>Ezust</surname> </author> - <author> - <firstname>Slava</firstname> - <surname>Pestov</surname> - </author> - <copyright> - <year>2008</year> - <year>2008</year> - <holder>Alan Ezust</holder> - </copyright> <legalnotice> <title>Legal Notice</title> <para>Permission is granted to copy, distribute and/or modify this @@ -28,10 +19,16 @@ the file <filename>COPYING.DOC.txt</filename> included with the jEdit distribution.</para> </legalnotice> - <title>What's New in jEdit 4.3</title> + <title>What's New in jEdit 4.4</title> </bookinfo> <preface id="preface"> <title>Preface</title> + <para> First of all, jEdit 4.4 is the new name for jEdit 4.3. + We had to "skip" a point release in order to avoid version numbering + confusion. No longer will jEdit be called "pre" or "final": + instead, we are moving over to straight-decimal x.y.z.w version + numbering scheme. + </para> <para>jEdit is a very mature text editor, and has gone through a very interesting phase of development. Left in a "prerelease" stage for about four years, it's had a long time to solifidy. Many of the original @@ -43,7 +40,7 @@ url="http://sourceforge.net/project/stats/detail.php?group_id=588&ugn=jedit&type=prdownload&mode=year&package_id=0">reports</ulink> that there are on average at least a half-million downloads per year, and this has been true for the entire millenium.</para> - <para>In terms of actual releases, there may have been a slight lull + <para>In terms of actual releases, there was a bit of a lull while Slava's absense was sinking in among the other members of the community, but in 2006, thanks to their generous donations of time, effort, and coding skills, we started releasing regular prereleases @@ -55,7 +52,7 @@ source of things to do. I anticipate that the trackers will always have many open issues, but I see many of the old ones finally being closed, and that is very much satisfying. I can say with complete confidence - that 4.3 is an improvement over 4.2 in many different ways. I hope that + that 4.4 is an improvement over 4.2 in every possible way. I hope that after you read this document, you will think so too, and perhaps want to join in on the development of future versions of jEdit or its plugins.</para> @@ -76,15 +73,16 @@ <title>Acknowledgements</title> <para>This release would not have been possible if it were not for the frequent help and efforts of Dale Anson, Jeffrey Hoyt, Marcelo Vanzin, - Matthieu Casanova, Shlomy Reinstein, Seph Soliman, Eric Berry, Robert Schwenn. - and Björn "Vampire" Kautler. I would also like to give sincere thanks to all + Matthieu Casanova, Kazutoshi Satoda, Shlomy Reinstein, Seph Soliman, + Eric Berry, Robert Schwenn, and Björn "Vampire" Kautler. + I would also like to give sincere thanks to all of the other core and plugin developers who have made <ulink url="../CHANGES.txt">significant contributions</ulink> to help keep this editor alive and on the cutting edge.</para> </preface> <chapter id="compatibility"> <title>Java Compatibility</title> - <para>jEdit 4.3 requires Sun + <para>jEdit 4.4 requires Sun Java 1.5.0 or later. Older versions of Java are not supported.</para> <para>If you want to use the new LCD Antialiasing feature of Java 1.6, it is supported. From <guimenuitem>Global Options - Text Area - @@ -200,7 +198,7 @@ <title>Bundled Macros</title> <para>There are a number of new bundled macros, and most of the existing ones have undergone enhancements and bug fixes. jEdit 4.2 - bundled 58 macros in 7 categories; jEdit 4.3 bundles 75 macros in 9 + bundled 58 macros in 7 categories; jEdit 4.4 bundles 75 macros in 9 categories.</para> <para>Of course you can create new macros of your own, either by recording actions or writing them from scratch.</para> @@ -228,7 +226,7 @@ <title>Plugin API changes</title> <para>jEdit 4.2 used to run plugins that were designed only for the 4.1 plugin API, but plugins that are missing the "activate" property - will no longer load properly in 4.3final.</para> + will no longer load properly in 4.3.</para> <para>There are two new properties that all plugins can have: <literal>description</literal> and <literal>longdescription</literal>. The former is just a string @@ -265,15 +263,17 @@ </section> </chapter> <chapter id="new-plugins"> - <title>The core 4.3 plugins</title> + <title>The core plugins</title> <para>This chapter showcases the new(er) plugins that were under the most active development during jEdit 4.3. Some of them influenced the development of the jEdit core, and others are good enough to be incorporated into the core, but are left as separate plugins simply because it makes it easier for us to maintain and debug them.</para> + <para>The latest version of <emphasis role="bold">Console</emphasis> + has many improvements, and takes advantage of new features of jEdit. </para> <para>Navigator, providing a navigable history, is new and improved - it provides the user with Eclipse-like Navigation to previous locations, - for each TextArea of each View. It uses new 4.3 EditBus messages which + for each TextArea of each View. It uses new EditBus messages which are now available in the public API, PositionChanging and BufferChanging.</para> <bridgehead>ProjectViewer</bridgehead> @@ -310,26 +310,10 @@ parsers for CSS, one for Ecmascript, and completion popups for elements and attributes in XML, CSS, and HTML.</para> <para>If you use many different languages, you should also try out the - very clever ContextMenu plugin, which I am seriously thinking of adding - to the core one of these days.</para> + very clever ContextMenu plugin. </para> <para>The SVNPlugin is new, and the JDiff plugin is improved. Many other plugins have latest versions that require jEdit 4.3. </para> - <formalpara> - <title>InfoViewer</title> - <para>This plugin uses jEdit 4.3's action overriding API to serve as - a replacement to the HelpViewer. Since I use/work with this instead - of the built-in HelpViewer, I do not notice or fix bugs in - HelpViewer. Try it out - you might like it! At some point, I might - merge this into the jEdit core, but for now, it's a separate - plugin.</para> - </formalpara> - <formalpara> - <title>XSearch</title> - <para>XSearch is a replacement for the built-in search dialogs. - Similarly, there are new features in XSearch which have not been put - into the core yet. XSearch has good ProjectViewer integration too - - you can search only the files that were added to the project.</para> - </formalpara> + </chapter> <chapter id="futureplans"> <title>Future Plans</title> @@ -345,4 +329,4 @@ for examples of some of the work that was started but not finished yet on the core. Some plugins also have their own TODO lists.</para> </chapter> -</book> +</book> \ No newline at end of file Modified: jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java 2009-01-06 22:03:29 UTC (rev 14310) +++ jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java 2009-01-07 03:09:14 UTC (rev 14311) @@ -91,7 +91,7 @@ { indexDirectory(MiscUtilities.constructPath(jEditHome,"doc","users-guide")); indexDirectory(MiscUtilities.constructPath(jEditHome,"doc","FAQ")); - indexDirectory(MiscUtilities.constructPath(jEditHome,"doc","news43")); + indexDirectory(MiscUtilities.constructPath(jEditHome,"doc","news44")); } } catch(Throwable e) @@ -392,4 +392,4 @@ return false; } } //}}} -} +} \ No newline at end of file Modified: jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java 2009-01-06 22:03:29 UTC (rev 14310) +++ jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java 2009-01-07 03:09:14 UTC (rev 14311) @@ -159,7 +159,7 @@ tocRoot.add(createNode("COPYING.PLUGINS.txt", jEdit.getProperty("helpviewer.toc.copying-plugins"))); - loadTOC(tocRoot,"news43/toc.xml"); + loadTOC(tocRoot,"news44/toc.xml"); loadTOC(tocRoot,"users-guide/toc.xml"); loadTOC(tocRoot,"FAQ/toc.xml"); @@ -465,4 +465,4 @@ true); } } //}}} -} +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2009-01-10 20:28:28
|
Revision: 14338 http://jedit.svn.sourceforge.net/jedit/?rev=14338&view=rev Author: ezust Date: 2009-01-10 20:28:23 +0000 (Sat, 10 Jan 2009) Log Message: ----------- 1. got rid of the need for catalogs in the docbook doc generation. the schema is not needed except to validate and validation isn't needed during transformation. We can validate while editing the file, from the xml plugin, which can cache DTDs anyway. 2. fixed some mistakes in the XML markup. Modified Paths: -------------- jEdit/trunk/build.xml jEdit/trunk/doc/users-guide/users-guide.xml Modified: jEdit/trunk/build.xml =================================================================== --- jEdit/trunk/build.xml 2009-01-10 20:04:07 UTC (rev 14337) +++ jEdit/trunk/build.xml 2009-01-10 20:28:23 UTC (rev 14338) @@ -363,19 +363,14 @@ unless="faq.is.up.to.date"> <fail message="Please set the "xsltproc.executable" in build.properties" unless="config.xsltproc.executable" /> - <fail message="Please set the "docbook.catalog" in build.properties" - unless="config.docbook.catalog" /> <mkdir dir="${doc.output.location}/FAQ" /> <exec executable="${config.xsltproc.executable}" dir="doc" failonerror="true"> <arg value="--output" /> <arg value="../${doc.output.location}/FAQ/" /> - <arg value="--catalogs" /> <arg value="jedithtml.xsl" /> <arg value="FAQ/faq.xml" /> - <env key="SGML_CATALOG_FILES" - file="${config.docbook.catalog}" /> </exec> </target> @@ -385,19 +380,14 @@ unless="news.is.up.to.date"> <fail message="Please set the "xsltproc.executable" in build.properties" unless="config.xsltproc.executable" /> - <fail message="Please set the "docbook.catalog" in build.properties" - unless="config.docbook.catalog" /> <mkdir dir="${doc.output.location}/news44" /> <exec executable="${config.xsltproc.executable}" dir="doc" failonerror="true"> <arg value="--output" /> <arg value="../${doc.output.location}/news44/" /> - <arg value="--catalogs" /> <arg value="jedithtml.xsl" /> <arg value="news44/news.xml" /> - <env key="SGML_CATALOG_FILES" - file="${config.docbook.catalog}" /> </exec> </target> @@ -407,19 +397,14 @@ unless="users-guide.is.up.to.date"> <fail message="Please set the "xsltproc.executable" in build.properties" unless="config.xsltproc.executable" /> - <fail message="Please set the "docbook.catalog" in build.properties" - unless="config.docbook.catalog" /> <mkdir dir="${doc.output.location}/users-guide" /> <exec executable="${config.xsltproc.executable}" dir="doc" failonerror="true"> <arg value="--output" /> <arg value="../${doc.output.location}/users-guide/" /> - <arg value="--catalogs" /> <arg value="jedithtml.xsl" /> <arg value="users-guide/users-guide.xml" /> - <env key="SGML_CATALOG_FILES" - file="${config.docbook.catalog}" /> </exec> </target> @@ -577,8 +562,6 @@ unless="pdf-users-guide.is.up.to.date"> <fail message="Please set the "xsltproc.executable" in build.properties" unless="config.xsltproc.executable" /> - <fail message="Please set the "docbook.catalog" in build.properties" - unless="config.docbook.catalog" /> <fail message="Please set the "fop.dir" in build.properties" unless="config.fop.dir" /> <antcall target="generate-docbook-wrapper"> @@ -603,11 +586,8 @@ <arg value=""${paper.type}"" /> <arg value="--output" /> <arg value="../${docs-pdf.classes.dir}/${manual.filename.prefix}${manual.filename.paper.type}.fot" /> - <arg value="--catalogs" /> <arg value="jeditfo.xsl" /> <arg value="users-guide/users-guide.xml" /> - <env key="SGML_CATALOG_FILES" - file="${config.docbook.catalog}" /> </exec> <delete file="doc/docbook-wrapper-fo.xsl" failonerror="false" /> Modified: jEdit/trunk/doc/users-guide/users-guide.xml =================================================================== --- jEdit/trunk/doc/users-guide/users-guide.xml 2009-01-10 20:04:07 UTC (rev 14337) +++ jEdit/trunk/doc/users-guide/users-guide.xml 2009-01-10 20:28:23 UTC (rev 14338) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!-- jEdit buffer-local properties: --> <!-- maxLineLen=0:wrap=soft:indentSize=1:noTabs=true: --> <!-- jEdit user's guide --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2009-01-15 16:52:55
|
Revision: 14357 http://jedit.svn.sourceforge.net/jedit/?rev=14357&view=rev Author: kpouer Date: 2009-01-15 16:52:41 +0000 (Thu, 15 Jan 2009) Log Message: ----------- The status bar label did not follow the editor colors Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2009-01-15 15:55:06 UTC (rev 14356) +++ jEdit/trunk/doc/CHANGES.txt 2009-01-15 16:52:41 UTC (rev 14357) @@ -39,6 +39,7 @@ - Fix #2017514: Selection occasionally lost after right-click. +- The status bar label did not follow the editor colors (Matthieu Casanova) }}} {{{ Miscellaneous Modified: jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2009-01-15 15:55:06 UTC (rev 14356) +++ jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2009-01-15 16:52:41 UTC (rev 14357) @@ -152,7 +152,10 @@ } else { - box.add(new JLabel(token)); + JLabel label = new JLabel(token); + label.setBackground(bg); + label.setForeground(fg); + box.add(label); } } currentBar = statusBar; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bl...@us...> - 2009-01-19 14:23:33
|
Revision: 14399 http://jedit.svn.sourceforge.net/jedit/?rev=14399&view=rev Author: blueyed Date: 2009-01-19 14:23:24 +0000 (Mon, 19 Jan 2009) Log Message: ----------- html.xml: delegate on* attributes to Javascript mode Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/modes/html.xml Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2009-01-19 14:12:28 UTC (rev 14398) +++ jEdit/trunk/doc/CHANGES.txt 2009-01-19 14:23:24 UTC (rev 14399) @@ -3,8 +3,8 @@ {{{ Version 4.3pre17 Thanks to Bj\xF6rn "Vampire" Kautler, Matthieu Casanova, Dakshinamurthy Karra, -Pascal Sancho, Victor Engmark, Alan Ezust, and Dale Anson for contributing to -this release. +Pascal Sancho, Victor Engmark, Alan Ezust, Dale Anson, and Daniel Hahler +for contributing to this release. {{{ Bug Fixes @@ -24,7 +24,7 @@ - When having split view, dropping a file on the inactive textArea was opening it to the active textArea (#2321838) (Matthieu Casanova, Shlomy Reinstein) - + - MD5 hash calculated inside read-lock, and also after buffer saves. (Alan Ezust) @@ -42,13 +42,13 @@ - The status bar label did not follow the editor colors (Matthieu Casanova) }}} {{{ Miscellaneous - + - Removed redundant TextArea:EditPane map in EditPane.java in favor of a linear search through parent container linked list. (Alan Ezust) - Applied patch #2296738: File/Directory properties dialog for VFS browser. The context menu of the VFS browser now has a "Properties" menu item that shows the properties of the selected node(s) in a dialog. - + }}} {{{ API Changes @@ -305,6 +305,9 @@ - Added some indent rules in shellscript.xml (Matthieu Casanova) +- HTML mode: Fix delegation of "style" attribute to CSS mode and delegate + on* attributes to JavaScript mode (Daniel Hahler) + }}} }}} @@ -2810,4 +2813,4 @@ jEdit buffer local properties: :mode=text:maxLineLen=80:indentSize=2: :folding=explicit:collapseFolds=2: -:encoding=ISO-8859-1: +:encoding=ISO-8859-1: \ No newline at end of file Modified: jEdit/trunk/modes/html.xml =================================================================== --- jEdit/trunk/modes/html.xml 2009-01-19 14:12:28 UTC (rev 14398) +++ jEdit/trunk/modes/html.xml 2009-01-19 14:23:24 UTC (rev 14399) @@ -56,6 +56,12 @@ <END>$1</END> </SPAN_REGEXP> + <!-- Javascript: delegate on* attributes to Javascript mode --> + <SPAN_REGEXP AT_WORD_START="TRUE" DELEGATE="javascript::MAIN" HASH_CHAR="on" TYPE="MARKUP"> + <BEGIN>on[a-z]+\s*=\s*(["'])</BEGIN> + <END>$1</END> + </SPAN_REGEXP> + <!-- NOTE: no ESCAPE for quotes, at least for attributes; e.g onclick="alert(\"foo\");" is invalid! --> <SPAN TYPE="LITERAL1"> <BEGIN>"</BEGIN> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |