[Jcommander-commit] plugins/org.jcommander.ui.fileviewer/src/org/jcommander/ui/fileviewer/controls FileViewerControl.java, 1.2, 1.3 TextViewer.java, 1.2, 1.3

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.fileviewer/src/org/jcommander/ui/fileviewer/controls
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10939/src/org/jcommander/ui/fileviewer/controls

Modified Files:
	FileViewerControl.java TextViewer.java 
Log Message:
Removed trivial warnings.

Index: FileViewerControl.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.fileviewer/src/org/jcommander/ui/fileviewer/controls/FileViewerControl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileViewerControl.java	19 Mar 2006 21:15:44 -0000	1.2
--- FileViewerControl.java	6 Aug 2006 10:33:45 -0000	1.3
***************
*** 3,19 ****
  import java.util.*;
  
- import org.eclipse.swt.SWT;
- import org.eclipse.swt.layout.GridData;
- import org.eclipse.swt.layout.GridLayout;
- import org.eclipse.swt.widgets.*;
- import org.eclipse.swt.widgets.Shell;
  import org.apache.commons.vfs.*;
  
  public class FileViewerControl {
! 	private FileObject file;
! 	private ArrayList lineOffsets=new ArrayList();
! 	private String[] currentLines;
! 	private int currentPageHeight=0;
! 	private int newPageHeight=0;
  	private TextViewer textViewer;
  	private final Shell shell;
--- 3,16 ----
  import java.util.*;
  
  import org.apache.commons.vfs.*;
+ import org.eclipse.swt.*;
+ import org.eclipse.swt.widgets.*;
  
  public class FileViewerControl {
! 	protected FileObject file;
! 	protected ArrayList lineOffsets=new ArrayList();
! 	protected String[] currentLines;
! 	protected int currentPageHeight=0;
! 	protected int newPageHeight=0;
  	private TextViewer textViewer;
  	private final Shell shell;

Index: TextViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.fileviewer/src/org/jcommander/ui/fileviewer/controls/TextViewer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TextViewer.java	19 Mar 2006 21:15:44 -0000	1.2
--- TextViewer.java	6 Aug 2006 10:33:45 -0000	1.3
***************
*** 6,11 ****
  import org.apache.commons.vfs.*;
  import org.apache.commons.vfs.provider.local.*;
- import org.eclipse.swt.*;
  import org.eclipse.jface.resource.*;
  import org.eclipse.swt.custom.*;
  import org.eclipse.swt.events.*;
--- 6,11 ----
  import org.apache.commons.vfs.*;
  import org.apache.commons.vfs.provider.local.*;
  import org.eclipse.jface.resource.*;
+ import org.eclipse.swt.*;
  import org.eclipse.swt.custom.*;
  import org.eclipse.swt.events.*;
***************
*** 17,21 ****
  public class TextViewer extends ScrolledComposite{
  	private Font font;
! 	private FileObject file;
  	private StyledText textArea;
  	BufferedReader reader;
--- 17,21 ----
  public class TextViewer extends ScrolledComposite{
  	private Font font;
! 	protected FileObject file;
  	private StyledText textArea;
  	BufferedReader reader;
***************
*** 24,28 ****
  	private Composite parent;
  	private boolean showScroll;
! 	final private static int minSize = 32000;
  	
  	public TextViewer(Composite parent) {
--- 24,28 ----
  	private Composite parent;
  	private boolean showScroll;
! //	final private static int minSize = 32000;
  	
  	public TextViewer(Composite parent) {
***************
*** 59,68 ****
  		try {
  			if(file instanceof LocalFile && file.getType() != FileType.FOLDER) {
! 				long size = file.getContent().getSize();
! 				int currentSize = 0;
! 				if(size < minSize)
! 					currentSize = (int)size;
! 				else
! 					currentSize = minSize;
  				reader = new BufferedReader(new InputStreamReader(file.getContent().getInputStream()));
  				update();
--- 59,68 ----
  		try {
  			if(file instanceof LocalFile && file.getType() != FileType.FOLDER) {
! //				long size = file.getContent().getSize();
! //				int currentSize = 0;
! //				if(size < minSize)
! //					currentSize = (int)size;
! //				else
! //					currentSize = minSize;
  				reader = new BufferedReader(new InputStreamReader(file.getContent().getInputStream()));
  				update();