Merge pull request #1063 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0

* commit '8877c174a2c75fb64d421db4ac3705aa240893e9':
  REPORT-20318 sonar问题修复-zack

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java

@@ -9,24 +9,37 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
-import java.awt.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.Fold;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
 
+import javax.swing.event.DocumentEvent;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.Position;
+import javax.swing.text.TabExpander;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.Shape;
+
 
 /**
  * The <code>javax.swing.text.View</code> object used by {@link RSyntaxTextArea}
  * when word wrap is disabled.  It implements syntax highlighting for
  * programming languages using the colors and font styles specified by the
  * <code>RSyntaxTextArea</code>.<p>
- *
+ * <p>
  * You don't really have to do anything to use this class, as
  * {@link RSyntaxTextAreaUI} automatically sets the text area's view to be
  * an instance of this class if word wrap is disabled.<p>
- *
+ * <p>
  * The tokens that specify how to paint the syntax-highlighted text are gleaned
  * from the text area's {@link RSyntaxDocument}.
  *
@@ -149,8 +162,7 @@ public class SyntaxView extends View implements TabExpander,
 			if ((area0 != null) && (area1 != null)) {
 				Rectangle dmg = area0.union(area1); // damage.
 				host.repaint(dmg.x, dmg.y, dmg.width, dmg.height);
-			}
+			} else
-			else
 				host.repaint();
 		}
 	}
@@ -233,8 +245,7 @@ public class SyntaxView extends View implements TabExpander,
 				if (selCount == tokenLen) {
 					nextX = painter.paintSelected(token, g, nextX, y, host,
 							this, clipStart);
-				}
+				} else {
-				else {
 					tempToken.copyFrom(token);
 					tempToken.textCount = selCount;
 					nextX = painter.paintSelected(tempToken, g, nextX, y, host,
@@ -320,8 +331,8 @@ public class SyntaxView extends View implements TabExpander,
 	 *                  SwingConstants.NORTH, or SwingConstants.SOUTH.
 	 * @return the location within the model that best represents the next
 	 * location visual position.
-	 * @exception BadLocationException
+	 * @throws BadLocationException
-	 * @exception IllegalArgumentException for an invalid direction
+	 * @throws IllegalArgumentException for an invalid direction
 	 */
 	@Override
 	public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
@@ -341,7 +352,7 @@ public class SyntaxView extends View implements TabExpander,
 	 * Typically the view is told to render into the span
 	 * that is returned, although there is no guarantee.
 	 * The parent may choose to resize or break the view.
-	 * @exception IllegalArgumentException for an invalid axis
+	 * @throws IllegalArgumentException for an invalid axis
 	 */
 	@Override
 	public float getPreferredSpan(int axis) {
@@ -420,8 +431,7 @@ if (fm==null) {
 			if (line >= 0) {
 				return document.getTokenListForLine(line);
 			}
-}
+		} else {
-else {
 			line = fm.getVisibleLineAbove(line);
 			if (line >= 0) {
 				return document.getTokenListForLine(line);
@@ -455,8 +465,7 @@ if (!host.isCodeFoldingEnabled()) {
 			if (line < lineCount - 1) {
 				return document.getTokenListForLine(line + 1);
 			}
-}
+		} else {
-else {
 			FoldManager fm = host.getFoldManager();
 			line = fm.getVisibleLineBelow(line);
 			if (line >= 0 && line < lineCount) {
@@ -501,7 +510,7 @@ else {
 			// current line not being highlighted when a document is first
 			// opened.  So, we set it here just in case.
 			lineHeight = host != null ? host.getLineHeight() : lineHeight;
-if (host.isCodeFoldingEnabled()) {
+			if (host != null && host.isCodeFoldingEnabled()) {
 				FoldManager fm = host.getFoldManager();
 				int hiddenCount = fm.getHiddenLineCountAbove(line);
 				line -= hiddenCount;
@@ -520,7 +529,7 @@ if (host.isCodeFoldingEnabled()) {
 	 * @param pos the position to convert >= 0
 	 * @param a   the allocated region to render into
 	 * @return the bounding box of the given position
-	 * @exception BadLocationException  if the given position does not
+	 * @throws BadLocationException if the given position does not
 	 *                              represent a valid location in the associated document
 	 * @see View#modelToView
 	 */
@@ -554,7 +563,7 @@ if (host.isCodeFoldingEnabled()) {
 	 * Provides a mapping, for a given region, from the document model
 	 * coordinate space to the view coordinate space. The specified region is
 	 * created as a union of the first and last character positions.<p>
-	 *
+	 * <p>
 	 * This is implemented to subtract the width of the second character, as
 	 * this view's <code>modelToView</code> actually returns the width of the
 	 * character instead of "1" or "0" like the View implementations in
@@ -578,9 +587,9 @@ if (host.isCodeFoldingEnabled()) {
 	 * @param a  the area of the view, which encompasses the requested region
 	 * @return the bounding box which is a union of the region specified
 	 * by the first and last character positions
-	 * @exception BadLocationException  if the given position does
+	 * @throws BadLocationException     if the given position does
 	 *                                  not represent a valid location in the associated document
-	 * @exception IllegalArgumentException if <code>b0</code> or
+	 * @throws IllegalArgumentException if <code>b0</code> or
 	 *                                  <code>b1</code> are not one of the
 	 *                                  legal <code>Position.Bias</code> values listed above
 	 * @see View#viewToModel
@@ -605,8 +614,7 @@ if (host.isCodeFoldingEnabled()) {
 				s1 = new Rectangle(alloc.x + alloc.width - 1, alloc.y,
 						1, alloc.height);
 			}
-		}
+		} else {
-		else {
 			s1 = modelToView(p1, a, b1);
 		}
 		Rectangle r0 = s0 instanceof Rectangle ? (Rectangle) s0 : s0.getBounds();
@@ -720,8 +728,7 @@ if (host.isCodeFoldingEnabled()) {
 			if (!useSelectedTextColor || selStart == selEnd ||
 					(startOffset >= selEnd || endOffset < selStart)) {
 				drawLine(painter, token, g2d, x, y);
-			}
+			} else {
-			else {
 				//System.out.println("Drawing line with selection: " + line);
 				drawLineWithSelection(painter, token, g2d, x, y, selStart, selEnd);
 			}
@@ -846,9 +853,7 @@ if (host.isCodeFoldingEnabled()) {
 			int startLine = changes.getOffset();
 			int endLine = changes.getLength();
 			damageLineRange(startLine, endLine, a, host);
-		}
+		} else {
-
-		else {
 			Element map = getElement();
 			int line = map.getElementIndex(changes.getOffset());
 			damageLineRange(line, line, a, host);
@@ -861,14 +866,12 @@ if (host.isCodeFoldingEnabled()) {
 					// because it has gotten longer.
 					longLineWidth = getLineWidth(line);
 					preferenceChanged(null, true, false);
-				}
+				} else {
-				else {
 					// If long line gets updated, update the status bars too.
 					if (possiblyUpdateLongLine(e, line))
 						preferenceChanged(null, true, false);
 				}
-			}
+			} else if (changes.getType() == DocumentEvent.EventType.REMOVE) {
-			else if (changes.getType() == DocumentEvent.EventType.REMOVE) {
 				if (map.getElement(line) == longLine) {
 					// removed from longest line... recalc
 					longLineWidth = -1; // Must do this!
@@ -982,12 +985,14 @@ lineIndex += fm.getHiddenLineCountAbove(lineIndex, true);
 			// current line not being highlighted when a document is first
 			// opened.  So, we set it here just in case.
 			lineHeight = host != null ? host.getLineHeight() : lineHeight;
+			if (host != null) {
 				FoldManager fm = host.getFoldManager();
 				if (!fm.isLineHidden(line)) {
 					line -= fm.getHiddenLineCountAbove(line);
 					return alloc.y + line * lineHeight;
 				}
 			}
+		}
 
 		return -1;
 

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/WrappedSyntaxView.java

@@ -9,15 +9,33 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
-import java.awt.*;
-import javax.swing.text.*;
-import javax.swing.text.Position.Bias;
-import javax.swing.event.*;
-
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.TokenUtils.TokenSubList;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.Fold;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
 import com.fr.design.gui.syntax.ui.rtextarea.Gutter;
+import com.fr.stable.CommonUtils;
+
+import javax.swing.event.DocumentEvent;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.BoxView;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.LayeredHighlighter;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.Position;
+import javax.swing.text.Position.Bias;
+import javax.swing.text.Segment;
+import javax.swing.text.TabExpander;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.Shape;
 
 
 /**
@@ -93,7 +111,7 @@ public class WrappedSyntaxView extends BoxView implements TabExpander,
 		int p = p0;
 		RSyntaxTextArea textArea = (RSyntaxTextArea)getContainer();
 		float currentWidth = getWidth();
-		if (currentWidth==Integer.MAX_VALUE)
+		if (CommonUtils.equals(currentWidth, Integer.MAX_VALUE))
 			currentWidth = getPreferredSpan(X_AXIS);
 		// Make sure width>0; this is a huge hack to fix a bug where
 		// loading text into an RTextArea before it is visible if word wrap
@@ -1044,7 +1062,7 @@ return p + 1;
 
 		// Code folding may have hidden the last line.  If so, return the last
 		// visible offset instead of the last offset.
-		if (host.isCodeFoldingEnabled() && v==getView(getViewCount()-1) &&
+		if (v != null && host.isCodeFoldingEnabled() && v == getView(getViewCount() - 1) &&
 				offs == v.getEndOffset() - 1) {
 			offs = host.getLastVisibleOffset();
 		}
@@ -1170,7 +1188,7 @@ System.err.println(">>> >>> calculated number of lines for this view (line " + l
 			switch (axis) {
 				case View.X_AXIS:
 					float width = getWidth();
-					if (width == Integer.MAX_VALUE) {
+					if (CommonUtils.equals(width, Integer.MAX_VALUE)) {
 						// We have been initially set to MAX_VALUE, but we don't
 						// want this as our preferred.
 						return 100f;
@@ -1351,11 +1369,6 @@ System.err.println(">>> >>> calculated number of lines for this view (line " + l
 
 							// Start at alloc.x since this chunk starts
 							// at the beginning of a physical line.
-							if (tlist == null) {
-								p0 = (p == p0) ? p1 : p;
-								alloc.y += alloc.height;
-								continue;
-							}
 							int n = tlist.getListOffset(textArea,
 									WrappedSyntaxView.this,
 									alloc.x, x);