[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[24573] jEdit/trunk/org/gjt/sp/jedit/print
From:       daleanson () users ! sourceforge ! net
Date:       2016-11-27 1:40:32
Message-ID: E1cAoSK-00047X-06 () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 24573
          http://sourceforge.net/p/jedit/svn/24573
Author:   daleanson
Date:     2016-11-27 01:40:32 +0000 (Sun, 27 Nov 2016)
Log Message:
-----------
Adjustments for showing page breaks.

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

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2016-11-26 23:19:51 \
                UTC (rev 24572)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrintable1_7.java	2016-11-27 01:40:32 \
UTC (rev 24573) @@ -345,7 +345,7 @@
 				// last page
 				Range range = new Range(startLine, currentPhysicalLine);
 				pages.put(new Integer(pageCount), range);
-				//Log.log(Log.DEBUG, this, "calculatePages, page " + pageCount + " has " + \
range); +				Log.log(Log.DEBUG, this, "calculatePages, page " + pageCount + " has " + \
range);  break;
 			}
 			
@@ -366,7 +366,7 @@
 			{
 				Range range = new Range(startLine, Math.max(0, currentPhysicalLine - 1));
 				pages.put(new Integer(pageCount), range);
-				//Log.log(Log.DEBUG, this, "calculatePages, page " + pageCount + " has " + \
range); +				Log.log(Log.DEBUG, this, "calculatePages, page " + pageCount + " has " + \
range);  ++ pageCount;
 				startLine = currentPhysicalLine;
 				y = 0.0;

Modified: jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2016-11-26 23:19:51 UTC \
                (rev 24572)
+++ jEdit/trunk/org/gjt/sp/jedit/print/BufferPrinter1_7.java	2016-11-27 01:40:32 UTC \
(rev 24573) @@ -282,6 +282,9 @@
 		{
 			HashMap<Integer, Range> pageLineRanges = printable.calculatePages( graphics, \
pageFormat );  PageRanges pr = (PageRanges)attributes.get(PageRanges.class);
+			if (pr == null) {
+				pr = new PageRanges( 1, 1000 );
+			}
 			HashMap<Integer, Range> newLineRanges = new HashMap<Integer, Range>();
 			for (Integer i : pageLineRanges.keySet())
 			{
@@ -290,7 +293,8 @@
 					newLineRanges.put(i, pageLineRanges.get(i));	
 				}
 			}
-			return newLineRanges;
+			//return newLineRanges;
+			return pageLineRanges;
 		}
 		catch(Exception e) 
 		{

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java	2016-11-26 23:19:51 \
                UTC (rev 24572)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PageBreakExtension.java	2016-11-27 01:40:32 \
UTC (rev 24573) @@ -55,19 +55,21 @@
     public PageBreakExtension( JEditTextArea textArea ) {
         this.textArea = textArea;
         textArea.getPainter().addExtension( TextAreaPainter.WRAP_GUIDE_LAYER, this \
                );
-        showPageBreak = jEdit.getBooleanProperty( "view.pageBreaks" );
+        showPageBreak = jEdit.getBooleanProperty( "view.pageBreaks", false );
         pageBreakColor = jEdit.getColorProperty( "view.pageBreaksColor" );
         EditBus.addToBus( this );
     }
 
 
-    private HashMap<Integer, Range> getPageRanges() {
+    private void loadPageRanges() {
         if ( showPageBreak ) {
             View view = textArea.getView();
             Buffer buffer = ( Buffer )textArea.getBuffer();
-            return BufferPrinter1_7.getPageRanges( view, buffer, null );
+            pages = BufferPrinter1_7.getPageRanges( view, buffer, null );
         }
-        return null;
+        else {
+            pages = null;
+        }
     }
 
 
@@ -75,9 +77,7 @@
         if ( msg instanceof PropertiesChanged ) {
             showPageBreak = jEdit.getBooleanProperty( "view.pageBreaks" );
             pageBreakColor = jEdit.getColorProperty( "view.pageBreaksColor" );
-            if ( showPageBreak ) {
-                pages = getPageRanges();
-            }
+            loadPageRanges();
         }
         else if ( msg instanceof EditPaneUpdate ) {
             EditPaneUpdate epu = ( EditPaneUpdate )msg;
@@ -85,14 +85,14 @@
 
                 // prevent NPE in Buffer#markToken() when edit mode is not loaded
                 if ( epu.getEditPane().getBuffer().isLoaded() ) {
-                    pages = getPageRanges();
+                    loadPageRanges();
                 }
             }
         }
         else if ( msg instanceof BufferUpdate ) {
             BufferUpdate bu = ( BufferUpdate )msg;
             if ( BufferUpdate.SAVED.equals( bu.getWhat() ) || \
                BufferUpdate.LOADED.equals( bu.getWhat() ) ) {
-                pages = getPageRanges();
+                loadPageRanges();
             }
         }
     }
@@ -120,21 +120,21 @@
 
     @Override
     public void paintValidLine( Graphics2D gfx, int screenLine, int physicalLine, \
                int start, int end, int y ) {
-        if ( isPageBreakEnabled() ) {
-            gfx.setColor( getPageBreakColor() );
+        if ( showPageBreak ) {
 
-            if ( pages == null ) {
-                pages = getPageRanges();
+            if ( pages == null || pages.isEmpty() ) {
+                loadPageRanges();
                 if ( pages == null || pages.isEmpty() ) {
                     return;
                 }
             }
 
 
+            gfx.setColor( pageBreakColor );
+
             // - 1 so last page break isn't drawn
-            for ( int page = 1; page < pages.size() - 1; page++ ) {
+            for ( int page = 1; page < pages.size(); page++ ) {
                 Range range = pages.get( page );
-
                 // 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.

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


------------------------------------------------------------------------------
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]