[ jEdit-commits ] SF.net SVN: jedit:[24708] jEdit/trunk/org/gjt/sp/jedit

[<ezust@us...>]

Revision: 24708
          http://sourceforge.net/p/jedit/svn/24708
Author:   ezust
Date:     2017-06-13 01:04:29 +0000 (Tue, 13 Jun 2017)
Log Message:
-----------
Fixing previous commit - now suppress works properly with close view and close all.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java	2017-06-13 00:57:30 UTC (rev 24707)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java	2017-06-13 01:04:29 UTC (rev 24708)
@@ -75,10 +75,11 @@
 		bufferList.addListSelectionListener(new ListHandler());
 
 		boolean suppressNotSavedConfirmUntitled = jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled");
+		suppressNotSavedConfirmUntitled = suppressNotSavedConfirmUntitled || jEdit.getBooleanProperty("autosaveUntitled");
 
 		for(Buffer buffer: buffers)
 		{
-			if(buffer.isDirty() && !( buffer.isUntitled() && suppressNotSavedConfirmUntitled ) )
+			if(buffer.isDirty() && !( buffer.isUntitled() && suppressNotSavedConfirmUntitled ))
 				bufferModel.addElement(buffer.getPath());
 		}
 

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-13 00:57:30 UTC (rev 24707)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-13 01:04:29 UTC (rev 24708)
@@ -2218,7 +2218,7 @@
 
 		boolean autosaveUntitled = jEdit.getBooleanProperty("autosaveUntitled");
 
-		boolean suppressNotSavedConfirmUntitled = jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled");
+		boolean suppressNotSavedConfirmUntitled = jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled") || autosaveUntitled;
 
 		Buffer buffer = buffersFirst;
 		while(buffer != null)

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

[ jEdit-commits ] SF.net SVN: jedit:[24707] jEdit/trunk

[<ezust@us...>]

Revision: 24707
          http://sourceforge.net/p/jedit/svn/24707
Author:   ezust
Date:     2017-06-13 00:57:30 +0000 (Tue, 13 Jun 2017)
Log Message:
-----------
Changed the behavior of the suppressNotSavedConfirmUntitled option so that
it lets you close dirty untitled buffers without confirmation, instead of never
marking them dirty.

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java
    jEdit/trunk/org/gjt/sp/jedit/options/SaveBackupOptionPane.java
    jEdit/trunk/org/jedit/localization/jedit_en.props

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2017-06-12 20:55:27 UTC (rev 24706)
+++ jEdit/trunk/doc/CHANGES.txt	2017-06-13 00:57:30 UTC (rev 24707)
@@ -22,12 +22,9 @@
 }}}
 {{{ Miscellaneous
 
-- Removed Saving and Backup option, "Never mark untitled buffers dirty"
-  because it has been replaced by "Autosave untitled buffers" which also
-  allows you to exit jEdit with dirty untitled buffers. (Alan Ezust)
+- FR#506, FR#536, FR#175: Autosaves are now saved to the Backup directory.
+  (Alan Ezust, Hrotkó Gábor)
 
-- FR#506: Autosaves are now saved to the Backup directory. (Alan Ezust)
-
 }}}
 {{{ API Changes
 

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java	2017-06-12 20:55:27 UTC (rev 24706)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java	2017-06-13 00:57:30 UTC (rev 24707)
@@ -74,11 +74,11 @@
 		bufferList.setVisibleRowCount(10);
 		bufferList.addListSelectionListener(new ListHandler());
 
-		boolean autosaveUntitled = jEdit.getBooleanProperty("autosaveUntitled");
-		
+		boolean suppressNotSavedConfirmUntitled = jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled");
+
 		for(Buffer buffer: buffers)
 		{
-			if(buffer.isDirty() && !( buffer.isUntitled() && autosaveUntitled ) )
+			if(buffer.isDirty() && !( buffer.isUntitled() && suppressNotSavedConfirmUntitled ) )
 				bufferModel.addElement(buffer.getPath());
 		}
 

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-12 20:55:27 UTC (rev 24706)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-13 00:57:30 UTC (rev 24707)
@@ -1933,7 +1933,7 @@
 		{
 			path = editPane.getBuffer().getDirectory();
 		} else {
-			File autosaveDir = MiscUtilities.prepareAutosaveDirectory(settingsDirectory, true);
+			File autosaveDir = MiscUtilities.prepareAutosaveDirectory(System.getProperty("user.home"), true);
 			path = autosaveDir.getPath();
 		}
 		VFS vfs = VFSManager.getVFSForPath(path);
@@ -2018,8 +2018,11 @@
 		}
 
 		boolean doNotSave = false;
-		if(buffer.isDirty())
-		{
+		if(buffer.isDirty()) {
+			if (buffer.isUntitled() && jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled")) {
+				_closeBuffer(view, buffer, true);
+				return true;
+			}
 			Object[] args = { buffer.getName() };
 			int result = GUIUtilities.confirm(view,"notsaved",args,
 				JOptionPane.YES_NO_CANCEL_OPTION,
@@ -2213,12 +2216,14 @@
 
 		boolean saveRecent = !(isExiting && jEdit.getBooleanProperty("restore"));
 
-                boolean autosaveUntitled = jEdit.getBooleanProperty("autosaveUntitled");
+		boolean autosaveUntitled = jEdit.getBooleanProperty("autosaveUntitled");
 
+		boolean suppressNotSavedConfirmUntitled = jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled");
+
 		Buffer buffer = buffersFirst;
 		while(buffer != null)
 		{
-			if(buffer.isDirty() && !( buffer.isUntitled() && autosaveUntitled ) )
+			if(buffer.isDirty() && !( buffer.isUntitled() && suppressNotSavedConfirmUntitled ) )
 			{
 				dirty = true;
 				break;
@@ -2226,8 +2231,7 @@
 			buffer = buffer.next;
 		}
 
-		if(dirty)
-		{
+		if(dirty) {
 			boolean ok = new CloseDialog(view).isOK();
 			if(!ok)
 				return false;

Modified: jEdit/trunk/org/gjt/sp/jedit/options/SaveBackupOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/SaveBackupOptionPane.java	2017-06-12 20:55:27 UTC (rev 24706)
+++ jEdit/trunk/org/gjt/sp/jedit/options/SaveBackupOptionPane.java	2017-06-13 00:57:30 UTC (rev 24707)
@@ -81,6 +81,15 @@
 		autosave = new NumericTextField(jEdit.getProperty("autosave"), true);
 		addComponent(jEdit.getProperty("options.save-back.autosave"),autosave);
 
+		/* Close Dirty Untitled Buffers without confirm */
+		suppressNotSavedConfirmUntitled = new JCheckBox(jEdit.getProperty(
+			"options.save-back.suppressNotSavedConfirmUntitled"));
+
+		suppressNotSavedConfirmUntitled.setToolTipText(jEdit.getProperty("options.save-back.suppressNotSavedConfirmUntitled.tooltip"));
+		suppressNotSavedConfirmUntitled.setSelected(jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled"));
+		addComponent(suppressNotSavedConfirmUntitled);
+
+
 		/* Autosave untitled buffers */
 		autosaveUntitled = new JCheckBox(jEdit.getProperty(
 			"options.save-back.autosaveUntitled"));
@@ -150,6 +159,8 @@
 		boolean newAutosave = autosaveUntitled.isSelected();
 		boolean oldAutosave = jEdit.getBooleanProperty("autosaveUntitled");
 		jEdit.setBooleanProperty("autosaveUntitled", newAutosave);
+		jEdit.setBooleanProperty("suppressNotSavedConfirmUntitled", suppressNotSavedConfirmUntitled.isSelected());
+
 		jEdit.setBooleanProperty("useMD5forDirtyCalculation",
 				useMD5forDirtyCalculation.isSelected());
 		if ((!newAutosave || jEdit.getIntegerProperty("autosave",0) == 0) && oldAutosave)
@@ -171,6 +182,7 @@
 	private JCheckBox confirmSaveAll;
 	private JTextField autosave;
 	private JCheckBox autosaveUntitled;
+	private JCheckBox suppressNotSavedConfirmUntitled;
 
 	private JCheckBox useMD5forDirtyCalculation;
 	private JTextField backups;
@@ -184,13 +196,13 @@
 	private class MyActionListener implements ActionListener
 	{
 		public void actionPerformed(ActionEvent e)
-		{			
+		{
 			String[] choosenFolder =
 				GUIUtilities.showVFSFileDialog(null, backupDirectory.getText(),
 	   			       	VFSBrowser.CHOOSE_DIRECTORY_DIALOG, false);
-			if (choosenFolder != null) 
+			if (choosenFolder != null)
 				backupDirectory.setText(choosenFolder[0]);
-			
+
 		}
 	} //}}}
 

Modified: jEdit/trunk/org/jedit/localization/jedit_en.props
===================================================================
--- jEdit/trunk/org/jedit/localization/jedit_en.props	2017-06-12 20:55:27 UTC (rev 24706)
+++ jEdit/trunk/org/jedit/localization/jedit_en.props	2017-06-13 00:57:30 UTC (rev 24707)
@@ -1694,8 +1694,8 @@
 options.save-back.confirmSaveAll="Save All Buffers" asks for confirmation
 options.save-back.autosaveUntitled=Autosave untitled buffers
 options.save-back.autosaveUntitled.tooltip=Untitled buffers are saved and restored across jEdit sessions.
-options.save-back.suppressNotSavedConfirmUntitled=Never mark Untitled buffers dirty.
-options.save-back.suppressNotSavedConfirmUntitled.tooltip=Checking this means untitled buffers get wiped out whenever a new one is created (it's a feature!)
+options.save-back.suppressNotSavedConfirmUntitled=Close dirty Untitled buffers without confirmation
+options.save-back.suppressNotSavedConfirmUntitled.tooltip=
 options.save-back.useMD5forDirtyCalculation=Never mark buffers dirty if contents are unchanged.
 options.save-back.useMD5forDirtyCalculation.tooltip=Compare with length and MD5 hash of  buffer at load time, to decide if an edited buffer is still dirty.
 options.save-back.saveAsUsesFSB="Save As" defaults to File System Browser directory

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

[ jEdit-commits ] SF.net SVN: jedit:[24706] jEdit/trunk/org/gjt/sp/jedit/jEdit.java

[<ezust@us...>]

Revision: 24706
          http://sourceforge.net/p/jedit/svn/24706
Author:   ezust
Date:     2017-06-12 20:55:27 +0000 (Mon, 12 Jun 2017)
Log Message:
-----------
Check VFS for path after the if statement...

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-12 20:48:59 UTC (rev 24705)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-12 20:55:27 UTC (rev 24706)
@@ -1935,12 +1935,12 @@
 		} else {
 			File autosaveDir = MiscUtilities.prepareAutosaveDirectory(settingsDirectory, true);
 			path = autosaveDir.getPath();
-			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");
 		}
+		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");
 
 		return newFile(editPane,path);
 	}

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

[ jEdit-commits ] SF.net SVN: jedit:[24705] jEdit/trunk/org/gjt/sp/jedit

[<ezust@us...>]

Revision: 24705
          http://sourceforge.net/p/jedit/svn/24705
Author:   ezust
Date:     2017-06-12 20:48:59 +0000 (Mon, 12 Jun 2017)
Log Message:
-----------
Patch 596 continued - autosave untitled buffers. 

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/Buffer.java
    jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
    jEdit/trunk/org/gjt/sp/jedit/bufferio/BufferLoadRequest.java
    jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSetManager.java
    jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java

Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2017-06-12 02:49:10 UTC (rev 24704)
+++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2017-06-12 20:48:59 UTC (rev 24705)
@@ -227,7 +227,7 @@
 				// NEW_FILE flag
 				if(reload || !getFlag(NEW_FILE))
 				{
-					if(!vfs.load(view,this,path))
+					if(!vfs.load(view,this,path, isUntitled()))
 					{
 						setLoading(false);
 						return false;
@@ -1665,11 +1665,11 @@
 		markers = new Vector<Marker>();
 
 		setFlag(TEMPORARY,temp);
+		setFlag(UNTITLED,untitled);
 
 		// this must be called before any EditBus messages are sent
 		setPath(path);
 
-		setFlag(UNTITLED,untitled);
 		setFlag(NEW_FILE,newFile);
 		setFlag(AUTORELOAD,jEdit.getBooleanProperty("autoReload"));
 		setFlag(AUTORELOAD_DIALOG,jEdit.getBooleanProperty("autoReloadDialog"));
@@ -1902,6 +1902,10 @@
 		if((vfs.getCapabilities() & VFS.WRITE_CAP) == 0)
 			setFileReadOnly(true);
 		name = vfs.getFileName(path);
+		
+		// reloading an untitled, so retain the path
+		boolean reloadingUntitled = name.startsWith("#") && name.endsWith("#");
+		
 		// clean up buffer name
 		// # is for autosave, e.g. reloading autosaved untitled, remove it from the buffer's name
 		if ( name.startsWith("#") )
@@ -1919,9 +1923,14 @@
 			// deleted after a save as
 			if(autosaveFile != null)
 				autosaveFile.delete();
-			File autosaveDir = MiscUtilities.prepareAutosaveDirectory(symlinkPath);
+			
+			if ( reloadingUntitled ) {
+				autosaveFile = file;
+			} else {
+				File autosaveDir = MiscUtilities.prepareAutosaveDirectory(symlinkPath, isUntitled());
 			autosaveFile = new File(autosaveDir,'#' + name + '#');
 		}
+		}
 		else
 		{
 			// I wonder if the lack of this broke anything in the
@@ -1949,10 +1958,7 @@
 		int result;
 		// if it was an untitled autosave, recover without question
 		if (isUntitled() && autosaveUntitled) {
-			boolean untitledOrigi = isUntitled();
-			VFSManager.getFileVFS().load(view,this,autosaveFile.getPath());
-			// preserve isUntitled (not the best solution)
-			setUntitled(untitledOrigi);
+			VFSManager.getFileVFS().load(view,this,autosaveFile.getPath(), isUntitled());
 			return true;
 		} else {
 			result = GUIUtilities.confirm(view,"autosave-found",args,
@@ -1961,7 +1967,7 @@
 
 		if(result == JOptionPane.YES_OPTION)
 		{
-			VFSManager.getFileVFS().load(view,this,autosaveFile.getPath());
+			VFSManager.getFileVFS().load(view,this,autosaveFile.getPath(), isUntitled());
 
 			// show this message when all I/O requests are
 			// complete

Modified: jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java	2017-06-12 02:49:10 UTC (rev 24704)
+++ jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java	2017-06-12 20:48:59 UTC (rev 24705)
@@ -675,9 +675,25 @@
 	 * the current directory is used, but only for local files.
 	 * The directory is created if does not exist.
 	 * @param path VFS path to the Buffer
+	 * @param untitled do we need the path for untitled buffer
 	 * @return Autosave directory, or null if no backup directory is specified and it is a non-local file.
 	 * @since 5.0pre1
 	 */
+	public static File prepareAutosaveDirectory(String path, boolean untitled)
+	{
+		return prepareBackupDirectory(path, untitled);
+	}// }}}
+
+	//{{{ prepareAutosaveDirectory method
+	/**
+	 * Prepares the directory to autosave the specified file.
+	 * If the backup directory is specified, it is used. Otherwise,
+	 * the current directory is used, but only for local files.
+	 * The directory is created if does not exist.
+	 * @param path VFS path to the Buffer
+	 * @return Autosave directory, or null if no backup directory is specified and it is a non-local file.
+	 * @since 5.0pre1
+	 */
 	public static File prepareAutosaveDirectory(String path)
 	{
 		return prepareBackupDirectory(path);
@@ -697,6 +713,24 @@
 	 */
 	public static File prepareBackupDirectory(String path)
 	{
+		return prepareBackupDirectory(path, false);
+	}
+	
+	//{{{ prepareBackupDirectory method
+	/**
+	 * Prepares the directory to backup the specified file.
+	 * A jEdit property is used to determine the directory.
+	 * If there is no dedicated backup directory specified by props,
+	 * then the current directory is used, but only for local files.
+	 * The directory is created if it does not exist.
+	 * @param path path to the buffer
+	 * @param untitled do we need the path for untitled buffer
+	 * @return Backup directory. <code>null</code> is returned for
+	 * non-local files if no backup directory is specified in properties.
+	 * @since 5.0pre1
+	 */
+	public static File prepareBackupDirectory(String path, boolean untitled)
+	{
 		boolean isLocal = VFSManager.getVFSForPath(path) instanceof FileVFS;
 		File file;
 		if (isLocal)
@@ -717,6 +751,12 @@
 		else
 		{
 			backupDirectory = MiscUtilities.expandVariables(backupDirectory);
+			
+			boolean autosaveUntitled = jEdit.getBooleanProperty("autosaveUntitled");
+			if ( untitled && autosaveUntitled ) {
+				return new File(backupDirectory);
+			}
+			
 			if (path.startsWith(backupDirectory))
 				return dir;
 			// Perhaps here we would want to guard with

Modified: jEdit/trunk/org/gjt/sp/jedit/bufferio/BufferLoadRequest.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bufferio/BufferLoadRequest.java	2017-06-12 02:49:10 UTC (rev 24704)
+++ jEdit/trunk/org/gjt/sp/jedit/bufferio/BufferLoadRequest.java	2017-06-12 20:48:59 UTC (rev 24705)
@@ -44,6 +44,8 @@
  */
 public class BufferLoadRequest extends BufferIORequest
 {
+	private boolean untitled;
+	
 	//{{{ BufferLoadRequest constructor
 	/**
 	 * Creates a new buffer I/O request.
@@ -52,11 +54,13 @@
 	 * @param session The VFS session
 	 * @param vfs The VFS
 	 * @param path The path
+	 * @param untitled is the buffer untitled
 	 */
 	public BufferLoadRequest(View view, Buffer buffer,
-		Object session, VFS vfs, String path)
+		Object session, VFS vfs, String path, boolean untitled)
 	{
 		super(view,buffer,session,vfs,path);
+		this.untitled = untitled;
 	} //}}}
 
 	//{{{ run() method
@@ -75,7 +79,7 @@
 			path = vfs._canonPath(session,path,view);
 
 			readContents();
-			buffer.setNewFile(false);
+			buffer.setNewFile(untitled);
 
 			if (jEdit.getBooleanProperty("persistentMarkers") &&
 			    (vfs.isMarkersFileSupported()))

Modified: jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSetManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSetManager.java	2017-06-12 02:49:10 UTC (rev 24704)
+++ jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSetManager.java	2017-06-12 20:48:59 UTC (rev 24705)
@@ -351,7 +351,7 @@
 		{
 			// autosave files will be in a separated dir
 			String settingsDirectory = jEdit.getSettingsDirectory();
-			parent = MiscUtilities.prepareAutosaveDirectory(settingsDirectory).getPath();
+			parent = MiscUtilities.prepareAutosaveDirectory(settingsDirectory, true).getPath();
 		}
 		VFS vfs = VFSManager.getVFSForPath(parent);
 		if ((vfs.getCapabilities() & VFS.WRITE_CAP) == 0)

Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFS.java	2017-06-12 02:49:10 UTC (rev 24704)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFS.java	2017-06-12 20:48:59 UTC (rev 24705)
@@ -473,8 +473,9 @@
 	 * @param view The view
 	 * @param buffer The buffer
 	 * @param path The path
+	 * @param untitled is the buffer untitled
 	 */
-	public boolean load(View view, Buffer buffer, String path)
+	public boolean load(View view, Buffer buffer, String path, boolean untitled)
 	{
 		if((getCapabilities() & READ_CAP) == 0)
 		{
@@ -489,7 +490,7 @@
 		if((getCapabilities() & WRITE_CAP) == 0)
 			buffer.setReadOnly(true);
 
-		Task request = new BufferLoadRequest(view, buffer, session, this, path);
+		Task request = new BufferLoadRequest(view, buffer, session, this, path, untitled);
 		if(buffer.isTemporary())
 			// this makes HyperSearch much faster
 			request.run();

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-12 02:49:10 UTC (rev 24704)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2017-06-12 20:48:59 UTC (rev 24705)
@@ -1558,7 +1558,7 @@
 			{
 				view.setBuffer(retVal);
 				// Although gotoMarker code is set to execute its code in a runAfterIoTasks runnable,
-				// the view.setBuffer command might end up being executed after the gotoMarker code,  
+				// the view.setBuffer command might end up being executed after the gotoMarker code,
 				// if so the caret might not be visible when the buffer is changed, so we scroll to
 				// caret overhere.
 				if(!view.getTextArea().isCaretVisible())
@@ -1829,7 +1829,7 @@
 
 		if ( untitled ) {
 			path = MiscUtilities.constructPath(
-				MiscUtilities.prepareAutosaveDirectory(settingsDirectory).getPath(),path);
+				MiscUtilities.prepareAutosaveDirectory(settingsDirectory, untitled).getPath(),path);
 		} else {
 		path = MiscUtilities.constructPath(parent,path);
 		}
@@ -1927,13 +1927,20 @@
 	 */
 	public static Buffer newFile(EditPane editPane)
 	{
-		File autosaveDir = MiscUtilities.prepareAutosaveDirectory(settingsDirectory);
-		String path = autosaveDir.getPath();
+		String path;
+
+		if(editPane != null && editPane.getBuffer() != null)
+		{
+			path = editPane.getBuffer().getDirectory();
+		} else {
+			File autosaveDir = MiscUtilities.prepareAutosaveDirectory(settingsDirectory, true);
+			path = autosaveDir.getPath();
 			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");
+		}
 
 		return newFile(editPane,path);
 	}
@@ -4351,9 +4358,9 @@
 						String[] newArgs = new String[additionalFiles.size() + args.length];
 						additionalFiles.copyInto(newArgs);
 						System.arraycopy(args, 0, newArgs, additionalFiles.size(), args.length);
-						// We need to pass view to openFiles, because when a file is openened via 
+						// We need to pass view to openFiles, because when a file is openened via
 						// the command line and is not the current buffer (because other buffers are
-						// already openened) and '+line' command line argument is given, a view is 
+						// already openened) and '+line' command line argument is given, a view is
 						// needed to scroll to the given line.
 						buffer = openFiles(view,userDir,newArgs);
 					}
@@ -4723,9 +4730,9 @@
 						bufferSet.addBuffer(buffer);
 					}
 				}
-					
+
 			}
-			
+
 			view.close();
 			view.dispose();
 			removeViewFromList(view);

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

[ jEdit-commits ] [jEdit-daily] jEdit_TextArea - Build # 231 - Successful!

[<jedit_daily@te...>]

jEdit_TextArea - Build # 231 - Successful:

Changes for Build #231
[daleanson] Fix for bug # 4040, setting previous values paper source, quality, and printer. Printer defaults to last used, then default printer, then whatever is listed first.

[daleanson] Fix for metric margin settings, should not have decimal in metric values.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit_TextArea%2F231

[ jEdit-commits ] [jEdit-daily] jEdit_trunk - Build # 294 - Successful!

[<jedit_daily@te...>]

jEdit_trunk - Build # 294 - Successful:

Changes for Build #294
[daleanson] Fix for bug # 4040, setting previous values paper source, quality, and printer. Printer defaults to last used, then default printer, then whatever is listed first.

[daleanson] Fix for metric margin settings, should not have decimal in metric values.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit%2F294

[ jEdit-commits ] SF.net SVN: jedit:[24704] jEdit/trunk/org/gjt/sp/jedit/print/ PrinterDialog.java

[<daleanson@us...>]

Revision: 24704
          http://sourceforge.net/p/jedit/svn/24704
Author:   daleanson
Date:     2017-06-12 02:49:10 +0000 (Mon, 12 Jun 2017)
Log Message:
-----------
Fix for bug # 4040, setting previous values paper source, quality, and printer. Printer defaults to last used, then default printer, then whatever is listed first.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-11 23:13:25 UTC (rev 24703)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-12 02:49:10 UTC (rev 24704)
@@ -158,6 +158,7 @@
             setContentPane( contents );
 
             // auto-select the default printer
+            /*
             PrintService defaultPrintService = PrintServiceLookup.lookupDefaultPrintService();
             if ( defaultPrintService != null )
             {
@@ -167,6 +168,7 @@
             {
                 printers.setSelectedIndex( 0 );
             }
+            */
 
 
             // loads some default values if needed
@@ -530,44 +532,40 @@
             previousSize = ( MediaSizeName )previousPaper;
         }
 
-
-        String[] paperNames = new String [sizes.length];
-        paperSizes = new ArrayList<Media>();
-        int index = -1;
-        int letterSizeIndex = 0;
-        for ( int i = 0; i < sizes.length; i++ )
+        if (paperSize != null)
         {
-            MediaSizeName m = sizes[i];
-            if ( MediaSizeName.NA_LETTER.equals( m ) )
+            String[] paperNames = new String [sizes.length];
+            paperSizes = new ArrayList<Media>();
+            int index = -1;
+            int letterSizeIndex = 0;
+            for ( int i = 0; i < sizes.length; i++ )
             {
-                letterSizeIndex = i;
+                MediaSizeName m = sizes[i];
+                if ( MediaSizeName.NA_LETTER.equals( m ) )
+                {
+                    letterSizeIndex = i;
+                }
+                else
+                if ( m.equals( previousSize ) )
+                {
+                    index = i;
+                }
+    
+    
+                paperSizes.add( m );
+                paperNames[i] = getMessage( m.toString() );
             }
-            else
-            if ( m.equals( previousSize ) )
-            {
-                index = i;
-            }
-
-
-            paperSizes.add( m );
-            paperNames[i] = getMessage( m.toString() );
+            index = index == -1 ? letterSizeIndex : index;
+            paperSize.setModel( new DefaultComboBoxModel<String>( paperNames ) );
+            paperSize.setEnabled( true );
+            paperSize.setSelectedIndex( index );
         }
-        index = index == -1 ? letterSizeIndex : index;
-        paperSize.setModel( new DefaultComboBoxModel<String>( paperNames ) );
-        paperSize.setEnabled( true );
-        paperSize.setSelectedIndex( index );
-
+        
         // finishing
-        value = categoryValueMap.get( Finishings.class );
-        if ( value == null )
+        if (finishing != null) 
         {
-            finishing.setModel( new DefaultComboBoxModel<Finishings>() );
-            finishing.setEnabled( false );
-        }
-        else
-        {
-            Finishings[] finishings = ( Finishings[] )value;
-            if ( finishings.length == 0 || ( finishings.length == 1 && Finishings.NONE.equals( finishings[0] ) ) )
+            value = categoryValueMap.get( Finishings.class );
+            if ( value == null )
             {
                 finishing.setModel( new DefaultComboBoxModel<Finishings>() );
                 finishing.setEnabled( false );
@@ -574,120 +572,146 @@
             }
             else
             {
-                finishing.setModel( new DefaultComboBoxModel<Finishings>( finishings ) );
-                finishing.setEnabled( true );
+                Finishings[] finishings = ( Finishings[] )value;
+                if ( finishings.length == 0 || ( finishings.length == 1 && Finishings.NONE.equals( finishings[0] ) ) )
+                {
+                    finishing.setModel( new DefaultComboBoxModel<Finishings>() );
+                    finishing.setEnabled( false );
+                }
+                else
+                {
+                    finishing.setModel( new DefaultComboBoxModel<Finishings>( finishings ) );
+                    finishing.setEnabled( true );
+                }
             }
         }
 
 
         // sides
-        value = categoryValueMap.get( Sides.class );
-        if ( value == null )
+        if (sides != null)
         {
-            sides.setEnabled( false );
+            value = categoryValueMap.get( Sides.class );
+            if ( value == null )
+            {
+                sides.setEnabled( false );
+            }
+            else
+            {
+                sides.setModel( new DefaultComboBoxModel<Sides>( ( Sides[] )value ) );
+                Sides previousSides = ( Sides )attributes.get( Sides.class );
+                sides.setSelectedItem( previousSides == null ? Sides.ONE_SIDED : previousSides );
+                sides.setEnabled( true );
+            }
         }
-        else
-        {
-            sides.setModel( new DefaultComboBoxModel<Sides>( ( Sides[] )value ) );
-            Sides previousSides = ( Sides )attributes.get( Sides.class );
-            sides.setSelectedItem( previousSides == null ? Sides.ONE_SIDED : previousSides );
-            sides.setEnabled( true );
-        }
 
 
         // pages per side
-        value = categoryValueMap.get( NumberUp.class );
-        if ( value == null )
+        if (pagesPerSide != null)
         {
-            pagesPerSide.setEnabled( false );
-        }
-        else
-        {
-            NumberUp[] numberUp = ( NumberUp[] )value;
-            Arrays.sort( numberUp, new Comparator<NumberUp>()
+            value = categoryValueMap.get( NumberUp.class );
+            if ( value == null )
             {
-
-                public int compare( NumberUp a, NumberUp b )
+                pagesPerSide.setEnabled( false );
+            }
+            else
+            {
+                NumberUp[] numberUp = ( NumberUp[] )value;
+                Arrays.sort( numberUp, new Comparator<NumberUp>()
                 {
-                    int m = a.getValue();
-                    int n = b.getValue();
-                    if ( m < n )
+    
+                    public int compare( NumberUp a, NumberUp b )
                     {
-                        return -1;
+                        int m = a.getValue();
+                        int n = b.getValue();
+                        if ( m < n )
+                        {
+                            return -1;
+                        }
+                        else
+                        if ( m == n )
+                        {
+                            return 0;
+                        }
+                        else
+                        {
+                            return 1;
+                        }
                     }
-                    else
-                    if ( m == n )
-                    {
-                        return 0;
-                    }
-                    else
-                    {
-                        return 1;
-                    }
-                }
-            } );
-            pagesPerSide.setModel( new DefaultComboBoxModel<NumberUp>( numberUp ) );
-            pagesPerSide.setEnabled( true );
+                } );
+                pagesPerSide.setModel( new DefaultComboBoxModel<NumberUp>( numberUp ) );
+                pagesPerSide.setEnabled( true );
+            }
         }
 
 
         // ordering of pages per side
-        value = categoryValueMap.get( PresentationDirection.class );
-        if ( value == null )
+        if (pageOrdering != null) 
         {
-            pageOrdering.setEnabled( false );
+            value = categoryValueMap.get( PresentationDirection.class );
+            if ( value == null )
+            {
+                pageOrdering.setEnabled( false );
+            }
+            else
+            {
+                PresentationDirection[] po = ( PresentationDirection[] )value;
+                pageOrdering.setModel( new DefaultComboBoxModel<PresentationDirection>( po ) );
+                pageOrdering.setEnabled( true );
+            }
         }
-        else
-        {
-            PresentationDirection[] po = ( PresentationDirection[] )value;
-            pageOrdering.setModel( new DefaultComboBoxModel<PresentationDirection>( po ) );
-            pageOrdering.setEnabled( true );
-        }
 
 
         // paper source tray
-        value = categoryValueMap.get( Media.class );
-        if ( value == null )
+        if (paperSource != null)
         {
-            paperSource.setEnabled( false );
-        }
-        else
-        {
-            Set<MediaTray> trayNames = new HashSet<MediaTray>();
-            for ( Media m : ( Media[] )value )
+            value = categoryValueMap.get( Media.class );
+            if ( value == null )
             {
-                if ( m instanceof MediaTray )
-                {
-                    trayNames.add( ( MediaTray )m );
-                }
+                paperSource.setEnabled( false );
             }
-            if ( trayNames.size() > 0 )
-            {
-                MediaTray[] trays = trayNames.toArray( new MediaTray [trayNames.size()]  );
-                paperSource.setModel( new DefaultComboBoxModel<MediaTray>( trays ) );
-                paperSource.setEnabled( true );
-            }
             else
             {
-                paperSource.setEnabled( false );
+                Set<MediaTray> trayNames = new HashSet<MediaTray>();
+                for ( Media m : ( Media[] )value )
+                {
+                    if ( m instanceof MediaTray )
+                    {
+                        trayNames.add( ( MediaTray )m );
+                    }
+                }
+                if ( trayNames.size() > 0 )
+                {
+                    MediaTray[] trays = trayNames.toArray( new MediaTray [trayNames.size()]  );
+                    paperSource.setModel( new DefaultComboBoxModel<MediaTray>( trays ) );
+                    paperSource.setEnabled( true );
+                    MediaTray lastUsedTray = (MediaTray)attributes.get(MediaTray.class);
+                    paperSource.setSelectedItem(lastUsedTray == null ? trays[0] : lastUsedTray);
+                }
+                else
+                {
+                    paperSource.setEnabled( false );
+                }
             }
         }
 
 
         // orientation, eg. portrait or landscape
-        value = categoryValueMap.get( OrientationRequested.class );
-        if ( value == null )
+        if (orientation != null)
         {
-            orientation.setEnabled( false );
+            value = categoryValueMap.get( OrientationRequested.class );
+            if ( value == null )
+            {
+                orientation.setEnabled( false );
+            }
+            else
+            {
+                OrientationRequested[] or = ( OrientationRequested[] )value;
+                orientation.setModel( new DefaultComboBoxModel<OrientationRequested>( or ) );
+                orientation.setEnabled( true );
+                OrientationRequested previousOrientation = ( OrientationRequested )attributes.get( OrientationRequested.class );
+                orientation.setSelectedItem( previousOrientation == null ? OrientationRequested.PORTRAIT : previousOrientation );
+            }
         }
-        else
-        {
-            OrientationRequested[] or = ( OrientationRequested[] )value;
-            orientation.setModel( new DefaultComboBoxModel<OrientationRequested>( or ) );
-            orientation.setEnabled( true );
-            OrientationRequested previousOrientation = ( OrientationRequested )attributes.get( OrientationRequested.class );
-            orientation.setSelectedItem( previousOrientation == null ? OrientationRequested.PORTRAIT : previousOrientation );
-        }
     }
 
 
@@ -720,8 +744,9 @@
         JTextField pagesField;
 
 
-        // TODO: current page and selection are not implemented yet. Note there
-        // are no standard printer attributes to specify either of these.
+        // DONE: current page and selection are not implemented yet. Note there
+        // are no standard printer attributes to specify either of these, so I
+        // added the PrintRangeType attribute to handle these.
         public GeneralPanel()
         {
             super();
@@ -728,8 +753,6 @@
             printers = new JList<PrintService>( getPrintServices() );
             printers.setCellRenderer( new PrintServiceCellRenderer() );
             printers.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
-            printers.addListSelectionListener( PrinterDialog.this );
-            selectedPrintService = printers.getModel().getElementAt( 0 );
 
             JPanel rangePanel = new JPanel( new GridLayout( 4, 2, 6, 6 ) );
             rangePanel.setBorder( BorderFactory.createCompoundBorder(
@@ -737,29 +760,11 @@
             BorderFactory.createEmptyBorder( 11, 11, 11, 11 ) ) );
             allPages = new JRadioButton( jEdit.getProperty( "print.dialog.All_pages", "All pages" ) );
             allPages.setSelected( true );
-            allPages.addActionListener( new ActionListener()
-            {
 
-                    public void actionPerformed( ActionEvent ae )
-                    {
-                        pagesField.setEnabled( pages.isSelected() );
-                    }
-                }
-            );
-
             pages = new JRadioButton( jEdit.getProperty( "print.dialog.Pages", "Pages" ) + ':' );
             pagesField = new JTextField();
             pagesField.setEnabled( false );
-            pages.addActionListener( new ActionListener()
-            {
 
-                    public void actionPerformed( ActionEvent ae )
-                    {
-                        pagesField.setEnabled( pages.isSelected() );
-                    }
-                }
-            );
-
             currentPage = new JRadioButton( jEdit.getProperty( "print.dialog.Current_page", "Current page" ) );
             selection = new JRadioButton( jEdit.getProperty( "print.dialog.Selection", "Selection" ) );
 
@@ -782,17 +787,6 @@
             BorderFactory.createEmptyBorder( 11, 11, 11, 11 ) ) );
             JLabel copiesLabel = new JLabel( jEdit.getProperty( "print.dialog.Copies", "Copies" + ':' ) );
             copies = new JSpinner( new SpinnerNumberModel( 1, 1, 999, 1 ) );
-            copies.addChangeListener( new ChangeListener()
-            {
-
-                    public void stateChanged( ChangeEvent e )
-                    {
-                        JSpinner spinner = ( JSpinner )e.getSource();
-                        int value = ( int )spinner.getValue();
-                        collate.setEnabled( value > 1 );
-                        collate.setSelected( value > 1 );
-                    }
-                } );
             collate = new JCheckBox( jEdit.getProperty( "print.dialog.Collate", "Collate" ) );
             collate.setSelected( false );
             collate.setEnabled( false );
@@ -817,11 +811,72 @@
             content.add( top, BorderLayout.CENTER );
             content.add( bottom, BorderLayout.SOUTH );
             add( content );
+            
+            // install listeners
+            printers.addListSelectionListener( PrinterDialog.this );
+            allPages.addActionListener( new ActionListener()
+            {
+
+                    public void actionPerformed( ActionEvent ae )
+                    {
+                        pagesField.setEnabled( pages.isSelected() );
+                    }
+                }
+            );
+            pages.addActionListener( new ActionListener()
+            {
+
+                    public void actionPerformed( ActionEvent ae )
+                    {
+                        pagesField.setEnabled( pages.isSelected() );
+                    }
+                }
+            );
+            copies.addChangeListener( new ChangeListener()
+            {
+
+                    public void stateChanged( ChangeEvent e )
+                    {
+                        JSpinner spinner = ( JSpinner )e.getSource();
+                        int value = ( int )spinner.getValue();
+                        collate.setEnabled( value > 1 );
+                        collate.setSelected( value > 1 );
+                    }
+                } );
+            PrintService defaultPrintService = PrintServiceLookup.lookupDefaultPrintService();
+            // choose last used printer first, default printer if no last used, or first
+            // item in print service list otherwise
+            String lastUsedPrinterName = jEdit.getProperty("print.lastUsedPrinter");
+            if (lastUsedPrinterName != null) 
+            {
+                ListModel<PrintService> lm = printers.getModel();
+                for (int i = 0; i < lm.getSize(); i++)
+                {
+                    PrintService ps = lm.getElementAt(i);
+                    if (lastUsedPrinterName.equals(ps.getName()))
+                    {
+                        printers.setSelectedValue(ps, true);
+                        selectedPrintService = ps;
+                        break;
+                    }
+                }
+            }
+            else if (defaultPrintService != null)
+            {
+                printers.setSelectedValue(defaultPrintService, true);      
+                selectedPrintService = defaultPrintService;
+            }
+            else 
+            {
+                selectedPrintService = printers.getModel().getElementAt( 0 );
+            }
         }
 
 
         public AttributeSet getAttributes()
         {
+            jEdit.setProperty("print.lastUsedPrinter", printers.getSelectedValue().getName());
+            
             AttributeSet as = new HashAttributeSet();
 
             if ( allPages.isSelected() )
@@ -962,20 +1017,7 @@
 
             pagesPerSide = new JComboBox<NumberUp>();
             pagesPerSide.setEnabled( false );
-            pagesPerSide.addActionListener( new ActionListener()
-            {
 
-                    public void actionPerformed( ActionEvent ae )
-                    {
-                        NumberUp nu = ( NumberUp )pagesPerSide.getSelectedItem();
-                        if ( nu != null && nu.getValue() == 1 )
-                        {
-                            pageOrdering.setEnabled( false );
-                        }
-                    }
-                }
-            );
-
             // disable this when pagesPerSide is 1
             pageOrdering = new JComboBox<PresentationDirection>();
             pageOrdering.setEnabled( false );
@@ -1008,29 +1050,11 @@
 
             paperSize = new JComboBox<String>();
             paperSize.setEnabled( false );
-            paperSize.addActionListener( new ActionListener()
-            {
 
-                    public void actionPerformed( ActionEvent ae )
-                    {
-                        PageSetupPanel.this.setDefaultMargins();
-                    }
-                }
-            );
-
             orientation = new JComboBox<OrientationRequested>();
             orientation.setEnabled( false );
             orientation.setRenderer( new OrientationCellRenderer() );
-            orientation.addActionListener( new ActionListener()
-            {
 
-                    public void actionPerformed( ActionEvent ae )
-                    {
-                        PageSetupPanel.this.setDefaultMargins();
-                    }
-                }
-            );
-
             paperPanel.add( new JLabel( jEdit.getProperty( "print.dialog.Paper_source", "Paper source" ) + ':' ) );
             paperPanel.add( paperSource );
             paperPanel.add( new JLabel( jEdit.getProperty( "print.dialog.Output_tray", "Output tray" ) + ':' ) );
@@ -1079,6 +1103,41 @@
             content.add( marginPanel );
             content.add( finishingPanel );
             add( content );
+            
+            // add listeners
+            pagesPerSide.addActionListener( new ActionListener()
+            {
+
+                    public void actionPerformed( ActionEvent ae )
+                    {
+                        NumberUp nu = ( NumberUp )pagesPerSide.getSelectedItem();
+                        if ( nu != null && nu.getValue() == 1 )
+                        {
+                            pageOrdering.setEnabled( false );
+                        }
+                    }
+                }
+            );
+            paperSize.addActionListener( new ActionListener()
+            {
+
+                    public void actionPerformed( ActionEvent ae )
+                    {
+                        PageSetupPanel.this.setDefaultMargins();
+                    }
+                }
+            );
+            orientation.addActionListener( new ActionListener()
+            {
+
+                    public void actionPerformed( ActionEvent ae )
+                    {
+                        PageSetupPanel.this.setDefaultMargins();
+                    }
+                }
+            );
+            
+            
         }
 
 
@@ -1446,7 +1505,7 @@
             OrientationRequested orientationRequested = ( OrientationRequested )orientation.getSelectedItem();
             rotateMargins( topMargin, leftMargin, rightMargin, bottomMargin, orientationRequested );
 
-            Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
+            //Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
             return new float[] {topMargin, leftMargin, rightMargin, bottomMargin};
         }
 
@@ -1489,7 +1548,7 @@
             OrientationRequested orientationRequested = ( OrientationRequested )orientation.getSelectedItem();
             rotateMargins( topMargin, leftMargin, rightMargin, bottomMargin, orientationRequested );
 
-            Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
+            //Log.log( Log.DEBUG, this, "getMaximumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
             return new float[] {topMargin, leftMargin, rightMargin, bottomMargin};
         }
 
@@ -1554,15 +1613,6 @@
             // print later
             atButton = new JRadioButton( jEdit.getProperty( "print.dialog.At", "At" ) );
             atButton.setEnabled( true );
-            atButton.addActionListener( new ActionListener()
-            {
-
-                    public void actionPerformed( ActionEvent ae )
-                    {
-                        when.setEnabled( atButton.isSelected() );
-                    }
-                }
-            );
             Calendar calendar = Calendar.getInstance( Locale.getDefault() );
             Date initialDate = calendar.getTime();
             calendar.add( Calendar.YEAR, 1 );
@@ -1586,6 +1636,18 @@
             content.add( jobPanel );
             content.add( printPanel );
             add( content, BorderLayout.NORTH );
+
+            // add listeners
+            atButton.addActionListener( new ActionListener()
+            {
+
+                    public void actionPerformed( ActionEvent ae )
+                    {
+                        when.setEnabled( atButton.isSelected() );
+                    }
+                }
+            );
+            
         }
 
 
@@ -1671,7 +1733,8 @@
             quality.addItem( PrintQuality.DRAFT );
             quality.addItem( PrintQuality.NORMAL );
             quality.addItem( PrintQuality.HIGH );
-            quality.setSelectedItem( PrintQuality.NORMAL );
+            PrintQuality pq = (PrintQuality)attributes.get(PrintQuality.class);
+            quality.setSelectedItem( pq == null ? PrintQuality.NORMAL : pq );
             quality.setRenderer( new QualityCellRenderer() );
 
             chromaticity = new JComboBox<Chromaticity>();
@@ -1678,23 +1741,7 @@
             chromaticity.addItem( Chromaticity.MONOCHROME );
             chromaticity.addItem( Chromaticity.COLOR );
             Chromaticity value = ( Chromaticity )attributes.get( Chromaticity.class );
-            if ( value != null )
-            {
-                if ( "color".equalsIgnoreCase( value.toString() ) )
-                {
-                    chromaticity.setSelectedItem( Chromaticity.COLOR );
-                }
-                else
-                {
-                    chromaticity.setSelectedItem( Chromaticity.MONOCHROME );
-                }
-            }
-            else
-            {
-                chromaticity.setSelectedItem( Chromaticity.MONOCHROME );
-            }
-
-
+            chromaticity.setSelectedItem(value == null ? Chromaticity.MONOCHROME : value);
             chromaticity.setRenderer( new ChromaticityCellRenderer() );
 
             JPanel content = new JPanel( new VariableGridLayout( VariableGridLayout.FIXED_NUM_COLUMNS, 2, 6, 6 ) );

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

[ jEdit-commits ] SF.net SVN: jedit:[24703] jEdit/trunk/org/gjt/sp/jedit/print/ PrinterDialog.java

[<daleanson@us...>]

Revision: 24703
          http://sourceforge.net/p/jedit/svn/24703
Author:   daleanson
Date:     2017-06-11 23:13:25 +0000 (Sun, 11 Jun 2017)
Log Message:
-----------
Fix for metric margin settings, should not have decimal in metric values.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-07 20:48:14 UTC (rev 24702)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-11 23:13:25 UTC (rev 24703)
@@ -1196,16 +1196,18 @@
             }
 
 
-            float topMargin = topMarginField.getValue().floatValue();
-            float leftMargin = leftMarginField.getValue().floatValue();
-            float rightMargin = rightMarginField.getValue().floatValue();
-            float bottomMargin = bottomMarginField.getValue().floatValue();
-            Margins margins = new Margins( topMargin, leftMargin, rightMargin, bottomMargin );
+            Number topMargin = topMarginField.getValue();
+            Number leftMargin = leftMarginField.getValue();
+            Number rightMargin = rightMarginField.getValue();
+            Number bottomMargin = bottomMarginField.getValue();
+            
+            Margins margins = new Margins( topMargin.floatValue(), leftMargin.floatValue(), rightMargin.floatValue(), bottomMargin.floatValue() );
             as.add( margins );
-            jEdit.setProperty("print.topMargin", String.valueOf(topMargin));
-            jEdit.setProperty("print.leftMargin", String.valueOf(leftMargin));
-            jEdit.setProperty("print.rightMargin", String.valueOf(rightMargin));
-            jEdit.setProperty("print.bottomMargin", String.valueOf(bottomMargin));
+            
+            jEdit.setProperty("print.topMargin", topMargin.toString());
+            jEdit.setProperty("print.leftMargin", leftMargin.toString());
+            jEdit.setProperty("print.rightMargin", rightMargin.toString());
+            jEdit.setProperty("print.bottomMargin", bottomMargin.toString());
 
             return as;
         }
@@ -1498,6 +1500,7 @@
         private int getUnits()
         {
             String country = Locale.getDefault().getCountry();
+            //String country = "Latvia";    // for testing metric
             if ( "".equals( country ) || Locale.US.getCountry().equals( country ) || Locale.CANADA.getCountry().equals( country ) )
             {
                 return MediaPrintableArea.INCH;

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

[ jEdit-commits ] [jEdit-daily] jEdit_TextArea - Build # 230 - Successful!

[<jedit_daily@te...>]

jEdit_TextArea - Build # 230 - Successful:

Changes for Build #230
[daleanson] Fixed reverse printing in print preview, it already worked fine with a real printer, just not in preview.

[daleanson] Fixed line number printing for selection.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit_TextArea%2F230

[ jEdit-commits ] [jEdit-daily] jEdit_trunk - Build # 293 - Successful!

[<jedit_daily@te...>]

jEdit_trunk - Build # 293 - Successful:

Changes for Build #293
[daleanson] Fixed reverse printing in print preview, it already worked fine with a real printer, just not in preview.

[daleanson] Fixed line number printing for selection.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit%2F293

[ jEdit-commits ] SF.net SVN: jedit:[24702] jEdit/trunk/org/gjt/sp/jedit/print

[<daleanson@us...>]

Revision: 24702
          http://sourceforge.net/p/jedit/svn/24702
Author:   daleanson
Date:     2017-06-07 20:48:14 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
Fixed reverse printing in print preview, it already worked fine with a real printer, just not in preview.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java
    jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
    jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2017-06-07 17:58:26 UTC (rev 24701)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2017-06-07 20:48:14 UTC (rev 24702)
@@ -188,7 +188,13 @@
 	protected static void printPage( PrintPreviewModel model )
 	{
 		String jobName = MiscUtilities.abbreviateView( model.getBuffer().getPath() );
-		model.getAttributes().add( new JobName( jobName, null ) );
+		PrintRequestAttributeSet attrs = model.getAttributes();
+		attrs.add( new JobName( jobName, null ) );
+		Reverse reverse = (Reverse)attrs.get(Reverse.class);
+		if (reverse != null)
+		{
+			attrs.remove(Reverse.class);	
+		}
 
 		// set up the print job
 		PrintService printService = model.getPrintService();
@@ -217,12 +223,12 @@
 
 		// set up the printable to print just the requested pages
 		Buffer buffer = model.getBuffer();
-		PrintRangeType printRangeType = (PrintRangeType)model.getAttributes().get(PrintRangeType.class);
+		PrintRangeType printRangeType = (PrintRangeType)attrs.get(PrintRangeType.class);
 		if ( PrintRangeType.SELECTION.equals(printRangeType) )
 		{
 			buffer = getSelectionBuffer(model.getView(), buffer);
 		}
-		BufferPrintable1_7 printable = new BufferPrintable1_7( model.getAttributes(), model.getView(), buffer );
+		BufferPrintable1_7 printable = new BufferPrintable1_7( attrs, model.getView(), buffer );
 		printable.setPages(model.getPageRanges());
 		int pageNumber = model.getPageNumber(); 
 		try 
@@ -233,6 +239,10 @@
 		{
 			e.printStackTrace();
 		}
+		if (reverse != null)
+		{
+			attrs.add(reverse);	
+		}
 	}
 
 
@@ -396,6 +406,7 @@
 			mpa = new MediaPrintableArea(0.5f, 0.5f, 10.0f, 7.5f, MediaPrintableArea.INCH);
 			format.add(mpa);
 		}
+		format.remove(Reverse.class);
 	}
 
 

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java	2017-06-07 17:58:26 UTC (rev 24701)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java	2017-06-07 20:48:14 UTC (rev 24702)
@@ -382,11 +382,16 @@
 	{
 		pageRanges = BufferPrinter1_7.getPageRanges( view, buffer, attributes );
 		DefaultComboBoxModel<Integer> pagesModel = new DefaultComboBoxModel<Integer>();
+		boolean reverse = attributes.containsKey(Reverse.class);
+		StringBuilder pr = new StringBuilder();
 		for ( Integer i : pageRanges.keySet() )
 		{
-			pagesModel.addElement( i );
+			Integer pageNo = reverse ? pageRanges.size() - i  + 1: i;
+			pagesModel.addElement( pageNo );
 			//Log.log(Log.DEBUG, this, "init, i = " + i + ", range = " + pageRanges.get(i));
+			pr.append(i).append(',');
 		}
+		pr.deleteCharAt(pr.length() - 1);
 		pages.setModel( pagesModel );
 		pages.setSelectedIndex( 0 );
 

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-07 17:58:26 UTC (rev 24701)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-07 20:48:14 UTC (rev 24702)
@@ -880,6 +880,10 @@
             {
                 as.add(new Reverse());   
             }
+            else
+            {
+                attributes.remove(Reverse.class);   
+            }
 
             return as;
         }

Modified: jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java	2017-06-07 17:58:26 UTC (rev 24701)
+++ jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java	2017-06-07 20:48:14 UTC (rev 24702)
@@ -24,6 +24,9 @@
 
 
 import javax.print.attribute.Attribute;
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
 
 
 /**
@@ -31,7 +34,7 @@
  * order. This is just a marker attribute, if present, pages should be printed
  * in reverse order, if not present, then print pages in forward order.
  */
-public class Reverse implements Attribute
+public class Reverse implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
 {
 
     private static final long serialVersionUID = -2823970704630722439L;

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

[ jEdit-commits ] SF.net SVN: jedit:[24701] jEdit/trunk/org/gjt/sp/jedit/print

[<daleanson@us...>]

Revision: 24701
          http://sourceforge.net/p/jedit/svn/24701
Author:   daleanson
Date:     2017-06-07 17:58:26 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
Fixed line number printing for selection.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
    jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2017-06-07 14:11:23 UTC (rev 24700)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2017-06-07 17:58:26 UTC (rev 24701)
@@ -70,6 +70,7 @@
 
 	private HashMap<Integer, Range> pages = null;
 	private int currentPhysicalLine;
+	private int[] printingLineNumbers = null;
 
 	private LineMetrics lm;
 	private final List<Chunk> lineList;
@@ -90,6 +91,11 @@
 			printRangeType = (PrintRangeType)attributes.get(PrintRangeType.class);	
 		}
 		
+		// the buffer might have a buffer property for the line numbers, if so, then
+		// the buffer is a temporary buffer representing selected text and the line
+		// numbers correspond with the selected lines.
+		printingLineNumbers = (int[])buffer.getProperty("printingLineNumbers");
+		
 		header = jEdit.getBooleanProperty("print.header");
 		footer = jEdit.getBooleanProperty("print.footer");
 		lineNumbers = jEdit.getBooleanProperty("print.lineNumbers");
@@ -447,9 +453,11 @@
 		double y = 0.0;
 		Range range = pages.get(pageIndex);
 		//Log.log(Log.DEBUG, this, "printing range for page " + pageIndex + ": " + range);
+		int start = printingLineNumbers == null ? range.getStart() : 0;
+		int end = printingLineNumbers == null ? range.getEnd() : printingLineNumbers.length - 1;
 		
 		// print each line
-		for (currentPhysicalLine = range.getStart(); currentPhysicalLine <= range.getEnd(); currentPhysicalLine++)
+		for (currentPhysicalLine = start; currentPhysicalLine <= end; currentPhysicalLine++)
 		{
 			if(currentPhysicalLine == buffer.getLineCount())
 			{
@@ -472,7 +480,12 @@
 			{
 				gfx.setFont(font);
 				gfx.setColor(lineNumberColor);
-				gfx.drawString(String.valueOf(currentPhysicalLine + 1), (float)pageX, (float)(pageY + y + lineHeight));
+				int lineNo = currentPhysicalLine + 1;
+				if (printingLineNumbers != null && currentPhysicalLine < printingLineNumbers.length) 
+				{
+					lineNo = printingLineNumbers[currentPhysicalLine] + 1;	
+				}
+				gfx.drawString(String.valueOf(lineNo), (float)pageX, (float)(pageY + y + lineHeight));
 			}
 
 			if (lineList.isEmpty())
@@ -494,7 +507,7 @@
 				}
 			}
 			
-			if (currentPhysicalLine == range.getEnd())
+			if (currentPhysicalLine == end)
 			{
 				//Log.log(Log.DEBUG,this,"Finished page");
 				break;

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2017-06-07 14:11:23 UTC (rev 24700)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2017-06-07 17:58:26 UTC (rev 24701)
@@ -161,7 +161,9 @@
 		ThreadUtilities.runInBackground( runner );
 	}	//}}}
 	
-	// returns a temporary buffer containing only the lines in the current selection
+	// returns a temporary buffer containing only the lines in the current selection.
+	// This also stores the line numbers of the selected lines as a buffer property
+	// so they can be used for printing and print preview.
 	private static Buffer getSelectionBuffer(View view, Buffer buffer)
 	{
 		int[] selectedLines = view.getTextArea().getSelectedLines();
@@ -174,6 +176,9 @@
 			String line = buffer.getLineText(i) + '\n';
 			temp.insert(temp.getLength(), line);
 		}
+		// save the line numbers of the selected lines so they can be used for 
+		// printing and print preview
+		temp.setProperty("printingLineNumbers", selectedLines);
 		return temp;
 	}
 	
@@ -306,33 +311,6 @@
 		return answer;
 	}
 	
-	public static HashMap<Integer, Range> getSelectionPageRange( View view, Buffer buffer, PrintRequestAttributeSet attributes )
-	{
-		if (attributes == null)
-		{
-			loadPrintSpec();
-			attributes = format;
-		}
-		
-		BufferPrintable1_7 printable = new BufferPrintable1_7( attributes, view, buffer );
-		HashMap<Integer, Range> pages = BufferPrinter1_7.getPageRanges( printable, attributes );
-		HashMap<Integer, Range> answer = new HashMap<Integer, Range>();
-		int[] selectedLines = view.getTextArea().getSelectedLines();
-		for ( int line : selectedLines )
-		{
-			for ( Integer page : pages.keySet() )
-			{
-				Range range = pages.get(page);
-				if ( range.contains( line ) )
-				{
-					answer.put(page, range);
-					continue;
-				}
-			}
-		}
-		return answer;
-	}
-	
 	public static PageFormat getDefaultPageFormat(PrintRequestAttributeSet attributes)
 	{
 		return BufferPrinter1_7.createPageFormat(attributes);

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

[ jEdit-commits ] [jEdit-daily] jEdit_trunk - Build # 292 - Successful!

[<jedit_daily@te...>]

jEdit_trunk - Build # 292 - Successful:

Changes for Build #292
[alan ezust] jEdit patch #596 - additional bugfix submitted by author.

[daleanson] no comment

[daleanson] Comments

[daleanson] Fix bug #4037, print selection not working correctly, plus some refactoring and code clean up.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit%2F292

[ jEdit-commits ] [jEdit-daily] jEdit_TextArea - Build # 229 - Successful!

[<jedit_daily@te...>]

jEdit_TextArea - Build # 229 - Successful:

Changes for Build #229
[alan ezust] jEdit patch #596 - additional bugfix submitted by author.

[daleanson] no comment

[daleanson] Comments

[daleanson] Fix bug #4037, print selection not working correctly, plus some refactoring and code clean up.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit_TextArea%2F229

[ jEdit-commits ] SF.net SVN: jedit:[24700] jEdit/trunk/org/gjt/sp/jedit/gui/ CloseDialog.java

[<ezust@us...>]

Revision: 24700
          http://sourceforge.net/p/jedit/svn/24700
Author:   ezust
Date:     2017-06-07 14:11:23 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
jEdit patch #596 - additional bugfix submitted by author.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java	2017-06-06 19:07:55 UTC (rev 24699)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/CloseDialog.java	2017-06-07 14:11:23 UTC (rev 24700)
@@ -74,9 +74,11 @@
 		bufferList.setVisibleRowCount(10);
 		bufferList.addListSelectionListener(new ListHandler());
 
+		boolean autosaveUntitled = jEdit.getBooleanProperty("autosaveUntitled");
+		
 		for(Buffer buffer: buffers)
 		{
-			if(buffer.isDirty())
+			if(buffer.isDirty() && !( buffer.isUntitled() && autosaveUntitled ) )
 				bufferModel.addElement(buffer.getPath());
 		}
 

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

[ jEdit-commits ] SF.net SVN: jedit:[24699] jEdit/trunk

[<daleanson@us...>]

Revision: 24699
          http://sourceforge.net/p/jedit/svn/24699
Author:   daleanson
Date:     2017-06-06 19:07:55 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
no comment

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/modes/java-module-info.xml

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2017-06-06 19:05:55 UTC (rev 24698)
+++ jEdit/trunk/doc/CHANGES.txt	2017-06-06 19:07:55 UTC (rev 24699)
@@ -41,6 +41,8 @@
 
 - Patch #595 - New Assembly-arm32 edit mode (M. Cesar R. Lacruz)
 
+- Updated java-module-info mode (Dale Anson)
+
 }}}
 
 }}}

Modified: jEdit/trunk/modes/java-module-info.xml
===================================================================
--- jEdit/trunk/modes/java-module-info.xml	2017-06-06 19:05:55 UTC (rev 24698)
+++ jEdit/trunk/modes/java-module-info.xml	2017-06-06 19:07:55 UTC (rev 24699)
@@ -8,11 +8,12 @@
  * are considered identifiers.
  *
  * This mode file is the same as the java.xml mode file with the addition of the
- * new keywords that are specific to modules. From the spec:
- * "module, requires, exports, to, uses, provides, and with are restricted keywords 
- * (i.e. they are keywords solely where they appear as terminals in ModuleDeclaration, 
- * and are identifiers everywhere else)."
- * Reference: http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html
+ * new keywords that are specific to modules, so this is way overkill for just a
+ * module-info.java file. From the spec:
+ * "open, module, requires, transitive, exports, opens, to, uses, provides, and 
+ * with are restricted keywords (i.e. they are keywords solely where they appear 
+ * as terminals in ModuleDeclaration, and are identifiers everywhere else)."
+ * Reference: http://download.oracle.com/otndocs/jcp/java_platform_module_system-0_1-edr-spec/index.html
 -->
 <!DOCTYPE MODE SYSTEM "xmode.dtd">
 
@@ -127,9 +128,12 @@
 			<!--}}}-->
 
 			<!-- modules -->
-			<KEYWORD2>module</KEYWORD2>
+			<KEYWORD2>open</KEYWORD2>
+			<KEYWORD3>module</KEYWORD3>
 			<KEYWORD2>requires</KEYWORD2>
+			<KEYWORD2>transitive</KEYWORD2>
 			<KEYWORD2>exports</KEYWORD2>
+			<KEYWORD2>opens</KEYWORD2>
 			<KEYWORD2>to</KEYWORD2>
 			<KEYWORD2>uses</KEYWORD2>
 			<KEYWORD2>provides</KEYWORD2>

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

[ jEdit-commits ] SF.net SVN: jedit:[24698] jEdit/trunk

[<daleanson@us...>]

Revision: 24698
          http://sourceforge.net/p/jedit/svn/24698
Author:   daleanson
Date:     2017-06-06 19:05:55 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
Comments

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java
    jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2017-06-06 18:23:17 UTC (rev 24697)
+++ jEdit/trunk/doc/CHANGES.txt	2017-06-06 19:05:55 UTC (rev 24698)
@@ -5,7 +5,7 @@
 {{{ Version 5.5pre1
 
 Thanks to AdamS, Wim West, M. Cesar R. Lacruz, Egor Abramovich,
-Hrotkó Gábor, and Alan Ezust for contributing to this release.
+Hrotkó Gábor, Alan Ezust, and Dale Anson for contributing to this release.
 
 {{{ Bug Fixes
 
@@ -13,6 +13,8 @@
 
 - Autosave Untitled Buffers fixed (Patch #596 - Hrotkó Gábor)
 
+- Fixed a number of bugs in the new jEdit printing system (Dale Anson)
+
 }}}
 {{{ UI Improvements
 

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java	2017-06-06 18:23:17 UTC (rev 24697)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java	2017-06-06 19:05:55 UTC (rev 24698)
@@ -1,3 +1,24 @@
+/*
+ * PrintRangeType.java
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=explicit:collapseFolds=1:
+ *
+ * Copyright (C) 2016 Dale Anson
+ *
+ * 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.print;
 
@@ -7,7 +28,11 @@
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 
-
+/**
+ * Custom print request attribute to represent a page range type, i.e. all pages,
+ * current page, range of pages, just a selection of lines, or only odd or even
+ * pages.
+ */
 public class PrintRangeType extends IntegerSyntax implements PrintRequestAttribute, PrintJobAttribute
 {
 

Modified: jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java	2017-06-06 18:23:17 UTC (rev 24697)
+++ jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java	2017-06-06 19:05:55 UTC (rev 24698)
@@ -26,9 +26,11 @@
 import javax.print.attribute.Attribute;
 
 
-// Custom print attribute indicating the pages should be printed in reverse
-// order. This is just a marker attribute, if present, pages should be printed
-// in reverse order, if not present, then print pages in forward order.
+/**
+ * Custom print attribute indicating the pages should be printed in reverse
+ * order. This is just a marker attribute, if present, pages should be printed
+ * in reverse order, if not present, then print pages in forward order.
+ */
 public class Reverse implements Attribute
 {
 

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

[ jEdit-commits ] SF.net SVN: jedit:[24697] jEdit/trunk/org/gjt/sp/jedit/print

[<daleanson@us...>]

Revision: 24697
          http://sourceforge.net/p/jedit/svn/24697
Author:   daleanson
Date:     2017-06-06 18:23:17 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
Fix bug #4037, print selection not working correctly, plus some refactoring and code clean up.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
    jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java
    jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java
    jEdit/trunk/org/gjt/sp/jedit/print/PrintPreviewModel.java
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java

Added Paths:
-----------
    jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java
    jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2017-06-05 17:36:46 UTC (rev 24696)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -60,10 +60,8 @@
 
 	private View view;
 	private Buffer buffer;
-	private boolean selection;
-	private int[] selectedLines;
 	private boolean reverse;
-	private int printRangeType = PrinterDialog.ALL;
+	private PrintRangeType printRangeType = PrintRangeType.ALL;
 	private Font font;
 	private SyntaxStyle[] styles;
 	private boolean header;
@@ -86,6 +84,11 @@
 		this.view = view;
 		this.buffer = buffer;
 		firstCall = true;		// pages and page ranges are calculated only once
+		reverse = attributes.containsKey(Reverse.class);
+		if (attributes.containsKey(PrintRangeType.class))
+		{
+			printRangeType = (PrintRangeType)attributes.get(PrintRangeType.class);	
+		}
 		
 		header = jEdit.getBooleanProperty("print.header");
 		footer = jEdit.getBooleanProperty("print.footer");
@@ -121,36 +124,6 @@
 		}
 	}
 	
-	/**
- 	 * Set the line numbers that are selected in the text area.	
- 	 * @param lines An array of lines that are selected in the text area.	
- 	 */
-	public void setSelectedLines(int[] lines)
-	{
-		selectedLines = Arrays.copyOf(lines, lines.length);	
-		Arrays.sort(selectedLines);
-	}
-	
-	/**
- 	 * Set to <code>true</code> to print the pages in reverse order, that is, print
- 	 * the last page first and the first page last.
- 	 * @param b Whether to print in reverse or not.
- 	 */
-	public void setReverse(boolean b)
-	{
-		reverse = b;	
-	}
-	
-	/**
- 	 * Set the print range type.
- 	 * @param printRangeType One of PrinterDialog.ALL, RANGE, CURRENT_PAGE, or SELECTION.
- 	 */
-	public void setPrintRangeType(int printRangeType)
-	{
-		this.printRangeType = printRangeType;
-		selection = PrinterDialog.SELECTION == printRangeType;
-	}
-	
 	// useful to avoid having to recalculate the page ranges if they are already known
 	public void setPages(HashMap<Integer, Range> pages)
 	{
@@ -173,26 +146,8 @@
 			firstCall = false;
 		}
 		
-		// figure out the current page if that is what is requested. I'm using
-		// the page that contains the caret as the current page.
-		// QUESTION: use the text area first physical line instead?
-		if (printRangeType == PrinterDialog.CURRENT_PAGE)
-		{
-			int caretLine = view.getTextArea().getCaretLine();
-			for (Integer i : pages.keySet())
-			{
-				Range range = pages.get(i);
-				if (range.contains(caretLine))
-				{
-					pageIndex = i;
-					break;
-				}
-			}
-		}
-		
-		
 		// adjust the page index for reverse printing
-		if (reverse && printRangeType != PrinterDialog.CURRENT_PAGE)
+		if (reverse && !PrintRangeType.CURRENT_PAGE.equals(printRangeType))
 		{
 			pageIndex = pages.size() - 1 - pageIndex;
 			//Log.log(Log.DEBUG, this, "Reverse is on, changing page index to " + pageIndex);
@@ -201,7 +156,7 @@
 		// go ahead and print the page
 		Range range = pages.get(pageIndex);
 		//Log.log(Log.DEBUG, this, "range = " + range);
-		if ( (range == null || !inRange(pageIndex)) && printRangeType != PrinterDialog.CURRENT_PAGE  )
+		if ( (range == null || !inRange(pageIndex)) && !PrintRangeType.CURRENT_PAGE.equals(printRangeType)  )
 		{
 			//Log.log(Log.DEBUG, this, "Returning NO_SUCH_PAGE for page " + pageIndex);
 			return NO_SUCH_PAGE;	
@@ -508,14 +463,6 @@
 				continue;
 			}
 			
-			// print only selected lines if printing selection
-			if (selection && Arrays.binarySearch(selectedLines, currentPhysicalLine) < 0)
-			{
-				//Log.log(Log.DEBUG, this, "Skipping non-selected line: " + currentPhysicalLine); 
-				continue;
-			}
-				
-			
 			// fill the line list
 			lineList.clear();
 			tokenHandler.init(styles, frc, tabExpander, lineList, (float)(pageWidth - lineNumberWidth), -1);

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2017-06-05 17:36:46 UTC (rev 24696)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -61,10 +61,10 @@
 		}
 	}	
 
-
+	// print to a printer
 	public static void print( final View view, final Buffer buffer )
 	{
-		//Log.log(Log.DEBUG, BufferPrinter1_7.class, "print buffer " + buffer.getPath());
+		Log.log(Log.DEBUG, BufferPrinter1_7.class, "print buffer " + buffer.getPath());
 		
 		// load any saved printing attributes, these are put into 'format'
 		loadPrintSpec();
@@ -75,7 +75,7 @@
 		PrinterDialog printerDialog = new PrinterDialog( view, format, false );
 		if ( printerDialog.isCanceled() )
 		{
-			//Log.log(Log.DEBUG, BufferPrinter1_7.class, "print dialog canceled");
+			Log.log(Log.DEBUG, BufferPrinter1_7.class, "print dialog canceled");
 			return;
 		}
 		
@@ -106,61 +106,17 @@
 		}
 
 
-		// set up the printable. Some values need to be set directly from the print
-		// dialog since they don't have attributes, like reverse page printing and printRangeType
-		BufferPrintable1_7 printable = new BufferPrintable1_7( format, view, buffer );
-		printable.setReverse( printerDialog.getReverse() );
-		int printRangeType = printerDialog.getPrintRangeType();
-		printable.setPrintRangeType( printRangeType );
-
-		// check if printing a selection, if so, recalculate the page ranges.
+		// check if printing a selection, if so, create a new temporary buffer
+		// containing just the selection
 		// TODO: I'm not taking even/odd page setting into account here, nor am
 		// I considering any page values that may have been set in the page range.
 		// I don't think this is important for printing a selection, which is
 		// generally just a few lines rather than pages. I could be wrong...
-		if ( printRangeType == PrinterDialog.SELECTION )
+		Buffer tempBuffer = buffer;
+		PrintRangeType printRangeType = (PrintRangeType)format.get(PrintRangeType.class);
+		if ( PrintRangeType.SELECTION.equals(printRangeType) )
 		{
-
-			// calculate the actual pages with a selection or bail if there is no selection
-			int selectionCount = view.getTextArea().getSelectionCount();
-			if ( selectionCount == 0 )
-			{
-				JOptionPane.showMessageDialog( view, jEdit.getProperty( "print-error.message", new String[] {"No text is selected to print."} ), jEdit.getProperty( "print-error.title" ), JOptionPane.ERROR_MESSAGE );
-				return;
-			}
-
-
-			// get the page ranges from the printable
-			HashMap<Integer, Range> pageRanges = getPageRanges( printable, format );
-			if ( pageRanges == null || pageRanges.isEmpty() )
-			{
-				JOptionPane.showMessageDialog( view, jEdit.getProperty( "print-error.message", new String[] {"Unable to calculate page ranges."} ), jEdit.getProperty( "print-error.title" ), JOptionPane.ERROR_MESSAGE );
-				return;
-			}
-
-
-			// find the pages that contain the selection(s) and construct a new
-			// page range for the format
-			int[] selectedLines = view.getTextArea().getSelectedLines();
-			StringBuilder pageRange = new StringBuilder();
-			for ( Integer i : pageRanges.keySet() )
-			{
-				Range range = pageRanges.get( i );
-				for ( int line : selectedLines )
-				{
-					if ( range.contains( line ) )
-					{
-						pageRange.append( i ).append( ',' );
-						break;
-					}
-				}
-			}
-			pageRange.deleteCharAt( pageRange.length() - 1 );
-			format.add( new PageRanges( pageRange.toString() ) );
-
-			// also tell the printable exactly which lines are selected so it
-			// doesn't have to fetch them itself
-			printable.setSelectedLines( selectedLines );
+			tempBuffer = getSelectionBuffer(view, buffer);
 		}
 
 		// copy the doc attributes from the print format attributes
@@ -177,6 +133,10 @@
 			}
 		}
 		//Log.log(Log.DEBUG, BufferPrinter1_7.class, "--- end print request attributes ---");
+
+		// set up the printable
+		BufferPrintable1_7 printable = new BufferPrintable1_7( format, view, tempBuffer );
+
 		final Doc doc = new SimpleDoc( printable, DocFlavor.SERVICE_FORMATTED.PRINTABLE, docAttributes );
 
 		// ready to print
@@ -201,6 +161,22 @@
 		ThreadUtilities.runInBackground( runner );
 	}	//}}}
 	
+	// returns a temporary buffer containing only the lines in the current selection
+	private static Buffer getSelectionBuffer(View view, Buffer buffer)
+	{
+		int[] selectedLines = view.getTextArea().getSelectedLines();
+		String path = buffer.getPath();
+		String parent = path.substring(0, path.lastIndexOf(System.getProperty("file.separator")));
+		Buffer temp = jEdit.openTemporary(view, parent, path + ".prn", true);
+		temp.setMode(buffer.getMode());
+		for (int i : selectedLines)
+		{
+			String line = buffer.getLineText(i) + '\n';
+			temp.insert(temp.getLength(), line);
+		}
+		return temp;
+	}
+	
 	/**
  	 * This is intended for use by the PrintPreview dialog.	
  	 */
@@ -234,8 +210,14 @@
 		}
 
 
-		// set up the printable to print just the requested page
-		BufferPrintable1_7 printable = new BufferPrintable1_7( model.getAttributes(), model.getView(), model.getBuffer() );
+		// set up the printable to print just the requested pages
+		Buffer buffer = model.getBuffer();
+		PrintRangeType printRangeType = (PrintRangeType)model.getAttributes().get(PrintRangeType.class);
+		if ( PrintRangeType.SELECTION.equals(printRangeType) )
+		{
+			buffer = getSelectionBuffer(model.getView(), buffer);
+		}
+		BufferPrintable1_7 printable = new BufferPrintable1_7( model.getAttributes(), model.getView(), buffer );
 		printable.setPages(model.getPageRanges());
 		int pageNumber = model.getPageNumber(); 
 		try 
@@ -255,14 +237,10 @@
 	 */
 	public static HashMap<Integer, Range> getPageRanges( View view, Buffer buffer, PrintRequestAttributeSet attributes )
 	{
-		if (attributes == null)
-		{
-			loadPrintSpec();
-			attributes = format;
-		}
-		
-		BufferPrintable1_7 printable = new BufferPrintable1_7( attributes, view, buffer );
-		return BufferPrinter1_7.getPageRanges( printable, attributes );
+		loadPrintSpec();
+		format.addAll(attributes);
+		BufferPrintable1_7 printable = new BufferPrintable1_7( format, view, buffer );
+		return BufferPrinter1_7.getPageRanges( printable, format );
 	}
 
 
@@ -299,10 +277,62 @@
 		}
 		catch(Exception e) 
 		{
+			e.printStackTrace();
 			return null;
 		}
 	}
 	
+	public static HashMap<Integer, Range> getCurrentPageRange( View view, Buffer buffer, PrintRequestAttributeSet attributes )
+	{
+		if (attributes == null)
+		{
+			loadPrintSpec();
+			attributes = format;
+		}
+		
+		BufferPrintable1_7 printable = new BufferPrintable1_7( attributes, view, buffer );
+		HashMap<Integer, Range> pages = BufferPrinter1_7.getPageRanges( printable, attributes );
+		HashMap<Integer, Range> answer = new HashMap<Integer, Range>();		
+		int caretLine = view.getTextArea().getCaretLine();
+		for (Integer i : pages.keySet())
+		{
+			Range range = pages.get(i);
+			if (range.contains(caretLine))
+			{
+				answer.put(i, range);
+				break;
+			}
+		}
+		return answer;
+	}
+	
+	public static HashMap<Integer, Range> getSelectionPageRange( View view, Buffer buffer, PrintRequestAttributeSet attributes )
+	{
+		if (attributes == null)
+		{
+			loadPrintSpec();
+			attributes = format;
+		}
+		
+		BufferPrintable1_7 printable = new BufferPrintable1_7( attributes, view, buffer );
+		HashMap<Integer, Range> pages = BufferPrinter1_7.getPageRanges( printable, attributes );
+		HashMap<Integer, Range> answer = new HashMap<Integer, Range>();
+		int[] selectedLines = view.getTextArea().getSelectedLines();
+		for ( int line : selectedLines )
+		{
+			for ( Integer page : pages.keySet() )
+			{
+				Range range = pages.get(page);
+				if ( range.contains( line ) )
+				{
+					answer.put(page, range);
+					continue;
+				}
+			}
+		}
+		return answer;
+	}
+	
 	public static PageFormat getDefaultPageFormat(PrintRequestAttributeSet attributes)
 	{
 		return BufferPrinter1_7.createPageFormat(attributes);

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java	2017-06-05 17:36:46 UTC (rev 24696)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -26,6 +26,10 @@
 import java.awt.Graphics2D;
 import java.util.HashMap;
 
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.standard.PageRanges;
+
 import org.gjt.sp.jedit.Buffer;
 import org.gjt.sp.jedit.EBComponent;
 import org.gjt.sp.jedit.EBMessage;
@@ -69,7 +73,9 @@
         {
             View view = textArea.getView();
             Buffer buffer = ( Buffer )textArea.getBuffer();
-            pages = BufferPrinter1_7.getPageRanges( view, buffer, null );
+            PrintRequestAttributeSet attributes = new HashPrintRequestAttributeSet();
+            attributes.add(new PageRanges("1-1000"));
+            pages = BufferPrinter1_7.getPageRanges( view, buffer, attributes );
         }
         else
         {
@@ -162,7 +168,7 @@
                 // 2nd part of 'if' handles soft wrap so if the last line of the page
                 // is wrapped, only the last screen line of the wrapped line will get
                 // the page break line drawn on it.
-                if ( range.getEnd() == physicalLine && textArea.getLineEndOffset( physicalLine ) == end )
+                if ( range != null && range.getEnd() == physicalLine && textArea.getLineEndOffset( physicalLine ) == end )
                 {
                     y += gfx.getFontMetrics().getHeight();
                     gfx.drawLine( 0, y, textArea.getPainter().getWidth(), y );

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrintPreviewModel.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrintPreviewModel.java	2017-06-05 17:36:46 UTC (rev 24696)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrintPreviewModel.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -47,7 +47,7 @@
 	private PrintRequestAttributeSet attributes;
 	private HashMap<Integer, Range> pageRanges;
 	private int pageNumber = 1;
-	private int printRangeType = PrinterDialog.ALL;
+	private PrintRangeType printRangeType = PrintRangeType.ALL;
 	private Graphics gfx;
 	public static enum Zoom { NONE,  IN,  OUT,  WIDTH,  PAGE };
 	private Zoom zoom = Zoom.NONE;
@@ -110,12 +110,12 @@
 		this.pageRanges = pageRanges;
 	}
 	
-	public void setPrintRangeType(int type)
+	public void setPrintRangeType(PrintRangeType type)
 	{
 		printRangeType = type;
 	}
 	
-	public int getPrintRangeType()
+	public PrintRangeType getPrintRangeType()
 	{
 		return printRangeType;	
 	}

Added: jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java	                        (rev 0)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrintRangeType.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -0,0 +1,69 @@
+
+package org.gjt.sp.jedit.print;
+
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.IntegerSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+public class PrintRangeType extends IntegerSyntax implements PrintRequestAttribute, PrintJobAttribute
+{
+
+    private static final long serialVersionUID = -6426631421680023833L;
+    public static PrintRangeType ALL = new PrintRangeType( 0 );
+    public static PrintRangeType ODD = new PrintRangeType( 1 );
+    public static PrintRangeType EVEN = new PrintRangeType( 2 );
+    public static PrintRangeType RANGE = new PrintRangeType( 3 );
+    public static PrintRangeType CURRENT_PAGE = new PrintRangeType( 4 );
+    public static PrintRangeType SELECTION = new PrintRangeType( 5 );
+
+    public PrintRangeType( int value )
+    {
+        super( value, 0, 5 );
+    }
+
+    public boolean equals( Object object )
+    {
+        return super.equals( object ) && object instanceof PrintRangeType;
+    }
+
+    public final Class< ?  extends Attribute> getCategory()
+    {
+        return PrintRangeType.class;
+    }
+
+    public final String getName()
+    {
+        return "printRangeType";
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder( "PageRangeType: " );
+        switch ( getValue() )
+        {
+            case 0:
+                sb.append( "0 ALL" );
+                break;
+            case 1:
+                sb.append( "1 ODD" );
+                break;
+            case 2:
+                sb.append( "2 EVEN" );
+                break;
+            case 3:
+                sb.append( "3 RANGE" );
+                break;
+            case 4:
+                sb.append( "4 CURRENT_PAGE" );
+                break;
+            case 6:
+                sb.append( "5 SELECTION" );
+                break;
+        }
+
+        return sb.toString();
+    }
+}

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-05 17:36:46 UTC (rev 24696)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -74,16 +74,8 @@
     private boolean canceled = false;
     private Map<String, String> messageMap;
     private PageSetupPanel pageSetupPanel;
-    public static int ALL = 0;
-    public static int ODD = 1;
-    public static int EVEN = 2;
-    public static int RANGE = 3;
-    public static int CURRENT_PAGE = 4;
-    public static int SELECTION = 5;
-    public static int onlyPrintPages = ALL;
-    private int printRangeType = ALL;
+    public static int onlyPrintPages = PrintRangeType.ALL.getValue();
     private DocFlavor DOC_FLAVOR = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
-    private boolean reversePrinting = false;
 
 
     public PrinterDialog( View owner, PrintRequestAttributeSet attributes, boolean pageSetupOnly )
@@ -90,8 +82,6 @@
     {
         super( owner, Dialog.ModalityType.APPLICATION_MODAL );
         try
-
-
         {
             view = owner;
             this.pageSetupOnly = pageSetupOnly;
@@ -115,10 +105,10 @@
 
 
             this.attributes.remove( Destination.class );
-            Attribute[] attrs = attributes.toArray();
+            
 
             // for debugging
-            /*
+            /* Attribute[] attrs = attributes.toArray();
              * for ( Attribute a : attrs )
              * {
              * Log.log( Log.DEBUG, this, "+++++ before: " + a.getName() + " = " + a );
@@ -381,27 +371,6 @@
     }
 
 
-    /**
-     * @return <code>true</code> if the pages should be printed in reverse order,
-     * that is, the last page is printed first and the first page is printed last.
-     */
-    public boolean getReverse()
-    {
-        return reversePrinting;
-    }
-
-
-    /**
-     * @return one of ALL, RANGE, CURRENT, or SELECTION, depending on whether the
-     * user has elected to print all pages, a range of pages, just the current page
-     * or just the selected text.
-     */
-    public int getPrintRangeType()
-    {
-        return printRangeType;
-    }
-
-
     private PrintService[] getPrintServices()
     {
         PrintService[] printServices = PrintServiceLookup.lookupPrintServices( DOC_FLAVOR, null );
@@ -456,7 +425,7 @@
     // setting in the Page Setup tab.
     private PageRanges mergeRanges( PageRanges pr ) throws PrintException
     {
-        if ( pr == null || onlyPrintPages == ALL )
+        if ( pr == null || onlyPrintPages == PrintRangeType.ALL.getValue() )
         {
             return pr;
         }
@@ -476,12 +445,12 @@
             int end = range.length == 1 ? range[0] : Math.min( range[0] + 500, range[1] );
             for ( int pageIndex = start; pageIndex <= end; pageIndex++ )
             {
-                if ( pageIndex % 2 == 0 && onlyPrintPages == EVEN )
+                if ( pageIndex % 2 == 0 && onlyPrintPages == PrintRangeType.EVEN.getValue() )
                 {
                     pages.add( pageIndex );
                 }
                 else
-                if ( pageIndex % 2 == 1 && onlyPrintPages == ODD )
+                if ( pageIndex % 2 == 1 && onlyPrintPages == PrintRangeType.ODD.getValue() )
                 {
                     pages.add( pageIndex );
                 }
@@ -858,7 +827,7 @@
             if ( allPages.isSelected() )
             {
                 as.add( new PageRanges( 1, 1000 ) );
-                printRangeType = ALL;
+                as.add( PrintRangeType.ALL );
             }
             else
             if ( pages.isSelected() )
@@ -867,8 +836,6 @@
                 if ( pageRange != null )
                 {
                     try
-
-
                     {
                         as.add( new PageRanges( pageRange ) );
                     }
@@ -877,21 +844,27 @@
                         e.printStackTrace();
                     }
                 }
-
-
-                printRangeType = RANGE;
+                as.add( PrintRangeType.RANGE );
             }
             else
             if ( currentPage.isSelected() )
             {
-                as.add( new PageRanges( 1 ) );
-                printRangeType = CURRENT_PAGE;
+                PrinterDialog.this.attributes.add(new PageRanges( 1, 1000 ) );
+                HashMap<Integer, Range> currentPageRange = BufferPrinter1_7.getCurrentPageRange(view, view.getBuffer(), PrinterDialog.this.attributes);
+                int page = 1;
+                if (currentPageRange != null && !currentPageRange.isEmpty())
+                {
+                    page = currentPageRange.keySet().iterator().next();
+                }
+                
+                as.add( new PageRanges( page ) );
+                as.add( PrintRangeType.CURRENT_PAGE );
             }
             else
             if ( selection.isSelected() )
             {
-                as.add( new PageRanges( 1, 1000 ) );
-                printRangeType = SELECTION;
+                PrinterDialog.this.attributes.add(new PageRanges( 1, 1000 ) );
+                as.add( PrintRangeType.SELECTION );
             }
 
 
@@ -902,9 +875,12 @@
 
 
             as.add( new Copies( ( Integer )copies.getValue() ) );
+            
+            if (reverse.isSelected())
+            {
+                as.add(new Reverse());   
+            }
 
-            reversePrinting = reverse.isSelected();
-
             return as;
         }
 

Added: jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java	                        (rev 0)
+++ jEdit/trunk/org/gjt/sp/jedit/print/Reverse.java	2017-06-06 18:23:17 UTC (rev 24697)
@@ -0,0 +1,52 @@
+/*
+ * Reverse.java - Print attribute indicating reverse print order
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=explicit:collapseFolds=1:
+ *
+ * Copyright (C) Dale Anson
+ *
+ * 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.print;
+
+
+import javax.print.attribute.Attribute;
+
+
+// Custom print attribute indicating the pages should be printed in reverse
+// order. This is just a marker attribute, if present, pages should be printed
+// in reverse order, if not present, then print pages in forward order.
+public class Reverse implements Attribute
+{
+
+    private static final long serialVersionUID = -2823970704630722439L;
+
+    public boolean equals( Object object )
+    {
+        return object != null && object instanceof Reverse && object.getClass() == this.getClass();
+    }
+
+    public final Class< ?  extends Attribute> getCategory()
+    {
+        return Reverse.class;
+    }
+
+    public final String getName()
+    {
+        return "reverse";
+    }
+}
+

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

[ jEdit-commits ] [jEdit-daily] jEdit_trunk - Build # 291 - Successful!

[<jedit_daily@te...>]

jEdit_trunk - Build # 291 - Successful:

Changes for Build #291



Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit%2F291

[ jEdit-commits ] SF.net SVN: jedit:[24696] jEdit/trunk/org/gjt/sp/jedit/print/ PrinterDialog.java

[<daleanson@us...>]

Revision: 24696
          http://sourceforge.net/p/jedit/svn/24696
Author:   daleanson
Date:     2017-06-05 17:36:46 +0000 (Mon, 05 Jun 2017)
Log Message:
-----------
Fixed default metric margin values.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-04 20:51:19 UTC (rev 24695)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-05 17:36:46 UTC (rev 24696)
@@ -47,9 +47,8 @@
 import org.gjt.sp.jedit.gui.VariableGridLayout;
 import org.gjt.sp.jedit.jEdit;
 import org.gjt.sp.util.GenericGUIUtilities;
+import org.gjt.sp.util.Log;
 
-
-// import org.gjt.sp.util.Log;
 // Technical guide on the Java printing system:
 // https://docs.oracle.com/javase/7/docs/technotes/guides/jps/spec/JPSTOC.fm.html
 public class PrinterDialog extends JDialog implements ListSelectionListener
@@ -1064,10 +1063,10 @@
             JPanel marginPanel = new JPanel( new VariableGridLayout( VariableGridLayout.FIXED_NUM_COLUMNS, 2, 6, 6 ) );
             marginPanel.setBorder( BorderFactory.createCompoundBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), jEdit.getProperty( "print.dialog.Margins", "Margins" ) ), BorderFactory.createEmptyBorder( 11, 11, 11, 11 ) ) );
             boolean unitIsMM = getUnits() == MediaPrintableArea.MM;
-            String topMargin = jEdit.getProperty("print.topMargin", unitIsMM ? "2.5" : "1.0");
-            String leftMargin = jEdit.getProperty("print.leftMargin", unitIsMM ? "2.5" : "1.0");
-            String rightMargin = jEdit.getProperty("print.rightMargin", unitIsMM ? "2.5" : "1.0");
-            String bottomMargin = jEdit.getProperty("print.bottomMargin", unitIsMM ? "2.5" : "1.0");
+            String topMargin = jEdit.getProperty("print.topMargin", unitIsMM ? "25" : "1.0");
+            String leftMargin = jEdit.getProperty("print.leftMargin", unitIsMM ? "25" : "1.0");
+            String rightMargin = jEdit.getProperty("print.rightMargin", unitIsMM ? "25" : "1.0");
+            String bottomMargin = jEdit.getProperty("print.bottomMargin", unitIsMM ? "25" : "1.0");
             topMarginField = new NumericTextField( topMargin, true, unitIsMM );
             leftMarginField = new NumericTextField( leftMargin, true, unitIsMM );
             rightMarginField = new NumericTextField( rightMargin, true, unitIsMM );
@@ -1465,7 +1464,7 @@
             OrientationRequested orientationRequested = ( OrientationRequested )orientation.getSelectedItem();
             rotateMargins( topMargin, leftMargin, rightMargin, bottomMargin, orientationRequested );
 
-            // Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
+            Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
             return new float[] {topMargin, leftMargin, rightMargin, bottomMargin};
         }
 
@@ -1508,7 +1507,7 @@
             OrientationRequested orientationRequested = ( OrientationRequested )orientation.getSelectedItem();
             rotateMargins( topMargin, leftMargin, rightMargin, bottomMargin, orientationRequested );
 
-            // Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
+            Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
             return new float[] {topMargin, leftMargin, rightMargin, bottomMargin};
         }
 

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

[ jEdit-commits ] SF.net SVN: jedit:[24695] plugins/XQuery/tags/XQuery-1.2.0/

[<grepppo@us...>]

Revision: 24695
          http://sourceforge.net/p/jedit/svn/24695
Author:   grepppo
Date:     2017-06-04 20:51:19 +0000 (Sun, 04 Jun 2017)
Log Message:
-----------
Upgrading to work with the latest version of the Antlr plugin

Added Paths:
-----------
    plugins/XQuery/tags/XQuery-1.2.0/

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

[ jEdit-commits ] SF.net SVN: jedit:[24694] plugins/XQuery/trunk

[<grepppo@us...>]

Revision: 24694
          http://sourceforge.net/p/jedit/svn/24694
Author:   grepppo
Date:     2017-06-04 20:47:54 +0000 (Sun, 04 Jun 2017)
Log Message:
-----------
Upgrading to work with the latest version of the Antlr plugin

Modified Paths:
--------------
    plugins/XQuery/trunk/XQuery.props
    plugins/XQuery/trunk/build.xml
    plugins/XQuery/trunk/sidekick/xquery/parser/SideKickErrorListener.java
    plugins/XQuery/trunk/sidekick/xquery/parser/XQueryLexer.java
    plugins/XQuery/trunk/sidekick/xquery/parser/XQueryParser.java
    plugins/XQuery/trunk/sidekick/xquery/parser/XQueryParserBaseListener.java
    plugins/XQuery/trunk/sidekick/xquery/parser/XQueryParserListener.java
    plugins/XQuery/trunk/users-guide.xml

Modified: plugins/XQuery/trunk/XQuery.props
===================================================================
--- plugins/XQuery/trunk/XQuery.props	2017-06-03 18:59:11 UTC (rev 24693)
+++ plugins/XQuery/trunk/XQuery.props	2017-06-04 20:47:54 UTC (rev 24694)
@@ -2,13 +2,13 @@
 plugin.xquery.XQueryPlugin.activate=defer
 plugin.xquery.XQueryPlugin.name=XQuery Plugin
 plugin.xquery.XQueryPlugin.author=Wim le Page, Pieter Wellens
-plugin.xquery.XQueryPlugin.version=1.1.0
+plugin.xquery.XQueryPlugin.version=1.2.0
 plugin.xquery.XQueryPlugin.docs=index.html
-plugin.xquery.XQueryPlugin.depend.0=jdk 1.6
-plugin.xquery.XQueryPlugin.depend.1=jedit 05.02.99.00
+plugin.xquery.XQueryPlugin.depend.0=jdk 1.7
+plugin.xquery.XQueryPlugin.depend.1=jedit 05.03.99.00
 plugin.xquery.XQueryPlugin.depend.2=plugin errorlist.ErrorListPlugin 1.9
 plugin.xquery.XQueryPlugin.depend.3=plugin infoviewer.InfoViewerPlugin 1.6
-plugin.xquery.XQueryPlugin.depend.4=plugin antlr.AntlrPlugin 4.4
+plugin.xquery.XQueryPlugin.depend.4=plugin antlr.AntlrPlugin 4.5.1
 plugin.xquery.XQueryPlugin.depend.5=plugin sidekick.SideKickPlugin 1.7
 plugin.xquery.XQueryPlugin.depend.6=plugin eclipseicons.EclipseIconsPlugin 1.0
 plugin.xquery.XQueryPlugin.description=The XQuery plugin provides features for querying XML documents, setting options for output, performance monitoring and other XQuery processor specific variables.

Modified: plugins/XQuery/trunk/build.xml
===================================================================
--- plugins/XQuery/trunk/build.xml	2017-06-03 18:59:11 UTC (rev 24693)
+++ plugins/XQuery/trunk/build.xml	2017-06-04 20:47:54 UTC (rev 24694)
@@ -37,7 +37,7 @@
     <pathelement location="${jedit.plugins.dir}/ErrorList.jar"/>
     <pathelement location="${jedit.plugins.dir}/XmlIndenter.jar"/>
     <pathelement location="${jedit.plugins.dir}/InfoViewer.jar"/>
-	<pathelement location="${jedit.plugins.dir}/antlr-4.4-complete.jar"/>
+	<pathelement location="${jedit.plugins.dir}/antlr4-4.5-opt.jar"/>
     <pathelement location="${jedit.plugins.dir}/SideKick.jar"/>
     <pathelement location="${jedit.plugins.dir}/EclipseIcons.jar"/>
   </path>

Modified: plugins/XQuery/trunk/sidekick/xquery/parser/SideKickErrorListener.java
===================================================================
--- plugins/XQuery/trunk/sidekick/xquery/parser/SideKickErrorListener.java	2017-06-03 18:59:11 UTC (rev 24693)
+++ plugins/XQuery/trunk/sidekick/xquery/parser/SideKickErrorListener.java	2017-06-04 20:47:54 UTC (rev 24694)
@@ -1,6 +1,8 @@
 package sidekick.xquery.parser;
 
 import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.NotNull;
+import org.antlr.v4.runtime.misc.Nullable;
 
 import java.util.*;
 
@@ -12,10 +14,11 @@
 
     public List<ParseError> getErrors() {
         return errors;
+        
     }
 
     @Override
-    public void syntaxError( Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e ) {
+	public <T extends Token> void syntaxError(@NotNull Recognizer<T, ?> recognizer, @Nullable T offendingSymbol, int line, int charPositionInLine, @NotNull String msg, @Nullable RecognitionException e) {
         int length = 0;
         if ( e != null && e.getOffendingToken() != null ) {
             int startOffset = e.getOffendingToken().getStartIndex();

Modified: plugins/XQuery/trunk/sidekick/xquery/parser/XQueryLexer.java
===================================================================
--- plugins/XQuery/trunk/sidekick/xquery/parser/XQueryLexer.java	2017-06-03 18:59:11 UTC (rev 24693)
+++ plugins/XQuery/trunk/sidekick/xquery/parser/XQueryLexer.java	2017-06-04 20:47:54 UTC (rev 24694)
@@ -1,4 +1,4 @@
-// Generated from XQueryLexer.g4 by ANTLR 4.4
+// Generated from XQueryLexer.g4 by ANTLR 4.x
 package sidekick.xquery.parser;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -9,13 +9,7 @@
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.misc.*;
 
-@...({"all", "warnings", "unchecked", "unused", "cast"})
 public class XQueryLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.4", RuntimeMetaData.VERSION); }
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
 	public static final int
 		IntegerLiteral=1, DecimalLiteral=2, DoubleLiteral=3, PredefinedEntityRef=4, 
 		CharRef=5, Quot=6, Apos=7, COMMENT=8, XMLDECL=9, PI=10, CDATA=11, PRAGMA=12, 
@@ -47,25 +41,6 @@
 		"DEFAULT_MODE"
 	};
 
-	public static final String[] tokenNames = {
-		"'\\u0000'", "'\\u0001'", "'\\u0002'", "'\\u0003'", "'\\u0004'", "'\\u0005'", 
-		"'\\u0006'", "'\\u0007'", "'\b'", "'\t'", "'\n'", "'\\u000B'", "'\f'", 
-		"'\r'", "'\\u000E'", "'\\u000F'", "'\\u0010'", "'\\u0011'", "'\\u0012'", 
-		"'\\u0013'", "'\\u0014'", "'\\u0015'", "'\\u0016'", "'\\u0017'", "'\\u0018'", 
-		"'\\u0019'", "'\\u001A'", "'\\u001B'", "'\\u001C'", "'\\u001D'", "'\\u001E'", 
-		"'\\u001F'", "' '", "'!'", "'\"'", "'#'", "'$'", "'%'", "'&'", "'''", 
-		"'('", "')'", "'*'", "'+'", "','", "'-'", "'.'", "'/'", "'0'", "'1'", 
-		"'2'", "'3'", "'4'", "'5'", "'6'", "'7'", "'8'", "'9'", "':'", "';'", 
-		"'<'", "'='", "'>'", "'?'", "'@'", "'A'", "'B'", "'C'", "'D'", "'E'", 
-		"'F'", "'G'", "'H'", "'I'", "'J'", "'K'", "'L'", "'M'", "'N'", "'O'", 
-		"'P'", "'Q'", "'R'", "'S'", "'T'", "'U'", "'V'", "'W'", "'X'", "'Y'", 
-		"'Z'", "'['", "'\\'", "']'", "'^'", "'_'", "'`'", "'a'", "'b'", "'c'", 
-		"'d'", "'e'", "'f'", "'g'", "'h'", "'i'", "'j'", "'k'", "'l'", "'m'", 
-		"'n'", "'o'", "'p'", "'q'", "'r'", "'s'", "'t'", "'u'", "'v'", "'w'", 
-		"'x'", "'y'", "'z'", "'{'", "'|'", "'}'", "'~'", "'\\u007F'", "'\\u0080'", 
-		"'\\u0081'", "'\\u0082'", "'\\u0083'", "'\\u0084'", "'\\u0085'", "'\\u0086'", 
-		"'\\u0087'", "'\\u0088'", "'\\u0089'", "'\\u008A'", "'\\u008B'", "'\\u008C'"
-	};
 	public static final String[] ruleNames = {
 		"IntegerLiteral", "DecimalLiteral", "DoubleLiteral", "Digits", "PredefinedEntityRef", 
 		"CharRef", "Quot", "Apos", "COMMENT", "XMLDECL", "PI", "CDATA", "PRAGMA", 
@@ -93,10 +68,91 @@
 		"NCName", "NameStartChar", "NameChar", "XQComment", "ContentChar"
 	};
 
+	private static final String[] _LITERAL_NAMES = {
+		null, null, null, null, null, null, "'\"'", "'''", null, null, null, null, 
+		null, null, "'='", "'!='", "'('", "')'", "'['", "']'", "'{'", "'}'", "'*'", 
+		"'+'", "'-'", "','", "'.'", "'..'", "':'", "':='", "';'", "'/'", "'//'", 
+		"'|'", "'<'", "'>'", "'?'", "'@'", "'$'", "'ancestor'", "'ancestor-or-self'", 
+		"'and'", "'as'", "'ascending'", "'at'", "'attribute'", "'base-uri'", "'boundary-space'", 
+		"'by'", "'case'", "'cast'", "'castable'", "'child'", "'collation'", "'comment'", 
+		"'construction'", "'copy-namespaces'", "'declare'", "'default'", "'descendant'", 
+		"'descendant-or-self'", "'descending'", "'div'", "'document'", "'document-node'", 
+		"'element'", "'else'", "'empty'", "'empty-sequence'", "'encoding'", "'eq'", 
+		"'every'", "'except'", "'external'", "'following'", "'following-sibling'", 
+		"'for'", "'function'", "'ge'", "'greatest'", "'gt'", "'idiv'", "'if'", 
+		"'import'", "'in'", "'inherit'", "'instance'", "'intersect'", "'is'", 
+		"'item'", "'lax'", "'le'", "'least'", "'let'", "'lt'", "'mod'", "'module'", 
+		"'namespace'", "'ne'", "'no-inherit'", "'no-preserve'", "'node'", "'of'", 
+		"'option'", "'or'", "'order'", "'ordered'", "'ordering'", "'parent'", 
+		"'preceding'", "'preceding-sibling'", "'preserve'", "'processing-instruction'", 
+		"'return'", "'satisfies'", "'schema'", "'schema-attribute'", "'schema-element'", 
+		"'self'", "'some'", "'stable'", "'strict'", "'strip'", "'text'", "'then'", 
+		"'to'", "'treat'", "'typeswitch'", "'union'", "'unordered'", "'validate'", 
+		"'variable'", "'version'", "'where'", "'xquery'"
+	};
+	private static final String[] _SYMBOLIC_NAMES = {
+		null, "IntegerLiteral", "DecimalLiteral", "DoubleLiteral", "PredefinedEntityRef", 
+		"CharRef", "Quot", "Apos", "COMMENT", "XMLDECL", "PI", "CDATA", "PRAGMA", 
+		"WS", "EQUAL", "NOT_EQUAL", "LPAREN", "RPAREN", "LBRACKET", "RBRACKET", 
+		"LBRACE", "RBRACE", "STAR", "PLUS", "MINUS", "COMMA", "DOT", "DDOT", "COLON", 
+		"COLON_EQ", "SEMICOLON", "SLASH", "DSLASH", "VBAR", "LANGLE", "RANGLE", 
+		"QUESTION", "AT", "DOLLAR", "KW_ANCESTOR", "KW_ANCESTOR_OR_SELF", "KW_AND", 
+		"KW_AS", "KW_ASCENDING", "KW_AT", "KW_ATTRIBUTE", "KW_BASE_URI", "KW_BOUNDARY_SPACE", 
+		"KW_BY", "KW_CASE", "KW_CAST", "KW_CASTABLE", "KW_CHILD", "KW_COLLATION", 
+		"KW_COMMENT", "KW_CONSTRUCTION", "KW_COPY_NS", "KW_DECLARE", "KW_DEFAULT", 
+		"KW_DESCENDANT", "KW_DESCENDANT_OR_SELF", "KW_DESCENDING", "KW_DIV", "KW_DOCUMENT", 
+		"KW_DOCUMENT_NODE", "KW_ELEMENT", "KW_ELSE", "KW_EMPTY", "KW_EMPTY_SEQUENCE", 
+		"KW_ENCODING", "KW_EQ", "KW_EVERY", "KW_EXCEPT", "KW_EXTERNAL", "KW_FOLLOWING", 
+		"KW_FOLLOWING_SIBLING", "KW_FOR", "KW_FUNCTION", "KW_GE", "KW_GREATEST", 
+		"KW_GT", "KW_IDIV", "KW_IF", "KW_IMPORT", "KW_IN", "KW_INHERIT", "KW_INSTANCE", 
+		"KW_INTERSECT", "KW_IS", "KW_ITEM", "KW_LAX", "KW_LE", "KW_LEAST", "KW_LET", 
+		"KW_LT", "KW_MOD", "KW_MODULE", "KW_NAMESPACE", "KW_NE", "KW_NO_INHERIT", 
+		"KW_NO_PRESERVE", "KW_NODE", "KW_OF", "KW_OPTION", "KW_OR", "KW_ORDER", 
+		"KW_ORDERED", "KW_ORDERING", "KW_PARENT", "KW_PRECEDING", "KW_PRECEDING_SIBLING", 
+		"KW_PRESERVE", "KW_PI", "KW_RETURN", "KW_SATISFIES", "KW_SCHEMA", "KW_SCHEMA_ATTR", 
+		"KW_SCHEMA_ELEM", "KW_SELF", "KW_SOME", "KW_STABLE", "KW_STRICT", "KW_STRIP", 
+		"KW_TEXT", "KW_THEN", "KW_TO", "KW_TREAT", "KW_TYPESWITCH", "KW_UNION", 
+		"KW_UNORDERED", "KW_VALIDATE", "KW_VARIABLE", "KW_VERSION", "KW_WHERE", 
+		"KW_XQUERY", "FullQName", "NCNameWithLocalWildcard", "NCNameWithPrefixWildcard", 
+		"NCName", "XQComment", "ContentChar"
+	};
+	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
+	/**
+	 * @deprecated Use {@link #VOCABULARY} instead.
+	 */
+	@Deprecated
+	public static final String[] tokenNames;
+	static {
+		tokenNames = new String[_SYMBOLIC_NAMES.length];
+		for (int i = 0; i < tokenNames.length; i++) {
+			tokenNames[i] = VOCABULARY.getLiteralName(i);
+			if (tokenNames[i] == null) {
+				tokenNames[i] = VOCABULARY.getSymbolicName(i);
+			}
+
+			if (tokenNames[i] == null) {
+				tokenNames[i] = "<INVALID>";
+			}
+		}
+	}
+
+	@Override
+	@Deprecated
+	public String[] getTokenNames() {
+		return tokenNames;
+	}
+
+	@Override
+	@NotNull
+	public Vocabulary getVocabulary() {
+		return VOCABULARY;
+	}
+
+
 	public XQueryLexer(CharStream input) {
 		super(input);
-		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+		_interp = new LexerATNSimulator(this,_ATN);
 	}
 
 	@Override
@@ -103,9 +159,6 @@
 	public String getGrammarFileName() { return "XQueryLexer.g4"; }
 
 	@Override
-	public String[] getTokenNames() { return tokenNames; }
-
-	@Override
 	public String[] getRuleNames() { return ruleNames; }
 
 	@Override
@@ -114,11 +167,8 @@
 	@Override
 	public String[] getModeNames() { return modeNames; }
 
-	@Override
-	public ATN getATN() { return _ATN; }
-
 	public static final String _serializedATN =
-		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\u008e\u053d\b\1\4"+
+		"\3\uaf6f\u8320\u479d\ub75c\u4880\u1605\u191c\uab37\2\u008e\u053d\b\1\4"+
 		"\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n"+
 		"\4\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+
 		"\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31"+
@@ -200,36 +250,40 @@
 		"\u008f\3\u008f\3\u008f\3\u008f\3\u008f\3\u008f\7\u008f\u052e\n\u008f\f"+
 		"\u008f\16\u008f\u0531\13\u008f\3\u008f\6\u008f\u0534\n\u008f\r\u008f\16"+
 		"\u008f\u0535\3\u008f\3\u008f\3\u008f\3\u008f\3\u0090\3\u0090\6\u0190\u01a0"+
-		"\u01b5\u01cc\2\u0091\3\3\5\4\7\5\t\2\13\6\r\7\17\b\21\t\23\n\25\13\27"+
-		"\f\31\r\33\16\35\17\37\20!\21#\22%\23\'\24)\25+\26-\27/\30\61\31\63\32"+
-		"\65\33\67\349\35;\36=\37? A!C\"E#G$I%K&M\'O(Q)S*U+W,Y-[.]/_\60a\61c\62"+
-		"e\63g\64i\65k\66m\67o8q9s:u;w<y={>}?\177@\u0081A\u0083B\u0085C\u0087D"+
-		"\u0089E\u008bF\u008dG\u008fH\u0091I\u0093J\u0095K\u0097L\u0099M\u009b"+
-		"N\u009dO\u009fP\u00a1Q\u00a3R\u00a5S\u00a7T\u00a9U\u00abV\u00adW\u00af"+
-		"X\u00b1Y\u00b3Z\u00b5[\u00b7\\\u00b9]\u00bb^\u00bd_\u00bf`\u00c1a\u00c3"+
-		"b\u00c5c\u00c7d\u00c9e\u00cbf\u00cdg\u00cfh\u00d1i\u00d3j\u00d5k\u00d7"+
-		"l\u00d9m\u00dbn\u00ddo\u00dfp\u00e1q\u00e3r\u00e5s\u00e7t\u00e9u\u00eb"+
-		"v\u00edw\u00efx\u00f1y\u00f3z\u00f5{\u00f7|\u00f9}\u00fb~\u00fd\177\u00ff"+
-		"\u0080\u0101\u0081\u0103\u0082\u0105\u0083\u0107\u0084\u0109\u0085\u010b"+
-		"\u0086\u010d\u0087\u010f\u0088\u0111\u0089\u0113\u008a\u0115\u008b\u0117"+
-		"\u008c\u0119\2\u011b\2\u011d\u008d\u011f\u008e\3\2\21\3\2\62;\4\2GGgg"+
-		"\4\2--//\5\2\62;CHch\3\2//\4\2ZZzz\4\2OOoo\4\2NNnn\5\2\13\f\17\17\"\""+
-		"\20\2C\\aac|\u00c2\u00d8\u00da\u00f8\u00fa\u0301\u0372\u037f\u0381\u2001"+
-		"\u200e\u200f\u2072\u2191\u2c02\u2ff1\u3003\ud801\uf902\ufdd1\ufdf2\uffff"+
-		"\7\2/\60\62;\u00b9\u00b9\u0302\u0371\u2041\u2042\3\2<<\3\2++\4\2**<<\7"+
-		"\2$$()>>}}\177\177\u055a\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\13\3\2"+
-		"\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2"+
-		"\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2"+
-		"\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2"+
-		"\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3"+
-		"\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2"+
-		"\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2"+
-		"S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3"+
-		"\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2"+
-		"\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2"+
-		"y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083"+
-		"\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2"+
-		"\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095"+
+		"\u01b5\u01cc\2\2\u0091\3\2\3\5\2\4\7\2\5\t\2\2\13\2\6\r\2\7\17\2\b\21"+
+		"\2\t\23\2\n\25\2\13\27\2\f\31\2\r\33\2\16\35\2\17\37\2\20!\2\21#\2\22"+
+		"%\2\23\'\2\24)\2\25+\2\26-\2\27/\2\30\61\2\31\63\2\32\65\2\33\67\2\34"+
+		"9\2\35;\2\36=\2\37?\2 A\2!C\2\"E\2#G\2$I\2%K\2&M\2\'O\2(Q\2)S\2*U\2+W"+
+		"\2,Y\2-[\2.]\2/_\2\60a\2\61c\2\62e\2\63g\2\64i\2\65k\2\66m\2\67o\28q\2"+
+		"9s\2:u\2;w\2<y\2={\2>}\2?\177\2@\u0081\2A\u0083\2B\u0085\2C\u0087\2D\u0089"+
+		"\2E\u008b\2F\u008d\2G\u008f\2H\u0091\2I\u0093\2J\u0095\2K\u0097\2L\u0099"+
+		"\2M\u009b\2N\u009d\2O\u009f\2P\u00a1\2Q\u00a3\2R\u00a5\2S\u00a7\2T\u00a9"+
+		"\2U\u00ab\2V\u00ad\2W\u00af\2X\u00b1\2Y\u00b3\2Z\u00b5\2[\u00b7\2\\\u00b9"+
+		"\2]\u00bb\2^\u00bd\2_\u00bf\2`\u00c1\2a\u00c3\2b\u00c5\2c\u00c7\2d\u00c9"+
+		"\2e\u00cb\2f\u00cd\2g\u00cf\2h\u00d1\2i\u00d3\2j\u00d5\2k\u00d7\2l\u00d9"+
+		"\2m\u00db\2n\u00dd\2o\u00df\2p\u00e1\2q\u00e3\2r\u00e5\2s\u00e7\2t\u00e9"+
+		"\2u\u00eb\2v\u00ed\2w\u00ef\2x\u00f1\2y\u00f3\2z\u00f5\2{\u00f7\2|\u00f9"+
+		"\2}\u00fb\2~\u00fd\2\177\u00ff\2\u0080\u0101\2\u0081\u0103\2\u0082\u0105"+
+		"\2\u0083\u0107\2\u0084\u0109\2\u0085\u010b\2\u0086\u010d\2\u0087\u010f"+
+		"\2\u0088\u0111\2\u0089\u0113\2\u008a\u0115\2\u008b\u0117\2\u008c\u0119"+
+		"\2\2\u011b\2\2\u011d\2\u008d\u011f\2\u008e\3\2\21\3\2\62;\4\2GGgg\4\2"+
+		"--//\5\2\62;CHch\3\2//\4\2ZZzz\4\2OOoo\4\2NNnn\5\2\13\f\17\17\"\"\20\2"+
+		"C\\aac|\u00c2\u00d8\u00da\u00f8\u00fa\u0301\u0372\u037f\u0381\u2001\u200e"+
+		"\u200f\u2072\u2191\u2c02\u2ff1\u3003\ud801\uf902\ufdd1\ufdf2\uffff\7\2"+
+		"/\60\62;\u00b9\u00b9\u0302\u0371\u2041\u2042\3\2<<\3\2++\4\2**<<\7\2$"+
+		"$()>>}}\177\177\u055a\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\13\3\2\2\2"+
+		"\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27"+
+		"\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2"+
+		"\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2"+
+		"\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2"+
+		"\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2"+
+		"\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S"+
+		"\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2"+
+		"\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2"+
+		"\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y"+
+		"\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3"+
+		"\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2"+
+		"\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095"+
 		"\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2\2\2\u009b\3\2\2\2\2\u009d\3\2\2"+
 		"\2\2\u009f\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2\2\2\u00a5\3\2\2\2\2\u00a7"+
 		"\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab\3\2\2\2\2\u00ad\3\2\2\2\2\u00af\3\2\2"+
@@ -582,9 +636,5 @@
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
 	}
 }
\ No newline at end of file

Modified: plugins/XQuery/trunk/sidekick/xquery/parser/XQueryParser.java
===================================================================
--- plugins/XQuery/trunk/sidekick/xquery/parser/XQueryParser.java	2017-06-03 18:59:11 UTC (rev 24693)
+++ plugins/XQuery/trunk/sidekick/xquery/parser/XQueryParser.java	2017-06-04 20:47:54 UTC (rev 24694)
@@ -1,5 +1,6 @@
-// Generated from XQueryParser.g4 by ANTLR 4.4
+// Generated from XQueryParser.g4 by ANTLR 4.x
 package sidekick.xquery.parser;
+
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.*;
@@ -9,13 +10,7 @@
 import java.util.Iterator;
 import java.util.ArrayList;
 
-@...({"all", "warnings", "unchecked", "unused", "cast"})
 public class XQueryParser extends Parser {
-	static { RuntimeMetaData.checkVersion("4.4", RuntimeMetaData.VERSION); }
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
 	public static final int
 		KW_EMPTY=67, KW_DOCUMENT_NODE=64, CDATA=11, STAR=22, Apos=7, LANGLE=34, 
 		KW_ENCODING=69, KW_VALIDATE=130, KW_DEFAULT=58, KW_ELEMENT=65, KW_EMPTY_SEQUENCE=68, 
@@ -43,30 +38,6 @@
 		KW_NAMESPACE=97, KW_BOUNDARY_SPACE=47, KW_AS=42, KW_AT=44, KW_PRECEDING_SIBLING=110, 
 		KW_COMMENT=54, KW_OF=102, KW_DESCENDING=61, IntegerLiteral=1, KW_DECLARE=57, 
 		KW_GE=78, NCNameWithLocalWildcard=136;
-	public static final String[] tokenNames = {
-		"<INVALID>", "IntegerLiteral", "DecimalLiteral", "DoubleLiteral", "PredefinedEntityRef", 
-		"CharRef", "'\"'", "'''", "COMMENT", "XMLDECL", "PI", "CDATA", "PRAGMA", 
-		"WS", "'='", "'!='", "'('", "')'", "'['", "']'", "'{'", "'}'", "'*'", 
-		"'+'", "'-'", "','", "'.'", "'..'", "':'", "':='", "';'", "'/'", "'//'", 
-		"'|'", "'<'", "'>'", "'?'", "'@'", "'$'", "'ancestor'", "'ancestor-or-self'", 
-		"'and'", "'as'", "'ascending'", "'at'", "'attribute'", "'base-uri'", "'boundary-space'", 
-		"'by'", "'case'", "'cast'", "'castable'", "'child'", "'collation'", "'comment'", 
-		"'construction'", "'copy-namespaces'", "'declare'", "'default'", "'descendant'", 
-		"'descendant-or-self'", "'descending'", "'div'", "'document'", "'document-node'", 
-		"'element'", "'else'", "'empty'", "'empty-sequence'", "'encoding'", "'eq'", 
-		"'every'", "'except'", "'external'", "'following'", "'following-sibling'", 
-		"'for'", "'function'", "'ge'", "'greatest'", "'gt'", "'idiv'", "'if'", 
-		"'import'", "'in'", "'inherit'", "'instance'", "'intersect'", "'is'", 
-		"'item'", "'lax'", "'le'", "'least'", "'let'", "'lt'", "'mod'", "'module'", 
-		"'namespace'", "'ne'", "'no-inherit'", "'no-preserve'", "'node'", "'of'", 
-		"'option'", "'or'", "'order'", "'ordered'", "'ordering'", "'parent'", 
-		"'preceding'", "'preceding-sibling'", "'preserve'", "'processing-instruction'", 
-		"'return'", "'satisfies'", "'schema'", "'schema-attribute'", "'schema-element'", 
-		"'self'", "'some'", "'stable'", "'strict'", "'strip'", "'text'", "'then'", 
-		"'to'", "'treat'", "'typeswitch'", "'union'", "'unordered'", "'validate'", 
-		"'variable'", "'version'", "'where'", "'xquery'", "FullQName", "NCNameWithLocalWildcard", 
-		"NCNameWithPrefixWildcard", "NCName", "XQComment", "ContentChar"
-	};
 	public static final int
 		RULE_module = 0, RULE_versionDecl = 1, RULE_mainModule = 2, RULE_libraryModule = 3, 
 		RULE_moduleDecl = 4, RULE_prolog = 5, RULE_defaultNamespaceDecl = 6, RULE_setter = 7, 
@@ -109,32 +80,107 @@
 		"stringLiteral", "noQuotesNoBracesNoAmpNoLAng"
 	};
 
+	private static final String[] _LITERAL_NAMES = {
+		null, null, null, null, null, null, "'\"'", "'''", null, null, null, null, 
+		null, null, "'='", "'!='", "'('", "')'", "'['", "']'", "'{'", "'}'", "'*'", 
+		"'+'", "'-'", "','", "'.'", "'..'", "':'", "':='", "';'", "'/'", "'//'", 
+		"'|'", "'<'", "'>'", "'?'", "'@'", "'$'", "'ancestor'", "'ancestor-or-self'", 
+		"'and'", "'as'", "'ascending'", "'at'", "'attribute'", "'base-uri'", "'boundary-space'", 
+		"'by'", "'case'", "'cast'", "'castable'", "'child'", "'collation'", "'comment'", 
+		"'construction'", "'copy-namespaces'", "'declare'", "'default'", "'descendant'", 
+		"'descendant-or-self'", "'descending'", "'div'", "'document'", "'document-node'", 
+		"'element'", "'else'", "'empty'", "'empty-sequence'", "'encoding'", "'eq'", 
+		"'every'", "'except'", "'external'", "'following'", "'following-sibling'", 
+		"'for'", "'function'", "'ge'", "'greatest'", "'gt'", "'idiv'", "'if'", 
+		"'import'", "'in'", "'inherit'", "'instance'", "'intersect'", "'is'", 
+		"'item'", "'lax'", "'le'", "'least'", "'let'", "'lt'", "'mod'", "'module'", 
+		"'namespace'", "'ne'", "'no-inherit'", "'no-preserve'", "'node'", "'of'", 
+		"'option'", "'or'", "'order'", "'ordered'", "'ordering'", "'parent'", 
+		"'preceding'", "'preceding-sibling'", "'preserve'", "'processing-instruction'", 
+		"'return'", "'satisfies'", "'schema'", "'schema-attribute'", "'schema-element'", 
+		"'self'", "'some'", "'stable'", "'strict'", "'strip'", "'text'", "'then'", 
+		"'to'", "'treat'", "'typeswitch'", "'union'", "'unordered'", "'validate'", 
+		"'variable'", "'version'", "'where'", "'xquery'"
+	};
+	private static final String[] _SYMBOLIC_NAMES = {
+		null, "IntegerLiteral", "DecimalLiteral", "DoubleLiteral", "PredefinedEntityRef", 
+		"CharRef", "Quot", "Apos", "COMMENT", "XMLDECL", "PI", "CDATA", "PRAGMA", 
+		"WS", "EQUAL", "NOT_EQUAL", "LPAREN", "RPAREN", "LBRACKET", "RBRACKET", 
+		"LBRACE", "RBRACE", "STAR", "PLUS", "MINUS", "COMMA", "DOT", "DDOT", "COLON", 
+		"COLON_EQ", "SEMICOLON", "SLASH", "DSLASH", "VBAR", "LANGLE", "RANGLE", 
+		"QUESTION", "AT", "DOLLAR", "KW_ANCESTOR", "KW_ANCESTOR_OR_SELF", "KW_AND", 
+		"KW_AS", "KW_ASCENDING", "KW_AT", "KW_ATTRIBUTE", "KW_BASE_URI", "KW_BOUNDARY_SPACE", 
+		"KW_BY", "KW_CASE", "KW_CAST", "KW_CASTABLE", "KW_CHILD", "KW_COLLATION", 
+		"KW_COMMENT", "KW_CONSTRUCTION", "KW_COPY_NS", "KW_DECLARE", "KW_DEFAULT", 
+		"KW_DESCENDANT", "KW_DESCENDANT_OR_SELF", "KW_DESCENDING", "KW_DIV", "KW_DOCUMENT", 
+		"KW_DOCUMENT_NODE", "KW_ELEMENT", "KW_ELSE", "KW_EMPTY", "KW_EMPTY_SEQUENCE", 
+		"KW_ENCODING", "KW_EQ", "KW_EVERY", "KW_EXCEPT", "KW_EXTERNAL", "KW_FOLLOWING", 
+		"KW_FOLLOWING_SIBLING", "KW_FOR", "KW_FUNCTION", "KW_GE", "KW_GREATEST", 
+		"KW_GT", "KW_IDIV", "KW_IF", "KW_IMPORT", "KW_IN", "KW_INHERIT", "KW_INSTANCE", 
+		"KW_INTERSECT", "KW_IS", "KW_ITEM", "KW_LAX", "KW_LE", "KW_LEAST", "KW_LET", 
+		"KW_LT", "KW_MOD", "KW_MODULE", "KW_NAMESPACE", "KW_NE", "KW_NO_INHERIT", 
+		"KW_NO_PRESERVE", "KW_NODE", "KW_OF", "KW_OPTION", "KW_OR", "KW_ORDER", 
+		"KW_ORDERED", "KW_ORDERING", "KW_PARENT", "KW_PRECEDING", "KW_PRECEDING_SIBLING", 
+		"KW_PRESERVE", "KW_PI", "KW_RETURN", "KW_SATISFIES", "KW_SCHEMA", "KW_SCHEMA_ATTR", 
+		"KW_SCHEMA_ELEM", "KW_SELF", "KW_SOME", "KW_STABLE", "KW_STRICT", "KW_STRIP", 
+		"KW_TEXT", "KW_THEN", "KW_TO", "KW_TREAT", "KW_TYPESWITCH", "KW_UNION", 
+		"KW_UNORDERED", "KW_VALIDATE", "KW_VARIABLE", "KW_VERSION", "KW_WHERE", 
+		"KW_XQUERY", "FullQName", "NCNameWithLocalWildcard", "NCNameWithPrefixWildcard", 
+		"NCName", "XQComment", "ContentChar"
+	};
+	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
+	/**
+	 * @deprecated Use {@link #VOCABULARY} instead.
+	 */
+	@Deprecated
+	public static final String[] tokenNames;
+	static {
+		tokenNames = new String[_SYMBOLIC_NAMES.length];
+		for (int i = 0; i < tokenNames.length; i++) {
+			tokenNames[i] = VOCABULARY.getLiteralName(i);
+			if (tokenNames[i] == null) {
+				tokenNames[i] = VOCABULARY.getSymbolicName(i);
+			}
+
+			if (tokenNames[i] == null) {
+				tokenNames[i] = "<INVALID>";
+			}
+		}
+	}
+
 	@Override
-	public String getGrammarFileName() { return "XQueryParser.g4"; }
+	@Deprecated
+	public String[] getTokenNames() {
+		return tokenNames;
+	}
 
 	@Override
-	public String[] getTokenNames() { return tokenNames; }
+	@NotNull
+	public Vocabulary getVocabulary() {
+		return VOCABULARY;
+	}
 
 	@Override
+	public String getGrammarFileName() { return "XQueryParser.g4"; }
+
+	@Override
 	public String[] getRuleNames() { return ruleNames; }
 
 	@Override
 	public String getSerializedATN() { return _serializedATN; }
 
-	@Override
-	public ATN getATN() { return _ATN; }
-
 	public XQueryParser(TokenStream input) {
 		super(input);
-		_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+		_interp = new ParserATNSimulator(this,_ATN);
 	}
 	public static class ModuleContext extends ParserRuleContext {
+		public LibraryModuleContext libraryModule() {
+			return getRuleContext(LibraryModuleContext.class,0);
+		}
 		public MainModuleContext mainModule() {
 			return getRuleContext(MainModuleContext.class,0);
 		}
-		public LibraryModuleContext libraryModule() {
-			return getRuleContext(LibraryModuleContext.class,0);
-		}
 		public VersionDeclContext versionDecl() {
 			return getRuleContext(VersionDeclContext.class,0);
 		}
@@ -152,6 +198,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ModuleContext module() throws RecognitionException {
 		ModuleContext _localctx = new ModuleContext(_ctx, getState());
 		enterRule(_localctx, 0, RULE_module);
@@ -162,7 +209,8 @@
 			switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
 			case 1:
 				{
-				setState(150); versionDecl();
+				setState(150);
+				versionDecl();
 				}
 				break;
 			}
@@ -170,12 +218,14 @@
 			switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
 			case 1:
 				{
-				setState(153); libraryModule();
+				setState(153);
+				libraryModule();
 				}
 				break;
 			case 2:
 				{
-				setState(154); mainModule();
+				setState(154);
+				mainModule();
 				}
 				break;
 			}
@@ -195,12 +245,12 @@
 	public static class VersionDeclContext extends ParserRuleContext {
 		public StringLiteralContext version;
 		public StringLiteralContext encoding;
+		public List<? extends StringLiteralContext> stringLiteral() {
+			return getRuleContexts(StringLiteralContext.class);
+		}
 		public StringLiteralContext stringLiteral(int i) {
 			return getRuleContext(StringLiteralContext.class,i);
 		}
-		public List<StringLiteralContext> stringLiteral() {
-			return getRuleContexts(StringLiteralContext.class);
-		}
 		public VersionDeclContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -215,6 +265,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final VersionDeclContext versionDecl() throws RecognitionException {
 		VersionDeclContext _localctx = new VersionDeclContext(_ctx, getState());
 		enterRule(_localctx, 2, RULE_versionDecl);
@@ -222,19 +273,25 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(157); match(KW_XQUERY);
-			setState(158); match(KW_VERSION);
-			setState(159); ((VersionDeclContext)_localctx).version = stringLiteral();
+			setState(157);
+			match(KW_XQUERY);
+			setState(158);
+			match(KW_VERSION);
+			setState(159);
+			_localctx.version = stringLiteral();
 			setState(162);
 			_la = _input.LA(1);
 			if (_la==KW_ENCODING) {
 				{
-				setState(160); match(KW_ENCODING);
-				setState(161); ((VersionDeclContext)_localctx).encoding = stringLiteral();
+				setState(160);
+				match(KW_ENCODING);
+				setState(161);
+				_localctx.encoding = stringLiteral();
 				}
 			}
 
-			setState(164); match(SEMICOLON);
+			setState(164);
+			match(SEMICOLON);
 			}
 		}
 		catch (RecognitionException re) {
@@ -249,12 +306,12 @@
 	}
 
 	public static class MainModuleContext extends ParserRuleContext {
+		public PrologContext prolog() {
+			return getRuleContext(PrologContext.class,0);
+		}
 		public ExprContext expr() {
 			return getRuleContext(ExprContext.class,0);
 		}
-		public PrologContext prolog() {
-			return getRuleContext(PrologContext.class,0);
-		}
 		public MainModuleContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -269,6 +326,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final MainModuleContext mainModule() throws RecognitionException {
 		MainModuleContext _localctx = new MainModuleContext(_ctx, getState());
 		enterRule(_localctx, 4, RULE_mainModule);
@@ -275,8 +333,10 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(166); prolog();
-			setState(167); expr();
+			setState(166);
+			prolog();
+			setState(167);
+			expr();
 			}
 		}
 		catch (RecognitionException re) {
@@ -291,12 +351,12 @@
 	}
 
 	public static class LibraryModuleContext extends ParserRuleContext {
+		public ModuleDeclContext moduleDecl() {
+			return getRuleContext(ModuleDeclContext.class,0);
+		}
 		public PrologContext prolog() {
 			return getRuleContext(PrologContext.class,0);
 		}
-		public ModuleDeclContext moduleDecl() {
-			return getRuleContext(ModuleDeclContext.class,0);
-		}
 		public LibraryModuleContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -311,6 +371,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final LibraryModuleContext libraryModule() throws RecognitionException {
 		LibraryModuleContext _localctx = new LibraryModuleContext(_ctx, getState());
 		enterRule(_localctx, 6, RULE_libraryModule);
@@ -317,8 +378,10 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(169); moduleDecl();
-			setState(170); prolog();
+			setState(169);
+			moduleDecl();
+			setState(170);
+			prolog();
 			}
 		}
 		catch (RecognitionException re) {
@@ -335,12 +398,12 @@
 	public static class ModuleDeclContext extends ParserRuleContext {
 		public NcNameContext prefix;
 		public StringLiteralContext uri;
+		public NcNameContext ncName() {
+			return getRuleContext(NcNameContext.class,0);
+		}
 		public StringLiteralContext stringLiteral() {
 			return getRuleContext(StringLiteralContext.class,0);
 		}
-		public NcNameContext ncName() {
-			return getRuleContext(NcNameContext.class,0);
-		}
 		public ModuleDeclContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -355,6 +418,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ModuleDeclContext moduleDecl() throws RecognitionException {
 		ModuleDeclContext _localctx = new ModuleDeclContext(_ctx, getState());
 		enterRule(_localctx, 8, RULE_moduleDecl);
@@ -361,12 +425,18 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(172); match(KW_MODULE);
-			setState(173); match(KW_NAMESPACE);
-			setState(174); ((ModuleDeclContext)_localctx).prefix = ncName();
-			setState(175); match(EQUAL);
-			setState(176); ((ModuleDeclContext)_localctx).uri = stringLiteral();
-			setState(177); match(SEMICOLON);
+			setState(172);
+			match(KW_MODULE);
+			setState(173);
+			match(KW_NAMESPACE);
+			setState(174);
+			_localctx.prefix = ncName();
+			setState(175);
+			match(EQUAL);
+			setState(176);
+			_localctx.uri = stringLiteral();
+			setState(177);
+			match(SEMICOLON);
 			}
 		}
 		catch (RecognitionException re) {
@@ -381,54 +451,54 @@
 	}
 
 	public static class PrologContext extends ParserRuleContext {
-		public List<SchemaImportContext> schemaImport() {
-			return getRuleContexts(SchemaImportContext.class);
+		public List<? extends DefaultNamespaceDeclContext> defaultNamespaceDecl() {
+			return getRuleContexts(DefaultNamespaceDeclContext.class);
 		}
+		public DefaultNamespaceDeclContext defaultNamespaceDecl(int i) {
+			return getRuleContext(DefaultNamespaceDeclContext.class,i);
+		}
+		public List<? extends SetterContext> setter() {
+			return getRuleContexts(SetterContext.class);
+		}
+		public SetterContext setter(int i) {
+			return getRuleContext(SetterContext.class,i);
+		}
+		public List<? extends NamespaceDeclContext> namespaceDecl() {
+			return getRuleContexts(NamespaceDeclContext.class);
+		}
 		public NamespaceDeclContext namespaceDecl(int i) {
 			return getRuleContext(NamespaceDeclContext.class,i);
 		}
-		public VarDeclContext varDecl(int i) {
-			return getRuleContext(VarDeclContext.class,i);
+		public List<? extends SchemaImportContext> schemaImport() {
+			return getRuleContexts(SchemaImportContext.class);
 		}
 		public SchemaImportContext schemaImport(int i) {
 			return getRuleContext(SchemaImportContext.class,i);
 		}
-		public SetterContext setter(int i) {
-			return getRuleContext(SetterContext.class,i);
+		public List<? extends ModuleImportContext> moduleImport() {
+			return getRuleContexts(ModuleImportContext.class);
 		}
 		public ModuleImportContext moduleImport(int i) {
 			return getRuleContext(ModuleImportContext.class,i);
 		}
-		public List<DefaultNamespaceDeclContext> defaultNamespaceDecl() {
-			return getRuleContexts(DefaultNamespaceDeclContext.class);
+		public List<? extends VarDeclContext> varDecl() {
+			return getRuleContexts(VarDeclContext.class);
 		}
-		public OptionDeclContext optionDecl(int i) {
-			return getRuleContext(OptionDeclContext.class,i);
+		public VarDeclContext varDecl(int i) {
+			return getRuleContext(VarDeclContext.class,i);
 		}
-		public List<OptionDeclContext> optionDecl() {
-			return getRuleContexts(OptionDeclContext.class);
+		public List<? extends FunctionDeclContext> functionDecl() {
+			return getRuleContexts(FunctionDeclContext.class);
 		}
 		public FunctionDeclContext functionDecl(int i) {
 			return getRuleContext(FunctionDeclContext.class,i);
 		}
-		public List<VarDeclContext> varDecl() {
-			return getRuleContexts(VarDeclContext.class);
+		public List<? extends OptionDeclContext> optionDecl() {
+			return getRuleContexts(OptionDeclContext.class);
 		}
-		public List<NamespaceDeclContext> namespaceDecl() {
-			return getRuleContexts(NamespaceDeclContext.class);
+		public OptionDeclContext optionDecl(int i) {
+			return getRuleContext(OptionDeclContext.class,i);
 		}
-		public List<FunctionDeclContext> functionDecl() {
-			return getRuleContexts(FunctionDeclContext.class);
-		}
-		public DefaultNamespaceDeclContext defaultNamespaceDecl(int i) {
-			return getRuleContext(DefaultNamespaceDeclContext.class,i);
-		}
-		public List<SetterContext> setter() {
-			return getRuleContexts(SetterContext.class);
-		}
-		public List<ModuleImportContext> moduleImport() {
-			return getRuleContexts(ModuleImportContext.class);
-		}
 		public PrologContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -443,6 +513,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final PrologContext prolog() throws RecognitionException {
 		PrologContext _localctx = new PrologContext(_ctx, getState());
 		enterRule(_localctx, 10, RULE_prolog);
@@ -461,31 +532,37 @@
 					switch ( getInterpreter().adaptivePredict(_input,3,_ctx) ) {
 					case 1:
 						{
-						setState(179); defaultNamespaceDecl();
+						setState(179);
+						defaultNamespaceDecl();
 						}
 						break;
 					case 2:
 						{
-						setState(180); setter();
+						setState(180);
+						setter();
 						}
 						break;
 					case 3:
 						{
-						setState(181); namespaceDecl();
+						setState(181);
+						namespaceDecl();
 						}
 						break;
 					case 4:
 						{
-						setState(182); schemaImport();
+						setState(182);
+						schemaImport();
 						}
 						break;
 					case 5:
 						{
-						setState(183); moduleImport();
+						setState(183);
+						moduleImport();
 						}
 						break;
 					}
-					setState(186); match(SEMICOLON);
+					setState(186);
+					match(SEMICOLON);
 					}
 					} 
 				}
@@ -504,21 +581,25 @@
 					switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
 					case 1:
 						{
-						setState(193); varDecl();
+						setState(193);
+						varDecl();
 						}
 						break;
 					case 2:
 						{
-						setState(194); functionDecl();
+						setState(194);
+						functionDecl();
 						}
 						break;
 					case 3:
 						{
-						setState(195); optionDecl();
+						setState(195);
+						optionDecl();
 						}
 						break;
 					}
-					setState(198); match(SEMICOLON);
+					setState(198);
+					match(SEMICOLON);
 					}
 					} 
 				}
@@ -559,6 +640,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final DefaultNamespaceDeclContext defaultNamespaceDecl() throws RecognitionException {
 		DefaultNamespaceDeclContext _localctx = new DefaultNamespaceDeclContext(_ctx, getState());
 		enterRule(_localctx, 12, RULE_defaultNamespaceDecl);
@@ -566,17 +648,22 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(205); match(KW_DECLARE);
-			setState(206); match(KW_DEFAULT);
+			setState(205);
+			match(KW_DECLARE);
+			setState(206);
+			match(KW_DEFAULT);
 			setState(207);
-			((DefaultNamespaceDeclContext)_localctx).type = _input.LT(1);
+			_localctx.type = _input.LT(1);
 			_la = _input.LA(1);
 			if ( !(_la==KW_ELEMENT || _la==KW_FUNCTION) ) {
-				((DefaultNamespaceDeclContext)_localctx).type = (Token)_errHandler.recoverInline(this);
+				_localctx.type = _errHandler.recoverInline(this);
+			} else {
+				consume();
 			}
-			consume();
-			setState(208); match(KW_NAMESPACE);
-			setState(209); ((DefaultNamespaceDeclContext)_localctx).uri = stringLiteral();
+			setState(208);
+			match(KW_NAMESPACE);
+			setState(209);
+			_localctx.uri = stringLiteral();
 			}
 		}
 		catch (RecognitionException re) {
@@ -601,55 +688,65 @@
 			super.copyFrom(ctx);
 		}
 	}
-	public static class OrderingModeDeclContext extends SetterContext {
-		public Token type;
-		public OrderingModeDeclContext(SetterContext ctx) { copyFrom(ctx); }
+	public static class CopyNamespacesDeclContext extends SetterContext {
+		public Token preserve;
+		public Token inherit;
+		public CopyNamespacesDeclContext(SetterContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterOrderingModeDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterCopyNamespacesDecl(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitOrderingModeDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitCopyNamespacesDecl(this);
 		}
 	}
-	public static class ConstructionDeclContext extends SetterContext {
+	public static class BoundaryDeclContext extends SetterContext {
 		public Token type;
-		public ConstructionDeclContext(SetterContext ctx) { copyFrom(ctx); }
+		public BoundaryDeclContext(SetterContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterConstructionDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterBoundaryDecl(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitConstructionDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitBoundaryDecl(this);
 		}
 	}
-	public static class DefaultCollationDeclContext extends SetterContext {
-		public StringLiteralContext stringLiteral() {
-			return getRuleContext(StringLiteralContext.class,0);
+	public static class EmptyOrderDeclContext extends SetterContext {
+		public Token type;
+		public EmptyOrderDeclContext(SetterContext ctx) { copyFrom(ctx); }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterEmptyOrderDecl(this);
 		}
-		public DefaultCollationDeclContext(SetterContext ctx) { copyFrom(ctx); }
 		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitEmptyOrderDecl(this);
+		}
+	}
+	public static class ConstructionDeclContext extends SetterContext {
+		public Token type;
+		public ConstructionDeclContext(SetterContext ctx) { copyFrom(ctx); }
+		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterDefaultCollationDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterConstructionDecl(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitDefaultCollationDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitConstructionDecl(this);
 		}
 	}
-	public static class CopyNamespacesDeclContext extends SetterContext {
-		public Token preserve;
-		public Token inherit;
-		public CopyNamespacesDeclContext(SetterContext ctx) { copyFrom(ctx); }
+	public static class OrderingModeDeclContext extends SetterContext {
+		public Token type;
+		public OrderingModeDeclContext(SetterContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterCopyNamespacesDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterOrderingModeDecl(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitCopyNamespacesDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitOrderingModeDecl(this);
 		}
 	}
 	public static class BaseURIDeclContext extends SetterContext {
@@ -666,31 +763,22 @@
 			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitBaseURIDecl(this);
 		}
 	}
-	public static class BoundaryDeclContext extends SetterContext {
-		public Token type;
-		public BoundaryDeclContext(SetterContext ctx) { copyFrom(ctx); }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterBoundaryDecl(this);
+	public static class DefaultCollationDeclContext extends SetterContext {
+		public StringLiteralContext stringLiteral() {
+			return getRuleContext(StringLiteralContext.class,0);
 		}
+		public DefaultCollationDeclContext(SetterContext ctx) { copyFrom(ctx); }
 		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitBoundaryDecl(this);
-		}
-	}
-	public static class EmptyOrderDeclContext extends SetterContext {
-		public Token type;
-		public EmptyOrderDeclContext(SetterContext ctx) { copyFrom(ctx); }
-		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterEmptyOrderDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterDefaultCollationDecl(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitEmptyOrderDecl(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitDefaultCollationDecl(this);
 		}
 	}
 
+	@RuleVersion(0)
 	public final SetterContext setter() throws RecognitionException {
 		SetterContext _localctx = new SetterContext(_ctx, getState());
 		enterRule(_localctx, 14, RULE_setter);
@@ -702,15 +790,18 @@
 				_localctx = new BoundaryDeclContext(_localctx);
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(211); match(KW_DECLARE);
-				setState(212); match(KW_BOUNDARY_SPACE);
+				setState(211);
+				match(KW_DECLARE);
+				setState(212);
+				match(KW_BOUNDARY_SPACE);
 				setState(213);
 				((BoundaryDeclContext)_localctx).type = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_PRESERVE || _la==KW_STRIP) ) {
-					((BoundaryDeclContext)_localctx).type = (Token)_errHandler.recoverInline(this);
+					((BoundaryDeclContext)_localctx).type = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 				break;
 			case 2:
@@ -717,10 +808,14 @@
 				_localctx = new DefaultCollationDeclContext(_localctx);
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(214); match(KW_DECLARE);
-				setState(215); match(KW_DEFAULT);
-				setState(216); match(KW_COLLATION);
-				setState(217); stringLiteral();
+				setState(214);
+				match(KW_DECLARE);
+				setState(215);
+				match(KW_DEFAULT);
+				setState(216);
+				match(KW_COLLATION);
+				setState(217);
+				stringLiteral();
 				}
 				break;
 			case 3:
@@ -727,9 +822,12 @@
 				_localctx = new BaseURIDeclContext(_localctx);
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(218); match(KW_DECLARE);
-				setState(219); match(KW_BASE_URI);
-				setState(220); stringLiteral();
+				setState(218);
+				match(KW_DECLARE);
+				setState(219);
+				match(KW_BASE_URI);
+				setState(220);
+				stringLiteral();
 				}
 				break;
 			case 4:
@@ -736,15 +834,18 @@
 				_localctx = new ConstructionDeclContext(_localctx);
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(221); match(KW_DECLARE);
-				setState(222); match(KW_CONSTRUCTION);
+				setState(221);
+				match(KW_DECLARE);
+				setState(222);
+				match(KW_CONSTRUCTION);
 				setState(223);
 				((ConstructionDeclContext)_localctx).type = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_PRESERVE || _la==KW_STRIP) ) {
-					((ConstructionDeclContext)_localctx).type = (Token)_errHandler.recoverInline(this);
+					((ConstructionDeclContext)_localctx).type = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 				break;
 			case 5:
@@ -751,15 +852,18 @@
 				_localctx = new OrderingModeDeclContext(_localctx);
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(224); match(KW_DECLARE);
-				setState(225); match(KW_ORDERING);
+				setState(224);
+				match(KW_DECLARE);
+				setState(225);
+				match(KW_ORDERING);
 				setState(226);
 				((OrderingModeDeclContext)_localctx).type = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_ORDERED || _la==KW_UNORDERED) ) {
-					((OrderingModeDeclContext)_localctx).type = (Token)_errHandler.recoverInline(this);
+					((OrderingModeDeclContext)_localctx).type = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 				break;
 			case 6:
@@ -766,17 +870,22 @@
 				_localctx = new EmptyOrderDeclContext(_localctx);
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(227); match(KW_DECLARE);
-				setState(228); match(KW_DEFAULT);
-				setState(229); match(KW_ORDER);
-				setState(230); match(KW_EMPTY);
+				setState(227);
+				match(KW_DECLARE);
+				setState(228);
+				match(KW_DEFAULT);
+				setState(229);
+				match(KW_ORDER);
+				setState(230);
+				match(KW_EMPTY);
 				setState(231);
 				((EmptyOrderDeclContext)_localctx).type = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_GREATEST || _la==KW_LEAST) ) {
-					((EmptyOrderDeclContext)_localctx).type = (Token)_errHandler.recoverInline(this);
+					((EmptyOrderDeclContext)_localctx).type = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 				break;
 			case 7:
@@ -783,23 +892,28 @@
 				_localctx = new CopyNamespacesDeclContext(_localctx);
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(232); match(KW_DECLARE);
-				setState(233); match(KW_COPY_NS);
+				setState(232);
+				match(KW_DECLARE);
+				setState(233);
+				match(KW_COPY_NS);
 				setState(234);
 				((CopyNamespacesDeclContext)_localctx).preserve = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_NO_PRESERVE || _la==KW_PRESERVE) ) {
-					((CopyNamespacesDeclContext)_localctx).preserve = (Token)_errHandler.recoverInline(this);
+					((CopyNamespacesDeclContext)_localctx).preserve = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
-				setState(235); match(COMMA);
+				setState(235);
+				match(COMMA);
 				setState(236);
 				((CopyNamespacesDeclContext)_localctx).inherit = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_INHERIT || _la==KW_NO_INHERIT) ) {
-					((CopyNamespacesDeclContext)_localctx).inherit = (Token)_errHandler.recoverInline(this);
+					((CopyNamespacesDeclContext)_localctx).inherit = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 				break;
 			}
@@ -818,12 +932,12 @@
 	public static class NamespaceDeclContext extends ParserRuleContext {
 		public NcNameContext prefix;
 		public StringLiteralContext uri;
+		public NcNameContext ncName() {
+			return getRuleContext(NcNameContext.class,0);
+		}
 		public StringLiteralContext stringLiteral() {
 			return getRuleContext(StringLiteralContext.class,0);
 		}
-		public NcNameContext ncName() {
-			return getRuleContext(NcNameContext.class,0);
-		}
 		public NamespaceDeclContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -838,6 +952,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final NamespaceDeclContext namespaceDecl() throws RecognitionException {
 		NamespaceDeclContext _localctx = new NamespaceDeclContext(_ctx, getState());
 		enterRule(_localctx, 16, RULE_namespaceDecl);
@@ -844,11 +959,16 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(239); match(KW_DECLARE);
-			setState(240); match(KW_NAMESPACE);
-			setState(241); ((NamespaceDeclContext)_localctx).prefix = ncName();
-			setState(242); match(EQUAL);
-			setState(243); ((NamespaceDeclContext)_localctx).uri = stringLiteral();
+			setState(239);
+			match(KW_DECLARE);
+			setState(240);
+			match(KW_NAMESPACE);
+			setState(241);
+			_localctx.prefix = ncName();
+			setState(242);
+			match(EQUAL);
+			setState(243);
+			_localctx.uri = stringLiteral();
 			}
 		}
 		catch (RecognitionException re) {
@@ -867,12 +987,12 @@
 		public StringLiteralContext nsURI;
 		public StringLiteralContext stringLiteral;
 		public List<StringLiteralContext> locations = new ArrayList<StringLiteralContext>();
+		public List<? extends StringLiteralContext> stringLiteral() {
+			return getRuleContexts(StringLiteralContext.class);
+		}
 		public StringLiteralContext stringLiteral(int i) {
 			return getRuleContext(StringLiteralContext.class,i);
 		}
-		public List<StringLiteralContext> stringLiteral() {
-			return getRuleContexts(StringLiteralContext.class);
-		}
 		public NcNameContext ncName() {
 			return getRuleContext(NcNameContext.class,0);
 		}
@@ -890,6 +1010,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final SchemaImportContext schemaImport() throws RecognitionException {
 		SchemaImportContext _localctx = new SchemaImportContext(_ctx, getState());
 		enterRule(_localctx, 18, RULE_schemaImport);
@@ -897,22 +1018,30 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(245); match(KW_IMPORT);
-			setState(246); match(KW_SCHEMA);
+			setState(245);
+			match(KW_IMPORT);
+			setState(246);
+			match(KW_SCHEMA);
 			setState(254);
 			switch (_input.LA(1)) {
 			case KW_NAMESPACE:
 				{
-				setState(247); match(KW_NAMESPACE);
-				setState(248); ((SchemaImportContext)_localctx).prefix = ncName();
-				setState(249); match(EQUAL);
+				setState(247);
+				match(KW_NAMESPACE);
+				setState(248);
+				_localctx.prefix = ncName();
+				setState(249);
+				match(EQUAL);
 				}
 				break;
 			case KW_DEFAULT:
 				{
-				setState(251); match(KW_DEFAULT);
-				setState(252); match(KW_ELEMENT);
-				setState(253); match(KW_NAMESPACE);
+				setState(251);
+				match(KW_DEFAULT);
+				setState(252);
+				match(KW_ELEMENT);
+				setState(253);
+				match(KW_NAMESPACE);
 				}
 				break;
 			case Quot:
@@ -921,14 +1050,17 @@
 			default:
 				throw new NoViableAltException(this);
 			}
-			setState(256); ((SchemaImportContext)_localctx).nsURI = stringLiteral();
+			setState(256);
+			_localctx.nsURI = stringLiteral();
 			setState(266);
 			_la = _input.LA(1);
 			if (_la==KW_AT) {
 				{
-				setState(257); match(KW_AT);
-				setState(258); ((SchemaImportContext)_localctx).stringLiteral = stringLiteral();
-				((SchemaImportContext)_localctx).locations.add(((SchemaImportContext)_localctx).stringLiteral);
+				setState(257);
+				match(KW_AT);
+				setState(258);
+				_localctx.stringLiteral = stringLiteral();
+				_localctx.locations.add(_localctx.stringLiteral);
 				setState(263);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
@@ -935,9 +1067,11 @@
 				while (_la==COMMA) {
 					{
 					{
-					setState(259); match(COMMA);
-					setState(260); ((SchemaImportContext)_localctx).stringLiteral = stringLiteral();
-					((SchemaImportContext)_localctx).locations.add(((SchemaImportContext)_localctx).stringLiteral);
+					setState(259);
+					match(COMMA);
+					setState(260);
+					_localctx.stringLiteral = stringLiteral();
+					_localctx.locations.add(_localctx.stringLiteral);
 					}
 					}
 					setState(265);
@@ -965,12 +1099,12 @@
 		public StringLiteralContext nsURI;
 		public StringLiteralContext stringLiteral;
 		public List<StringLiteralContext> locations = new ArrayList<StringLiteralContext>();
+		public List<? extends StringLiteralContext> stringLiteral() {
+			return getRuleContexts(StringLiteralContext.class);
+		}
 		public StringLiteralContext stringLiteral(int i) {
 			return getRuleContext(StringLiteralContext.class,i);
 		}
-		public List<StringLiteralContext> stringLiteral() {
-			return getRuleContexts(StringLiteralContext.class);
-		}
 		public NcNameContext ncName() {
 			return getRuleContext(NcNameContext.class,0);
 		}
@@ -988,6 +1122,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ModuleImportContext moduleImport() throws RecognitionException {
 		ModuleImportContext _localctx = new ModuleImportContext(_ctx, getState());
 		enterRule(_localctx, 20, RULE_moduleImport);
@@ -995,26 +1130,34 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(268); match(KW_IMPORT);
-			setState(269); match(KW_MODULE);
+			setState(268);
+			match(KW_IMPORT);
+			setState(269);
+			match(KW_MODULE);
 			setState(274);
 			_la = _input.LA(1);
 			if (_la==KW_NAMESPACE) {
 				{
-				setState(270); match(KW_NAMESPACE);
-				setState(271); ((ModuleImportContext)_localctx).prefix = ncName();
-				setState(272); match(EQUAL);
+				setState(270);
+				match(KW_NAMESPACE);
+				setState(271);
+				_localctx.prefix = ncName();
+				setState(272);
+				match(EQUAL);
 				}
 			}
 
-			setState(276); ((ModuleImportContext)_localctx).nsURI = stringLiteral();
+			setState(276);
+			_localctx.nsURI = stringLiteral();
 			setState(286);
 			_la = _input.LA(1);
 			if (_la==KW_AT) {
 				{
-				setState(277); match(KW_AT);
-				setState(278); ((ModuleImportContext)_localctx).stringLiteral = stringLiteral();
-				((ModuleImportContext)_localctx).locations.add(((ModuleImportContext)_localctx).stringLiteral);
+				setState(277);
+				match(KW_AT);
+				setState(278);
+				_localctx.stringLiteral = stringLiteral();
+				_localctx.locations.add(_localctx.stringLiteral);
 				setState(283);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
@@ -1021,9 +1164,11 @@
 				while (_la==COMMA) {
 					{
 					{
-					setState(279); match(COMMA);
-					setState(280); ((ModuleImportContext)_localctx).stringLiteral = stringLiteral();
-					((ModuleImportContext)_localctx).locations.add(((ModuleImportContext)_localctx).stringLiteral);
+					setState(279);
+					match(COMMA);
+					setState(280);
+					_localctx.stringLiteral = stringLiteral();
+					_localctx.locations.add(_localctx.stringLiteral);
 					}
 					}
 					setState(285);
@@ -1053,12 +1198,12 @@
 		public QNameContext qName() {
 			return getRuleContext(QNameContext.class,0);
 		}
+		public ExprSingleContext exprSingle() {
+			return getRuleContext(ExprSingleContext.class,0);
+		}
 		public TypeDeclarationContext typeDeclaration() {
 			return getRuleContext(TypeDeclarationContext.class,0);
 		}
-		public ExprSingleContext exprSingle() {
-			return getRuleContext(ExprSingleContext.class,0);
-		}
 		public VarDeclContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1073,6 +1218,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final VarDeclContext varDecl() throws RecognitionException {
 		VarDeclContext _localctx = new VarDeclContext(_ctx, getState());
 		enterRule(_localctx, 22, RULE_varDecl);
@@ -1080,15 +1226,20 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(288); match(KW_DECLARE);
-			setState(289); match(KW_VARIABLE);
-			setState(290); match(DOLLAR);
-			setState(291); ((VarDeclContext)_localctx).name = qName();
+			setState(288);
+			match(KW_DECLARE);
+			setState(289);
+			match(KW_VARIABLE);
+			setState(290);
+			match(DOLLAR);
+			setState(291);
+			_localctx.name = qName();
 			setState(293);
 			_la = _input.LA(1);
 			if (_la==KW_AS) {
 				{
-				setState(292); ((VarDeclContext)_localctx).type = typeDeclaration();
+				setState(292);
+				_localctx.type = typeDeclaration();
 				}
 			}
 
@@ -1096,13 +1247,16 @@
 			switch (_input.LA(1)) {
 			case COLON_EQ:
 				{
-				setState(295); match(COLON_EQ);
-				setState(296); ((VarDeclContext)_localctx).value = exprSingle();
+				setState(295);
+				match(COLON_EQ);
+				setState(296);
+				_localctx.value = exprSingle();
 				}
 				break;
 			case KW_EXTERNAL:
 				{
-				setState(297); match(KW_EXTERNAL);
+				setState(297);
+				match(KW_EXTERNAL);
 				}
 				break;
 			default:
@@ -1127,9 +1281,6 @@
 		public List<ParamContext> params = new ArrayList<ParamContext>();
 		public SequenceTypeContext type;
 		public ExprContext body;
-		public SequenceTypeContext sequenceType() {
-			return getRuleContext(SequenceTypeContext.class,0);
-		}
 		public QNameContext qName() {
 			return getRuleContext(QNameContext.class,0);
 		}
@@ -1136,12 +1287,15 @@
 		public ExprContext expr() {
 			return getRuleContext(ExprContext.class,0);
 		}
-		public List<ParamContext> param() {
+		public List<? extends ParamContext> param() {
 			return getRuleContexts(ParamContext.class);
 		}
 		public ParamContext param(int i) {
 			return getRuleContext(ParamContext.class,i);
 		}
+		public SequenceTypeContext sequenceType() {
+			return getRuleContext(SequenceTypeContext.class,0);
+		}
 		public FunctionDeclContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1156,6 +1310,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final FunctionDeclContext functionDecl() throws RecognitionException {
 		FunctionDeclContext _localctx = new FunctionDeclContext(_ctx, getState());
 		enterRule(_localctx, 24, RULE_functionDecl);
@@ -1163,16 +1318,21 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(300); match(KW_DECLARE);
-			setState(301); match(KW_FUNCTION);
-			setState(302); ((FunctionDeclContext)_localctx).name = qName();
-			setState(303); match(LPAREN);
+			setState(300);
+			match(KW_DECLARE);
+			setState(301);
+			match(KW_FUNCTION);
+			setState(302);
+			_localctx.name = qName();
+			setState(303);
+			match(LPAREN);
 			setState(312);
 			_la = _input.LA(1);
 			if (_la==DOLLAR) {
 				{
-				setState(304); ((FunctionDeclContext)_localctx).param = param();
-				((FunctionDeclContext)_localctx).params.add(((FunctionDeclContext)_localctx).param);
+				setState(304);
+				_localctx.param = param();
+				_localctx.params.add(_localctx.param);
 				setState(309);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
@@ -1179,9 +1339,11 @@
 				while (_la==COMMA) {
 					{
 					{
-					setState(305); match(COMMA);
-					setState(306); ((FunctionDeclContext)_localctx).param = param();
-					((FunctionDeclContext)_localctx).params.add(((FunctionDeclContext)_localctx).param);
+					setState(305);
+					match(COMMA);
+					setState(306);
+					_localctx.param = param();
+					_localctx.params.add(_localctx.param);
 					}
 					}
 					setState(311);
@@ -1191,13 +1353,16 @@
 				}
 			}
 
-			setState(314); match(RPAREN);
+			setState(314);
+			match(RPAREN);
 			setState(317);
 			_la = _input.LA(1);
 			if (_la==KW_AS) {
 				{
-				setState(315); match(KW_AS);
-				setState(316); ((FunctionDeclContext)_localctx).type = sequenceType();
+				setState(315);
+				match(KW_AS);
+				setState(316);
+				_localctx.type = sequenceType();
 				}
 			}
 
@@ -1205,14 +1370,18 @@
 			switch (_input.LA(1)) {
 			case LBRACE:
 				{
-				setState(319); match(LBRACE);
-				setState(320); ((FunctionDeclContext)_localctx).body = expr();
-				setState(321); match(RBRACE);
+				setState(319);
+				match(LBRACE);
+				setState(320);
+				_localctx.body = expr();
+				setState(321);
+				match(RBRACE);
 				}
 				break;
 			case KW_EXTERNAL:
 				{
-				setState(323); match(KW_EXTERNAL);
+				setState(323);
+				match(KW_EXTERNAL);
 				}
 				break;
 			default:
@@ -1254,6 +1423,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final OptionDeclContext optionDecl() throws RecognitionException {
 		OptionDeclContext _localctx = new OptionDeclContext(_ctx, getState());
 		enterRule(_localctx, 26, RULE_optionDecl);
@@ -1260,10 +1430,14 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(326); match(KW_DECLARE);
-			setState(327); match(KW_OPTION);
-			setState(328); ((OptionDeclContext)_localctx).name = qName();
-			setState(329); ((OptionDeclContext)_localctx).value = stringLiteral();
+			setState(326);
+			match(KW_DECLARE);
+			setState(327);
+			match(KW_OPTION);
+			setState(328);
+			_localctx.name = qName();
+			setState(329);
+			_localctx.value = stringLiteral();
 			}
 		}
 		catch (RecognitionException re) {
@@ -1300,6 +1474,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ParamContext param() throws RecognitionException {
 		ParamContext _localctx = new ParamContext(_ctx, getState());
 		enterRule(_localctx, 28, RULE_param);
@@ -1307,13 +1482,16 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(331); match(DOLLAR);
-			setState(332); ((ParamContext)_localctx).name = qName();
+			setState(331);
+			match(DOLLAR);
+			setState(332);
+			_localctx.name = qName();
 			setState(334);
 			_la = _input.LA(1);
 			if (_la==KW_AS) {
 				{
-				setState(333); ((ParamContext)_localctx).type = typeDeclaration();
+				setState(333);
+				_localctx.type = typeDeclaration();
 				}
 			}
 
@@ -1331,12 +1509,12 @@
 	}
 
 	public static class ExprContext extends ParserRuleContext {
+		public List<? extends ExprSingleContext> exprSingle() {
+			return getRuleContexts(ExprSingleContext.class);
+		}
 		public ExprSingleContext exprSingle(int i) {
 			return getRuleContext(ExprSingleContext.class,i);
 		}
-		public List<ExprSingleContext> exprSingle() {
-			return getRuleContexts(ExprSingleContext.class);
-		}
 		public ExprContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1351,6 +1529,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ExprContext expr() throws RecognitionException {
 		ExprContext _localctx = new ExprContext(_ctx, getState());
 		enterRule(_localctx, 30, RULE_expr);
@@ -1358,7 +1537,8 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(336); exprSingle();
+			setState(336);
+			exprSingle();
 			setState(341);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
@@ -1365,8 +1545,10 @@
 			while (_la==COMMA) {
 				{
 				{
-				setState(337); match(COMMA);
-				setState(338); exprSingle();
+				setState(337);
+				match(COMMA);
+				setState(338);
+				exprSingle();
 				}
 				}
 				setState(343);
@@ -1387,21 +1569,21 @@
 	}
 
 	public static class ExprSingleContext extends ParserRuleContext {
-		public IfExprContext ifExpr() {
-			return getRuleContext(IfExprContext.class,0);
+		public FlworExprContext flworExpr() {
+			return getRuleContext(FlworExprContext.class,0);
 		}
-		public OrExprContext orExpr() {
-			return getRuleContext(OrExprContext.class,0);
-		}
 		public QuantifiedExprContext quantifiedExpr() {
 			return getRuleContext(QuantifiedExprContext.class,0);
 		}
-		public FlworExprContext flworExpr() {
-			return getRuleContext(FlworExprContext.class,0);
-		}
 		public TypeswitchExprContext typeswitchExpr() {
 			return getRuleContext(TypeswitchExprContext.class,0);
 		}
+		public IfExprContext ifExpr() {
+			return getRuleContext(IfExprContext.class,0);
+		}
+		public OrExprContext orExpr() {
+			return getRuleContext(OrExprContext.class,0);
+		}
 		public ExprSingleContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1416,6 +1598,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ExprSingleContext exprSingle() throws RecognitionException {
 		ExprSingleContext _localctx = new ExprSingleContext(_ctx, getState());
 		enterRule(_localctx, 32, RULE_exprSingle);
@@ -1425,31 +1608,36 @@
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(344); flworExpr();
+				setState(344);
+				flworExpr();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(345); quantifiedExpr();
+				setState(345);
+				quantifiedExpr();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(346); typeswitchExpr();
+				setState(346);
+				typeswitchExpr();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(347); ifExpr();
+				setState(347);
+				ifExpr();
 				}
 				break;
 			case 5:
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(348); orExpr(0);
+				setState(348);
+				orExpr(0);
 				}
 				break;
 			}
@@ -1468,27 +1656,27 @@
 	public static class FlworExprContext extends ParserRuleContext {
 		public ExprSingleContext whereExpr;
 		public ExprSingleContext returnExpr;
-		public OrderByClauseContext orderByClause() {
-			return getRuleContext(OrderByClauseContext.class,0);
+		public List<? extends ExprSingleContext> exprSingle() {
+			return getRuleContexts(ExprSingleContext.class);
 		}
-		public List<ForClauseContext> forClause() {
-			return getRuleContexts(ForClauseContext.class);
-		}
 		public ExprSingleContext exprSingle(int i) {
 			return getRuleContext(ExprSingleContext.class,i);
 		}
-		public List<LetClauseContext> letClause() {
+		public List<? extends ForClauseContext> forClause() {
+			return getRuleContexts(ForClauseContext.class);
+		}
+		public ForClauseContext forClause(int i) {
+			return getRuleContext(ForClauseContext.class,i);
+		}
+		public List<? extends LetClauseContext> letClause() {
 			return getRuleContexts(LetClauseContext.class);
 		}
 		public LetClauseContext letClause(int i) {
 			return getRuleContext(LetClauseContext.class,i);
 		}
-		public List<ExprSingleContext> exprSingle() {
-			return getRuleContexts(ExprSingleContext.class);
+		public OrderByClauseContext orderByClause() {
+			return getRuleContext(OrderByClauseContext.class,0);
 		}
-		public ForClauseContext forClause(int i) {
-			return getRuleContext(ForClauseContext.class,i);
-		}
 		public FlworExprContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1503,6 +1691,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final FlworExprContext flworExpr() throws RecognitionException {
 		FlworExprContext _localctx = new FlworExprContext(_ctx, getState());
 		enterRule(_localctx, 34, RULE_flworExpr);
@@ -1519,12 +1708,14 @@
 				switch (_input.LA(1)) {
 				case KW_FOR:
 					{
-					setState(351); forClause();
+					setState(351);
+					forClause();
 					}
 					break;
 				case KW_LET:
 					{
-					setState(352); letClause();
+					setState(352);
+					letClause();
 					}
 					break;
 				default:
@@ -1539,8 +1730,10 @@
 			_la = _input.LA(1);
 			if (_la==KW_WHERE) {
 				{
-				setState(357); match(KW_WHERE);
-				setState(358); ((FlworExprContext)_localctx).whereExpr = exprSingle();
+				setState(357);
+				match(KW_WHERE);
+				setState(358);
+				_localctx.whereExpr = exprSingle();
 				}
 			}
 
@@ -1548,12 +1741,15 @@
 			_la = _input.LA(1);
 			if (_la==KW_ORDER || _la==KW_STABLE) {
 				{
-				setState(361); orderByClause();
+				setState(361);
+				orderByClause();
 				}
 			}
 
-			setState(364); match(KW_RETURN);
-			setState(365); ((FlworExprContext)_localctx).returnExpr = exprSingle();
+			setState(364);
+			match(KW_RETURN);
+			setState(365);
+			_localctx.returnExpr = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -1570,12 +1766,12 @@
 	public static class ForClauseContext extends ParserRuleContext {
 		public ForVarContext forVar;
 		public List<ForVarContext> vars = new ArrayList<ForVarContext>();
+		public List<? extends ForVarContext> forVar() {
+			return getRuleContexts(ForVarContext.class);
+		}
 		public ForVarContext forVar(int i) {
 			return getRuleContext(ForVarContext.class,i);
 		}
-		public List<ForVarContext> forVar() {
-			return getRuleContexts(ForVarContext.class);
-		}
 		public ForClauseContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1590,6 +1786,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ForClauseContext forClause() throws RecognitionException {
 		ForClauseContext _localctx = new ForClauseContext(_ctx, getState());
 		enterRule(_localctx, 36, RULE_forClause);
@@ -1597,9 +1794,11 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(367); match(KW_FOR);
-			setState(368); ((ForClauseContext)_localctx).forVar = forVar();
-			((ForClauseContext)_localctx).vars.add(((ForClauseContext)_localctx).forVar);
+			setState(367);
+			match(KW_FOR);
+			setState(368);
+			_localctx.forVar = forVar();
+			_localctx.vars.add(_localctx.forVar);
 			setState(373);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
@@ -1606,9 +1805,11 @@
 			while (_la==COMMA) {
 				{
 				{
-				setState(369); match(COMMA);
-				setState(370); ((ForClauseContext)_localctx).forVar = forVar();
-				((ForClauseContext)_localctx).vars.add(((ForClauseContext)_localctx).forVar);
+				setState(369);
+				match(COMMA);
+				setState(370);
+				_localctx.forVar = forVar();
+				_localctx.vars.add(_localctx.forVar);
 				}
 				}
 				setState(375);
@@ -1633,12 +1834,9 @@
 		public TypeDeclarationContext type;
 		public QNameContext pvar;
 		public ExprSingleContext in;
-		public List<QNameContext> qName() {
+		public List<? extends QNameContext> qName() {
 			return getRuleContexts(QNameContext.class);
 		}
-		public TypeDeclarationContext typeDeclaration() {
-			return getRuleContext(TypeDeclarationContext.class,0);
-		}
 		public QNameContext qName(int i) {
 			return getRuleContext(QNameContext.class,i);
 		}
@@ -1645,6 +1843,9 @@
 		public ExprSingleContext exprSingle() {
 			return getRuleContext(ExprSingleContext.class,0);
 		}
+		public TypeDeclarationContext typeDeclaration() {
+			return getRuleContext(TypeDeclarationContext.class,0);
+		}
 		public ForVarContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1659,6 +1860,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final ForVarContext forVar() throws RecognitionException {
 		ForVarContext _localctx = new ForVarContext(_ctx, getState());
 		enterRule(_localctx, 38, RULE_forVar);
@@ -1666,13 +1868,16 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(376); match(DOLLAR);
-			setState(377); ((ForVarContext)_localctx).name = qName();
+			setState(376);
+			match(DOLLAR);
+			setState(377);
+			_localctx.name = qName();
 			setState(379);
 			_la = _input.LA(1);
 			if (_la==KW_AS) {
 				{
-				setState(378); ((ForVarContext)_localctx).type = typeDeclaration();
+				setState(378);
+				_localctx.type = typeDeclaration();
 				}
 			}
 
@@ -1680,14 +1885,19 @@
 			_la = _input.LA(1);
 			if (_la==KW_AT) {
 				{
-				setState(381); match(KW_AT);
-				setState(382); match(DOLLAR);
-				setState(383); ((ForVarContext)_localctx).pvar = qName();
+				setState(381);
+				match(KW_AT);
+				setState(382);
+				match(DOLLAR);
+				setState(383);
+				_localctx.pvar = qName();
 				}
 			}
 
-			setState(386); match(KW_IN);
-			setState(387); ((ForVarContext)_localctx).in = exprSingle();
+			setState(386);
+			match(KW_IN);
+			setState(387);
+			_localctx.in = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -1704,12 +1914,12 @@
 	public static class LetClauseContext extends ParserRuleContext {
 		public LetVarContext letVar;
 		public List<LetVarContext> vars = new ArrayList<LetVarContext>();
+		public List<? extends LetVarContext> letVar() {
+			return getRuleContexts(LetVarContext.class);
+		}
 		public LetVarContext letVar(int i) {
 			return getRuleContext(LetVarContext.class,i);
 		}
-		public List<LetVarContext> letVar() {
-			return getRuleContexts(LetVarContext.class);
-		}
 		public LetClauseContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1724,6 +1934,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final LetClauseContext letClause() throws RecognitionException {
 		LetClauseContext _localctx = new LetClauseContext(_ctx, getState());
 		enterRule(_localctx, 40, RULE_letClause);
@@ -1731,9 +1942,11 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(389); match(KW_LET);
-			setState(390); ((LetClauseContext)_localctx).letVar = letVar();
-			((LetClauseContext)_localctx).vars.add(((LetClauseContext)_localctx).letVar);
+			setState(389);
+			match(KW_LET);
+			setState(390);
+			_localctx.letVar = letVar();
+			_localctx.vars.add(_localctx.letVar);
 			setState(395);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
@@ -1740,9 +1953,11 @@
 			while (_la==COMMA) {
 				{
 				{
-				setState(391); match(COMMA);
-				setState(392); ((LetClauseContext)_localctx).letVar = letVar();
-				((LetClauseContext)_localctx).vars.add(((LetClauseContext)_localctx).letVar);
+				setState(391);
+				match(COMMA);
+				setState(392);
+				_localctx.letVar = letVar();
+				_localctx.vars.add(_localctx.letVar);
 				}
 				}
 				setState(397);
@@ -1769,12 +1984,12 @@
 		public QNameContext qName() {
 			return getRuleContext(QNameContext.class,0);
 		}
+		public ExprSingleContext exprSingle() {
+			return getRuleContext(ExprSingleContext.class,0);
+		}
 		public TypeDeclarationContext typeDeclaration() {
 			return getRuleContext(TypeDeclarationContext.class,0);
 		}
-		public ExprSingleContext exprSingle() {
-			return getRuleContext(ExprSingleContext.class,0);
-		}
 		public LetVarContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1789,6 +2004,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final LetVarContext letVar() throws RecognitionException {
 		LetVarContext _localctx = new LetVarContext(_ctx, getState());
 		enterRule(_localctx, 42, RULE_letVar);
@@ -1796,18 +2012,23 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(398); match(DOLLAR);
-			setState(399); ((LetVarContext)_localctx).name = qName();
+			setState(398);
+			match(DOLLAR);
+			setState(399);
+			_localctx.name = qName();
 			setState(401);
 			_la = _input.LA(1);
 			if (_la==KW_AS) {
 				{
-				setState(400); ((LetVarContext)_localctx).type = typeDeclaration();
+				setState(400);
+				_localctx.type = typeDeclaration();
 				}
 			}
 
-			setState(403); match(COLON_EQ);
-			setState(404); ((LetVarContext)_localctx).value = exprSingle();
+			setState(403);
+			match(COLON_EQ);
+			setState(404);
+			_localctx.value = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -1824,12 +2045,12 @@
 	public static class OrderByClauseContext extends ParserRuleContext {
 		public OrderSpecContext orderSpec;
 		public List<OrderSpecContext> specs = new ArrayList<OrderSpecContext>();
+		public List<? extends OrderSpecContext> orderSpec() {
+			return getRuleContexts(OrderSpecContext.class);
+		}
 		public OrderSpecContext orderSpec(int i) {
 			return getRuleContext(OrderSpecContext.class,i);
 		}
-		public List<OrderSpecContext> orderSpec() {
-			return getRuleContexts(OrderSpecContext.class);
-		}
 		public OrderByClauseContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1844,6 +2065,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final OrderByClauseContext orderByClause() throws RecognitionException {
 		OrderByClauseContext _localctx = new OrderByClauseContext(_ctx, getState());
 		enterRule(_localctx, 44, RULE_orderByClause);
@@ -1855,14 +2077,18 @@
 			_la = _input.LA(1);
 			if (_la==KW_STABLE) {
 				{
-				setState(406); match(KW_STABLE);
+				setState(406);
+				match(KW_STABLE);
 				}
 			}
 
-			setState(409); match(KW_ORDER);
-			setState(410); match(KW_BY);
-			setState(411); ((OrderByClauseContext)_localctx).orderSpec = orderSpec();
-			((OrderByClauseContext)_localctx).specs.add(((OrderByClauseContext)_localctx).orderSpec);
+			setState(409);
+			match(KW_ORDER);
+			setState(410);
+			match(KW_BY);
+			setState(411);
+			_localctx.orderSpec = orderSpec();
+			_localctx.specs.add(_localctx.orderSpec);
 			setState(416);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
@@ -1869,9 +2095,11 @@
 			while (_la==COMMA) {
 				{
 				{
-				setState(412); match(COMMA);
-				setState(413); ((OrderByClauseContext)_localctx).orderSpec = orderSpec();
-				((OrderByClauseContext)_localctx).specs.add(((OrderByClauseContext)_localctx).orderSpec);
+				setState(412);
+				match(COMMA);
+				setState(413);
+				_localctx.orderSpec = orderSpec();
+				_localctx.specs.add(_localctx.orderSpec);
 				}
 				}
 				setState(418);
@@ -1896,12 +2124,12 @@
 		public Token order;
 		public Token empty;
 		public StringLiteralContext collation;
+		public ExprSingleContext exprSingle() {
+			return getRuleContext(ExprSingleContext.class,0);
+		}
 		public StringLiteralContext stringLiteral() {
 			return getRuleContext(StringLiteralContext.class,0);
 		}
-		public ExprSingleContext exprSingle() {
-			return getRuleContext(ExprSingleContext.class,0);
-		}
 		public OrderSpecContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1916,6 +2144,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final OrderSpecContext orderSpec() throws RecognitionException {
 		OrderSpecContext _localctx = new OrderSpecContext(_ctx, getState());
 		enterRule(_localctx, 46, RULE_orderSpec);
@@ -1923,18 +2152,20 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(419); ((OrderSpecContext)_localctx).value = exprSingle();
+			setState(419);
+			_localctx.value = exprSingle();
 			setState(421);
 			_la = _input.LA(1);
 			if (_la==KW_ASCENDING || _la==KW_DESCENDING) {
 				{
 				setState(420);
-				((OrderSpecContext)_localctx).order = _input.LT(1);
+				_localctx.order = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_ASCENDING || _la==KW_DESCENDING) ) {
-					((OrderSpecContext)_localctx).order = (Token)_errHandler.recoverInline(this);
+					_localctx.order = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 			}
 
@@ -1942,14 +2173,16 @@
 			_la = _input.LA(1);
 			if (_la==KW_EMPTY) {
 				{
-				setState(423); match(KW_EMPTY);
+				setState(423);
+				match(KW_EMPTY);
 				setState(424);
-				((OrderSpecContext)_localctx).empty = _input.LT(1);
+				_localctx.empty = _input.LT(1);
 				_la = _input.LA(1);
 				if ( !(_la==KW_GREATEST || _la==KW_LEAST) ) {
-					((OrderSpecContext)_localctx).empty = (Token)_errHandler.recoverInline(this);
+					_localctx.empty = _errHandler.recoverInline(this);
+				} else {
+					consume();
 				}
-				consume();
 				}
 			}
 
@@ -1957,8 +2190,10 @@
 			_la = _input.LA(1);
 			if (_la==KW_COLLATION) {
 				{
-				setState(427); match(KW_COLLATION);
-				setState(428); ((OrderSpecContext)_localctx).collation = stringLiteral();
+				setState(427);
+				match(KW_COLLATION);
+				setState(428);
+				_localctx.collation = stringLiteral();
 				}
 			}
 
@@ -1980,12 +2215,12 @@
 		public QuantifiedVarContext quantifiedVar;
 		public List<QuantifiedVarContext> vars = new ArrayList<QuantifiedVarContext>();
 		public ExprSingleContext value;
+		public List<? extends QuantifiedVarContext> quantifiedVar() {
+			return getRuleContexts(QuantifiedVarContext.class);
+		}
 		public QuantifiedVarContext quantifiedVar(int i) {
 			return getRuleContext(QuantifiedVarContext.class,i);
 		}
-		public List<QuantifiedVarContext> quantifiedVar() {
-			return getRuleContexts(QuantifiedVarContext.class);
-		}
 		public ExprSingleContext exprSingle() {
 			return getRuleContext(ExprSingleContext.class,0);
 		}
@@ -2003,6 +2238,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final QuantifiedExprContext quantifiedExpr() throws RecognitionException {
 		QuantifiedExprContext _localctx = new QuantifiedExprContext(_ctx, getState());
 		enterRule(_localctx, 48, RULE_quantifiedExpr);
@@ -2011,14 +2247,16 @@
 			enterOuterAlt(_localctx, 1);
 			{
 			setState(431);
-			((QuantifiedExprContext)_localctx).quantifier = _input.LT(1);
+			_localctx.quantifier = _input.LT(1);
 			_la = _input.LA(1);
 			if ( !(_la==KW_EVERY || _la==KW_SOME) ) {
-				((QuantifiedExprContext)_localctx).quantifier = (Token)_errHandler.recoverInline(this);
+				_localctx.quantifier = _errHandler.recoverInline(this);
+			} else {
+				consume();
 			}
-			consume();
-			setState(432); ((QuantifiedExprContext)_localctx).quantifiedVar = quantifiedVar();
-			((QuantifiedExprContext)_localctx).vars.add(((QuantifiedExprContext)_localctx).quantifiedVar);
+			setState(432);
+			_localctx.quantifiedVar = quantifiedVar();
+			_localctx.vars.add(_localctx.quantifiedVar);
 			setState(437);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
@@ -2025,9 +2263,11 @@
 			while (_la==COMMA) {
 				{
 				{
-				setState(433); match(COMMA);
-				setState(434); ((QuantifiedExprContext)_localctx).quantifiedVar = quantifiedVar();
-				((QuantifiedExprContext)_localctx).vars.add(((QuantifiedExprContext)_localctx).quantifiedVar);
+				setState(433);
+				match(COMMA);
+				setState(434);
+				_localctx.quantifiedVar = quantifiedVar();
+				_localctx.vars.add(_localctx.quantifiedVar);
 				}
 				}
 				setState(439);
@@ -2034,8 +2274,10 @@
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(440); match(KW_SATISFIES);
-			setState(441); ((QuantifiedExprContext)_localctx).value = exprSingle();
+			setState(440);
+			match(KW_SATISFIES);
+			setState(441);
+			_localctx.value = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -2052,6 +2294,9 @@
 	public static class QuantifiedVarContext extends ParserRuleContext {
 		public QNameContext name;
 		public TypeDeclarationContext type;
+		public ExprSingleContext exprSingle() {
+			return getRuleContext(ExprSingleContext.class,0);
+		}
 		public QNameContext qName() {
 			return getRuleContext(QNameContext.class,0);
 		}
@@ -2058,9 +2303,6 @@
 		public TypeDeclarationContext typeDeclaration() {
 			return getRuleContext(TypeDeclarationContext.class,0);
 		}
-		public ExprSingleContext exprSingle() {
-			return getRuleContext(ExprSingleContext.class,0);
-		}
 		public QuantifiedVarContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -2075,6 +2317,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final QuantifiedVarContext quantifiedVar() throws RecognitionException {
 		QuantifiedVarContext _localctx = new QuantifiedVarContext(_ctx, getState());
 		enterRule(_localctx, 50, RULE_quantifiedVar);
@@ -2082,18 +2325,23 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(443); match(DOLLAR);
-			setState(444); ((QuantifiedVarContext)_localctx).name = qName();
+			setState(443);
+			match(DOLLAR);
+			setState(444);
+			_localctx.name = qName();
 			setState(446);
 			_la = _input.LA(1);
 			if (_la==KW_AS) {
 				{
-				setState(445); ((QuantifiedVarContext)_localctx).type = typeDeclaration();
+				setState(445);
+				_localctx.type = typeDeclaration();
 				}
 			}
 
-			setState(448); match(KW_IN);
-			setState(449); exprSingle();
+			setState(448);
+			match(KW_IN);
+			setState(449);
+			exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -2112,20 +2360,20 @@
 		public CaseClauseContext clauses;
 		public QNameContext var;
 		public ExprSingleContext returnExpr;
-		public QNameContext qName() {
-			return getRuleContext(QNameContext.class,0);
+		public ExprContext expr() {
+			return getRuleContext(ExprContext.class,0);
 		}
-		public List<CaseClauseContext> caseClause() {
+		public ExprSingleContext exprSingle() {
+			return getRuleContext(ExprSingleContext.class,0);
+		}
+		public List<? extends CaseClauseContext> caseClause() {
 			return getRuleContexts(CaseClauseContext.class);
 		}
-		public ExprContext expr() {
-			return getRuleContext(ExprContext.class,0);
-		}
 		public CaseClauseContext caseClause(int i) {
 			return getRuleContext(CaseClauseContext.class,i);
 		}
-		public ExprSingleContext exprSingle() {
-			return getRuleContext(ExprSingleContext.class,0);
+		public QNameContext qName() {
+			return getRuleContext(QNameContext.class,0);
 		}
 		public TypeswitchExprContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
@@ -2141,6 +2389,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final TypeswitchExprContext typeswitchExpr() throws RecognitionException {
 		TypeswitchExprContext _localctx = new TypeswitchExprContext(_ctx, getState());
 		enterRule(_localctx, 52, RULE_typeswitchExpr);
@@ -2148,10 +2397,14 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(451); match(KW_TYPESWITCH);
-			setState(452); match(LPAREN);
-			setState(453); ((TypeswitchExprContext)_localctx).switchExpr = expr();
-			setState(454); match(RPAREN);
+			setState(451);
+			match(KW_TYPESWITCH);
+			setState(452);
+			match(LPAREN);
+			setState(453);
+			_localctx.switchExpr = expr();
+			setState(454);
+			match(RPAREN);
 			setState(456); 
 			_errHandler.sync(this);
 			_la = _input.LA(1);
@@ -2158,7 +2411,8 @@
 			do {
 				{
 				{
-				setState(455); ((TypeswitchExprContext)_localctx).clauses = caseClause();
+				setState(455);
+				_localctx.clauses = caseClause();
 				}
 				}
 				setState(458); 
@@ -2165,18 +2419,23 @@
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			} while ( _la==KW_CASE );
-			setState(460); match(KW_DEFAULT);
+			setState(460);
+			match(KW_DEFAULT);
 			setState(463);
 			_la = _input.LA(1);
 			if (_la==DOLLAR) {
 				{
-				setState(461); match(DOLLAR);
-				setState(462); ((TypeswitchExprContext)_localctx).var = qName();
+				setState(461);
+				match(DOLLAR);
+				setState(462);
+				_localctx.var = qName();
 				}
 			}
 
-			setState(465); match(KW_RETURN);
-			setState(466); ((TypeswitchExprContext)_localctx).returnExpr = exprSingle();
+			setState(465);
+			match(KW_RETURN);
+			setState(466);
+			_localctx.returnExpr = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -2194,9 +2453,6 @@
 		public QNameContext var;
 		public SequenceTypeContext type;
 		public ExprSingleContext returnExpr;
-		public QNameContext qName() {
-			return getRuleContext(QNameContext.class,0);
-		}
 		public SequenceTypeContext sequenceType() {
 			return getRuleContext(SequenceTypeContext.class,0);
 		}
@@ -2203,6 +2459,9 @@
 		public ExprSingleContext exprSingle() {
 			return getRuleContext(ExprSingleContext.class,0);
 		}
+		public QNameContext qName() {
+			return getRuleContext(QNameContext.class,0);
+		}
 		public CaseClauseContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -2217,6 +2476,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final CaseClauseContext caseClause() throws RecognitionException {
 		CaseClauseContext _localctx = new CaseClauseContext(_ctx, getState());
 		enterRule(_localctx, 54, RULE_caseClause);
@@ -2224,20 +2484,27 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(468); match(KW_CASE);
+			setState(468);
+			match(KW_CASE);
 			setState(473);
 			_la = _input.LA(1);
 			if (_la==DOLLAR) {
 				{
-				setState(469); match(DOLLAR);
-				setState(470); ((CaseClauseContext)_localctx).var = qName();
-				setState(471); match(KW_AS);
+				setState(469);
+				match(DOLLAR);
+				setState(470);
+				_localctx.var = qName();
+				setState(471);
+				match(KW_AS);
 				}
 			}
 
-			setState(475); ((CaseClauseContext)_localctx).type = sequenceType();
-			setState(476); match(KW_RETURN);
-			setState(477); ((CaseClauseContext)_localctx).returnExpr = exprSingle();
+			setState(475);
+			_localctx.type = sequenceType();
+			setState(476);
+			match(KW_RETURN);
+			setState(477);
+			_localctx.returnExpr = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -2255,15 +2522,15 @@
 		public ExprContext conditionExpr;
 		public ExprSingleContext thenExpr;
 		public ExprSingleContext elseExpr;
-		public ExprSingleContext exprSingle(int i) {
-			return getRuleContext(ExprSingleContext.class,i);
-		}
 		public ExprContext expr() {
 			return getRuleContext(ExprContext.class,0);
 		}
-		public List<ExprSingleContext> exprSingle() {
+		public List<? extends ExprSingleContext> exprSingle() {
 			return getRuleContexts(ExprSingleContext.class);
 		}
+		public ExprSingleContext exprSingle(int i) {
+			return getRuleContext(ExprSingleContext.class,i);
+		}
 		public IfExprContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -2278,6 +2545,7 @@
 		}
 	}
 
+	@RuleVersion(0)
 	public final IfExprContext ifExpr() throws RecognitionException {
 		IfExprContext _localctx = new IfExprContext(_ctx, getState());
 		enterRule(_localctx, 56, RULE_ifExpr);
@@ -2284,14 +2552,22 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(479); match(KW_IF);
-			setState(480); match(LPAREN);
-			setState(481); ((IfExprContext)_localctx).conditionExpr = expr();
-			setState(482); match(RPAREN);
-			setState(483); match(KW_THEN);
-			setState(484); ((IfExprContext)_localctx).thenExpr = exprSingle();
-			setState(485); match(KW_ELSE);
-			setState(486); ((IfExprContext)_localctx).elseExpr = exprSingle();
+			setState(479);
+			match(KW_IF);
+			setState(480);
+			match(LPAREN);
+			setState(481);
+			_localctx.conditionExpr = expr();
+			setState(482);
+			match(RPAREN);
+			setState(483);
+			match(KW_THEN);
+			setState(484);
+			_localctx.thenExpr = exprSingle();
+			setState(485);
+			match(KW_ELSE);
+			setState(486);
+			_localctx.elseExpr = exprSingle();
 			}
 		}
 		catch (RecognitionException re) {
@@ -2316,38 +2592,62 @@
 			super.copyFrom(ctx);
 		}
 	}
-	public static class CastableContext extends OrExprContext {
+	public static class AddContext extends OrExprContext {
 		public OrExprContext l;
 		public Token op;
-		public SingleTypeContext r;
+		public OrExprContext r;
+		public List<? extends OrExprContext> orExpr() {
+			return getRuleContexts(OrExprContext.class);
+		}
+		public OrExprContext orExpr(int i) {
+			return getRuleContext(OrExprContext.class,i);
+		}
+		public AddContext(OrExprContext ctx) { copyFrom(ctx); }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterAdd(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitAdd(this);
+		}
+	}
+	public static class TreatContext extends OrExprContext {
+		public OrExprContext l;
+		public Token op;
+		public SequenceTypeContext r;
 		public OrExprContext orExpr() {
 			return getRuleContext(OrExprContext.class,0);
 		}
-		public SingleTypeContext singleType() {
-			return getRuleContext(SingleTypeContext.class,0);
+		public SequenceTypeContext sequenceType() {
+			return getRuleContext(SequenceTypeContext.class,0);
 		}
-		public CastableContext(OrExprContext ctx) { copyFrom(ctx); }
+		public TreatContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterCastable(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterTreat(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitCastable(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitTreat(this);
 		}
 	}
-	public static class RootedPathContext extends OrExprContext {
-		public RelativePathExprContext relativePathExpr() {
-			return getRuleContext(RelativePathExprContext.class,0);
+	public static class ExtensionContext extends OrExprContext {
+		public List<? extends TerminalNode> PRAGMA() { return getTokens(XQueryParser.PRAGMA); }
+		public TerminalNode PRAGMA(int i) {
+			return getToken(XQueryParser.PRAGMA, i);
 		}
-		public RootedPathContext(OrExprContext ctx) { copyFrom(ctx); }
+		public ExprContext expr() {
+			return getRuleContext(ExprContext.class,0);
+		}
+		public ExtensionContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterRootedPath(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterExtension(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitRootedPath(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitExtension(this);
 		}
 	}
 	public static class MultContext extends OrExprContext {
@@ -2354,7 +2654,7 @@
 		public OrExprContext l;
 		public Token op;
 		public OrExprContext r;
-		public List<OrExprContext> orExpr() {
+		public List<? extends OrExprContext> orExpr() {
 			return getRuleContexts(OrExprContext.class);
 		}
 		public OrExprContext orExpr(int i) {
@@ -2370,24 +2670,23 @@
 			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitMult(this);
 		}
 	}
-	public static class RangeContext extends OrExprContext {
+	public static class ComparisonContext extends OrExprContext {
 		public OrExprContext l;
-		public Token op;
 		public OrExprContext r;
-		public List<OrExprContext> orExpr() {
+		public List<? extends OrExprContext> orExpr() {
 			return getRuleContexts(OrExprContext.class);
 		}
 		public OrExprContext orExpr(int i) {
 			return getRuleContext(OrExprContext.class,i);
 		}
-		public RangeContext(OrExprContext ctx) { copyFrom(ctx); }
+		public ComparisonContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterRange(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterComparison(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitRange(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitComparison(this);
 		}
 	}
 	public static class OrContext extends OrExprContext {
@@ -2394,7 +2693,7 @@
 		public OrExprContext l;
 		public Token op;
 		public OrExprContext r;
-		public List<OrExprContext> orExpr() {
+		public List<? extends OrExprContext> orExpr() {
 			return getRuleContexts(OrExprContext.class);
 		}
 		public OrExprContext orExpr(int i) {
@@ -2410,144 +2709,147 @@
 			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitOr(this);
 		}
 	}
-	public static class InstanceOfContext extends OrExprContext {
+	public static class IntersectContext extends OrExprContext {
 		public OrExprContext l;
 		public Token op;
-		public SequenceTypeContext r;
-		public SequenceTypeContext sequenceType() {
-			return getRuleContext(SequenceTypeContext.class,0);
+		public OrExprContext r;
+		public List<? extends OrExprContext> orExpr() {
+			return getRuleContexts(OrExprContext.class);
 		}
+		public OrExprContext orExpr(int i) {
+			return getRuleContext(OrExprContext.class,i);
+		}
+		public IntersectContext(OrExprContext ctx) { copyFrom(ctx); }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterIntersect(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitIntersect(this);
+		}
+	}
+	public static class CastableContext extends OrExprContext {
+		public OrExprContext l;
+		public Token op;
+		public SingleTypeContext r;
 		public OrExprContext orExpr() {
 			return getRuleContext(OrExprContext.class,0);
 		}
-		public InstanceOfContext(OrExprContext ctx) { copyFrom(ctx); }
+		public SingleTypeContext singleType() {
+			return getRuleContext(SingleTypeContext.class,0);
+		}
+		public CastableContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterInstanceOf(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterCastable(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitInstanceOf(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitCastable(this);
 		}
 	}
-	public static class AddContext extends OrExprContext {
+	public static class RangeContext extends OrExprContext {
 		public OrExprContext l;
 		public Token op;
 		public OrExprContext r;
-		public List<OrExprContext> orExpr() {
+		public List<? extends OrExprContext> orExpr() {
 			return getRuleContexts(OrExprContext.class);
 		}
 		public OrExprContext orExpr(int i) {
 			return getRuleContext(OrExprContext.class,i);
 		}
-		public AddContext(OrExprContext ctx) { copyFrom(ctx); }
+		public RangeContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterAdd(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterRange(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitAdd(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitRange(this);
 		}
 	}
-	public static class RelativeContext extends OrExprContext {
+	public static class AllDescPathContext extends OrExprContext {
 		public RelativePathExprContext relativePathExpr() {
 			return getRuleContext(RelativePathExprContext.class,0);
 		}
-		public RelativeContext(OrExprContext ctx) { copyFrom(ctx); }
+		public AllDescPathContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterRelative(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterAllDescPath(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitRelative(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitAllDescPath(this);
 		}
 	}
-	public static class ValidateContext extends OrExprContext {
-		public Token vMode;
-		public ExprContext expr() {
-			return getRuleContext(ExprContext.class,0);
+	public static class UnaryContext extends OrExprContext {
+		public OrExprContext orExpr() {
+			return getRuleContext(OrExprContext.class,0);
 		}
-		public ValidateContext(OrExprContext ctx) { copyFrom(ctx); }
+		public UnaryContext(OrExprContext ctx) { copyFrom(ctx); }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterValidate(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).enterUnary(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitValidate(this);
+			if ( listener instanceof XQueryParserListener ) ((XQueryParserListener)listener).exitUnary(this);
 		}
 	}
-	public static class ComparisonContext extends OrExprContext {
+	public static class UnionContext extends OrExprContext {
 		public OrExprContext l;
+		public Token op;
 		public OrExprContext r;
-		public List<OrExprContext> orExpr() {
+		public List<? extends OrExprContext> orExpr() {
 			return getRuleContexts(OrExprContext.class);
 		}
 		public OrExprContext orExpr(int i) {
 			return getRuleContext(OrExprContext.class,i);
 		}
-		public ComparisonContext(OrExprContext ctx) { copyFrom(ctx); }
+		public TerminalNode KW_UNION() { return getToken(XQueryParser.KW_UNION, 0); }

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] [jEdit-daily] jEdit_trunk - Build # 289 - Successful!

[<jedit_daily@te...>]

jEdit_trunk - Build # 289 - Successful:

Changes for Build #289
[daleanson] Fix for bug #4038, print range not displayed correctly in print preview.

[daleanson] Fixed margins, pass correct attributes.




Artifacts can be downloaded here:
http://www.tellurianring.com/projects/jedit-daily/index.php?dir=jEdit%2F289

[ jEdit-commits ] SF.net SVN: jedit:[24693] jEdit/trunk/org/gjt/sp/jedit/print/ PrintPreview.java

[<daleanson@us...>]

Revision: 24693
          http://sourceforge.net/p/jedit/svn/24693
Author:   daleanson
Date:     2017-06-03 18:59:11 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
Fix for bug #4038, print range not displayed correctly in print preview.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java	2017-06-03 17:49:25 UTC (rev 24692)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrintPreview.java	2017-06-03 18:59:11 UTC (rev 24693)
@@ -385,7 +385,7 @@
 		for ( Integer i : pageRanges.keySet() )
 		{
 			pagesModel.addElement( i );
-			// Log.log(Log.DEBUG, this, "init, i = " + i + ", range = " + pageRanges.get(i));
+			//Log.log(Log.DEBUG, this, "init, i = " + i + ", range = " + pageRanges.get(i));
 		}
 		pages.setModel( pagesModel );
 		pages.setSelectedIndex( 0 );
@@ -394,10 +394,11 @@
 		prevPage.setEnabled( pagesModel.getSize() > 1 );
 
 		model = new PrintPreviewModel( view, buffer, printService, attributes, pageRanges );
-		model.setPageNumber( 0 );
+		int firstPage = ( Integer )pages.getSelectedItem();
+		model.setPageNumber( firstPage - 1 );
 		model.setPageRanges( pageRanges );
 		model.setZoomLevel( zoomLevel );
-		attributes.add( new PageRanges( 1 ) );
+		attributes.add( new PageRanges( firstPage ) );
 		printPreviewPane.setModel( model );
 	}
 

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

[ jEdit-commits ] SF.net SVN: jedit:[24692] jEdit/trunk/org/gjt/sp/jedit/print

[<daleanson@us...>]

Revision: 24692
          http://sourceforge.net/p/jedit/svn/24692
Author:   daleanson
Date:     2017-06-03 17:49:25 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
Fixed margins, pass correct attributes.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/BasicPrintPreviewPaneUI.java
    jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BasicPrintPreviewPaneUI.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BasicPrintPreviewPaneUI.java	2017-06-01 19:52:21 UTC (rev 24691)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BasicPrintPreviewPaneUI.java	2017-06-03 17:49:25 UTC (rev 24692)
@@ -283,6 +283,7 @@
 
 			scrollPane.revalidate();
 			printPreviewPane.revalidate();
+			printPreviewPane.repaint();
 		}
 
 

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2017-06-01 19:52:21 UTC (rev 24691)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2017-06-03 17:49:25 UTC (rev 24692)
@@ -419,7 +419,12 @@
 			gfx.setRenderingHint(KEY_TEXT_ANTIALIASING, view.getTextArea().getPainter().getAntiAlias().renderHint());
 			boolean useFractionalFontMetrics = jEdit.getBooleanProperty("view.fracFontMetrics");
 			gfx.setRenderingHint(KEY_FRACTIONALMETRICS, (useFractionalFontMetrics ? VALUE_FRACTIONALMETRICS_ON : VALUE_FRACTIONALMETRICS_OFF));
-			gfx.setTransform(new AffineTransform(1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f));
+			
+			// TODO: why did I need this next line? Leaving it in causes the print preview 
+			// to show the page with the wrong top and bottom margins, leaving it out doesn't seem
+			// to cause any problems
+			//gfx.setTransform(new AffineTransform(1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f));
+			
 			for(int i = 0; i < styles.length; i++)
 			{
 				SyntaxStyle s = styles[i];

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-01 19:52:21 UTC (rev 24691)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-03 17:49:25 UTC (rev 24692)
@@ -273,7 +273,7 @@
                     AttributeSet panelAttributes = panel.getAttributes();
                     if (panelAttributes != null)
                     {
-                        PrinterDialog.this.attributes.addAll( attributes );
+                        PrinterDialog.this.attributes.addAll( panelAttributes );
                     }
                 }
 

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