Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[891] trunk
|
From: <tri...@us...> - 2008-12-03 14:09:48
|
Revision: 891
http://equanda.svn.sourceforge.net/equanda/?rev=891&view=rev
Author: triathlon98
Date: 2008-12-03 14:09:45 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
EQ-299 remove checkstyle errors and warnings
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java
trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java
trunk/equanda-util/src/main/java/org/equanda/util/ByteBuffer.java
trunk/equanda-util/src/main/java/org/equanda/util/ImageLoader.java
trunk/equanda-util/src/main/java/org/equanda/util/Internationalize.java
trunk/equanda-util/src/main/java/org/equanda/util/SaveException.java
trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Builder.java
trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Iterator.java
trunk/equanda-util/src/main/java/org/equanda/util/script/BooleanExtension.java
trunk/equanda-util/src/main/java/org/equanda/util/script/DatabaseExtension.java
trunk/equanda-util/src/main/java/org/equanda/util/script/FScriptExtensionPool.java
trunk/equanda-util/src/main/java/org/equanda/util/script/StringExtension.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/DateField.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/JButtonNoFocus.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextFieldSelectOnFocus.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextRestricted.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButton.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonContainer.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonListener.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/SwingUtil.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/layout/VerticalFlowLayout.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPaletteTranslator.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/tree/IconNodeRenderer.java
trunk/equanda-util/src/main/java/org/equanda/util/ymport/ImportUtil.java
trunk/equanda-util/src/main/java/org/equanda/util/ymport/LenientSslProtocolSocketFactory.java
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/config/checkstyle.xml 2008-12-03 14:09:45 UTC (rev 891)
@@ -35,6 +35,7 @@
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
+ <!-- disabled because we allow all on one line if it fits
<module name="LeftCurly">
<property name="severity" value="info"/>
<property name="option" value="nl"/>
@@ -43,6 +44,7 @@
<property name="severity" value="info"/>
<property name="option" value="alone"/>
</module>
+ -->
<!--<module name="EmptyBlock"/>-->
<module name="AvoidNestedBlocks"/>
<!--<module name="NeedBraces"/> no braces is allowed when on same line -->
@@ -89,7 +91,9 @@
<!--<module name="AvoidStarImport"/>-->
<module name="IllegalImport"/>
<module name="RedundantImport"/>
- <module name="UnusedImports"/>
+ <module name="UnusedImports">
+ <property name="severity" value="info"/>
+ </module>
<module name="ImportOrder">
<property name="groups" value="be,org"/>
<property name="severity" value="info"/>
@@ -171,7 +175,9 @@
<!--<module name="AvoidInlineConditionals"/>-->
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
+ <module name="EmptyStatement">
+ <property name="severity" value="info"/>
+ </module>
<module name="EqualsHashCode"/>
<!--<module name="FinalLocalVariable"/>-->
<module name="HiddenField">
@@ -207,7 +213,9 @@
<!--<module name="ReturnCount"/>-->
<!--<module name="IllegalType"/>-->
<!--<module name="DeclarationOrder"/>-->
- <module name="ParameterAssignment"/>
+ <module name="ParameterAssignment">
+ <property name="severity" value="info"/>
+ </module>
<module name="ExplicitInitialization">
<property name="severity" value="info"/>
</module>
@@ -235,6 +243,7 @@
<!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
<module name="GenericIllegalRegexp">
+ <property name="severity" value="info"/>
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
Modified: trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -40,7 +40,7 @@
private static final Logger log = Logger.getLogger( LoginInfo.class );
private EquandaUserInfo user;
private AuthAndConfigProvider authAndConfig;
- private Object Extra;
+ private Object extra;
private String userName;
private String password;
@@ -103,12 +103,12 @@
public Object getExtra()
{
- return Extra;
+ return extra;
}
public void setExtra( Object extra )
{
- Extra = extra;
+ this.extra = extra;
}
public AuthAndConfigProvider getAuthAndConfig()
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 4536126296845291076L;
- public static final ClientEquandaStateInterceptor singleton = new ClientEquandaStateInterceptor();
+ public static final ClientEquandaStateInterceptor SINGLETON = new ClientEquandaStateInterceptor();
public String getName()
{
@@ -63,6 +63,6 @@
Object readResolve()
throws ObjectStreamException
{
- return singleton;
+ return SINGLETON;
}
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -25,6 +25,7 @@
package org.equanda.persistence.query;
import org.equanda.persistence.ObjectType;
+
import java.util.HashMap;
import java.util.Map;
@@ -59,14 +60,14 @@
init( queryString, -1, -1, countQueryString, new HashMap<String, Object>() );
}
- protected void init( String queryString, int maxResults, int firstResult,
- String countQueryString, Map<String, Object> parameters )
+ protected void init( String queryStr, int maxRes, int firstRes,
+ String countQueryStr, Map<String, Object> params )
{
- this.queryString = queryString;
- this.countQueryString = countQueryString;
- this.maxResults = maxResults;
- this.firstResult = firstResult;
- this.parameters = parameters;
+ this.queryString = queryStr;
+ this.countQueryString = countQueryStr;
+ this.maxResults = maxRes;
+ this.firstResult = firstRes;
+ this.parameters = params;
}
public String getQueryString()
@@ -79,13 +80,13 @@
return countQueryString;
}
- public EquandaQueryImpl setQueryString( String queryString )
+ public EquandaQueryImpl setQueryString( String queryStr )
{
- this.queryString = queryString;
+ this.queryString = queryStr;
return this;
}
- public EquandaQueryImpl setCountQueryString( String countQueryString )
+ public EquandaQueryImpl setCountQueryString( String countQueryStr )
{
this.countQueryString = countQueryString;
return this;
@@ -101,9 +102,9 @@
return maxResults;
}
- public EquandaQuery setMaxResults( int maxResults )
+ public EquandaQuery setMaxResults( int maxRes )
{
- this.maxResults = maxResults;
+ this.maxResults = maxRes;
return this;
}
@@ -112,9 +113,9 @@
return firstResult;
}
- public EquandaQuery setFirstResult( int firstResult )
+ public EquandaQuery setFirstResult( int firstRes )
{
- this.firstResult = firstResult;
+ this.firstResult = firstRes;
return this;
}
@@ -144,9 +145,9 @@
return typeFilter;
}
- public EquandaQuery setTypeFilter( ObjectType typeFilter )
+ public EquandaQuery setTypeFilter( ObjectType typeFilter_ )
{
- this.typeFilter = typeFilter;
+ this.typeFilter = typeFilter_;
return this;
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/ByteBuffer.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/ByteBuffer.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/ByteBuffer.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -224,4 +224,4 @@
}
buffer[ index ] = value;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/ImageLoader.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/ImageLoader.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/ImageLoader.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,10 +24,9 @@
package org.equanda.util;
-import java.net.URL;
-import java.awt.Image;
-import java.awt.Toolkit;
+import java.awt.*;
import java.awt.image.ImageProducer;
+import java.net.URL;
/**
* ImageLoader can be used to load an image
@@ -73,4 +72,4 @@
}
return null;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/Internationalize.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/Internationalize.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/Internationalize.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,9 +24,9 @@
package org.equanda.util;
+import java.util.Hashtable;
import java.util.Locale;
import java.util.ResourceBundle;
-import java.util.Hashtable;
/**
* Internationalization support
@@ -177,6 +177,4 @@
if ( value.equals( "" ) ) value = stealth ? fullname : name;
return value;
}
-
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/SaveException.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/SaveException.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/SaveException.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,7 +24,10 @@
package org.equanda.util;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.Date;
/**
@@ -131,4 +134,4 @@
System.err.println( "oops, can't write error message to file" );
}
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Builder.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Builder.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Builder.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,13 +24,15 @@
package org.equanda.util.barcode;
+import javolution.lang.TextBuilder;
import org.equanda.util.StringUtil;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Map;
-import javolution.lang.TextBuilder;
-
/**
* abstract class for building EAN 128 barcodes, you should use a renderer specific implementation
*
@@ -107,7 +109,7 @@
barcode.append( start );
charset = C; // begin is always at least two digits, so code C
- for ( int i = 0 ; i < parts.size() ; i++ )
+ for ( int i = 0; i < parts.size() ; i++ )
{
value = parts.get( i );
if ( value.length() > 0 && i != 0 ) barcode.append( fnc1 ); // end of code seperator
@@ -144,7 +146,7 @@
// check if we need to switch to charset C
// this should be done if we have four succesive digits, or two at the end
int j;
- for ( j = 1 ; j < value.length() && Character.isDigit( value.charAt( j ) ) ; j++ ) ;
+ for ( j = 1; j < value.length() && Character.isDigit( value.charAt( j ) ) ; j++ ) ;
if ( j >= 4 || ( j >= 2 && j == value.length() ) )
{
// switch character set, but make digit count even first
@@ -247,16 +249,15 @@
private boolean isCharset( int charset, char c )
{
- if ( charset == C && Character.isDigit( c ) ) return true;
- if ( charset == B && c >= 32 && c <= 127 ) return true;
- if ( charset == A && c >= 0 && c <= 95 ) return true;
- return false;
+ return ( charset == C && Character.isDigit( c ) ) ||
+ ( charset == B && c >= 32 && c <= 127 ) ||
+ ( charset == A && c >= 0 && c <= 95 );
}
/**
* following members and methods should be made concrete by the implementing class
* as they are dependent on the barcode renderer (most printers need different encodings
- *
+ * <p/>
* They should allow all types of renderers
*/
Modified: trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Iterator.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Iterator.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/barcode/EAN128Iterator.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -158,4 +158,4 @@
}
public void remove() { throw new UnsupportedOperationException(); }
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/script/BooleanExtension.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/script/BooleanExtension.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/script/BooleanExtension.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,7 +24,9 @@
package org.equanda.util.script;
-import murlen.util.fscript.*;
+import murlen.util.fscript.FSException;
+import murlen.util.fscript.FSFastExtension;
+import murlen.util.fscript.FSVarExtension;
/**
@@ -69,4 +71,4 @@
}
} );
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/script/DatabaseExtension.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/script/DatabaseExtension.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/script/DatabaseExtension.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,14 +24,14 @@
package org.equanda.util.script;
+import murlen.util.fscript.FSException;
+import murlen.util.fscript.FSUnsupportedException;
import org.equanda.util.StringUtil;
+import java.sql.*;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.sql.*;
-import murlen.util.fscript.*;
-
/**
* DatabaseExtension, FScript extension for database access using
* SQL and JDBC
@@ -540,5 +540,4 @@
{
throw new FSUnsupportedException();
}
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/script/FScriptExtensionPool.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/script/FScriptExtensionPool.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/script/FScriptExtensionPool.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,7 +24,9 @@
package org.equanda.util.script;
-import murlen.util.fscript.*;
+import murlen.util.fscript.FSException;
+import murlen.util.fscript.FSExtension;
+import murlen.util.fscript.FSUnsupportedException;
import java.util.ArrayList;
@@ -139,5 +141,4 @@
{
extensions.add( ext );
}
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/script/StringExtension.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/script/StringExtension.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/script/StringExtension.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,9 +24,9 @@
package org.equanda.util.script;
-import org.equanda.util.StringUtil;
import javolution.lang.TextBuilder;
import murlen.util.fscript.*;
+import org.equanda.util.StringUtil;
import java.util.ArrayList;
import java.util.Arrays;
@@ -650,5 +650,4 @@
}
} );
}
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/DateField.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/DateField.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/DateField.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,8 +24,8 @@
package org.equanda.util.swing;
-import org.equanda.util.ImageLoader;
import com.toedter.calendar.JCalendar;
+import org.equanda.util.ImageLoader;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -131,7 +131,7 @@
jcalendar.setCalendar( calendar );
}
catch ( Exception ex )
- {}
+ {/*ignore*/}
finally
{
dateField.setText( df.print( calendar.getTimeInMillis() ) );
@@ -144,7 +144,7 @@
setLayout( new GridBagLayout() );
GridBagConstraints constr = new GridBagConstraints( 0, 0, 1, 1, 0.0, 0.0
, GridBagConstraints.WEST, GridBagConstraints.BOTH,
- new Insets( 0, 0, 0, 0 ), 0, 0 );
+ new Insets( 0, 0, 0, 0 ), 0, 0 );
constr.gridx = 1;
add( calendarButton, constr );
constr.gridx = 0;
@@ -156,11 +156,11 @@
public void center( JDialog dialog )
{
Point p = calendarButton.getLocationOnScreen();
- Dimension p_d = calendarButton.getSize();
+ Dimension pd = calendarButton.getSize();
Dimension d = dialog.getSize();
- int x = p.x - d.width + p_d.width;
- int y = p.y + p_d.height;
+ int x = p.x - d.width + pd.width;
+ int y = p.y + pd.height;
dialog.setLocation( x, y );
}
@@ -198,7 +198,7 @@
* it also sends a "daySelected" event in case the day was changed in order exit when a day is choosen
* the base class implementation only sends a "calendar" event for all modifications (including year,month)
*
- * @param evt
+ * @param evt event
*/
public void propertyChange( PropertyChangeEvent evt )
{
@@ -227,5 +227,4 @@
return verify( input );
}
}
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/JButtonNoFocus.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/JButtonNoFocus.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/JButtonNoFocus.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,7 +24,7 @@
package org.equanda.util.swing;
-import javax.swing.JButton;
+import javax.swing.*;
/**
* JButtonNoFocus is a variant of JButton which can not get the
@@ -35,10 +35,9 @@
public class JButtonNoFocus
extends JButton
{
-
public JButtonNoFocus() { super(); }
public JButtonNoFocus( String text ) { super( text ); }
public boolean isFocusTraversable() { return false; }
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextFieldSelectOnFocus.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextFieldSelectOnFocus.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextFieldSelectOnFocus.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -74,5 +74,5 @@
this.setSelectionEnd( this.getText().length() );
}
- public void focusLost( FocusEvent e ){}
+ public void focusLost( FocusEvent e ) {}
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextRestricted.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextRestricted.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/JTextRestricted.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,12 +24,14 @@
package org.equanda.util.swing;
-import javax.swing.*;
-import javax.swing.text.*;
-
import org.equanda.util.SaveException;
-import java.awt.Toolkit;
+import javax.swing.*;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.PlainDocument;
+import java.awt.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -237,19 +239,19 @@
public void setAllowedPattern( String value )
{
-// assure no pattern on failure or when none given
+ // assure no pattern on failure or when none given
pattern = null;
if ( value != null )
{
try
{
-// remove start and end slash when provided (cfr Perl syntax vs Java regex syntax)
+ // remove start and end slash when provided (cfr Perl syntax vs Java regex syntax)
int ln = value.length() - 1;
if ( ln > 0 && value.charAt( 0 ) == '/' && value.charAt( ln ) == '/' )
{
value = value.substring( 1, ln );
}
-// compile pattern
+ // compile pattern
pattern = Pattern.compile( value );
}
catch ( PatternSyntaxException pse )
@@ -270,10 +272,9 @@
remove( 0, getLength() ); // clear document string
}
catch ( BadLocationException e )
- {}
+ {/*ignored*/}
}
public String getHiddenText() { return hiddenString; }
}
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButton.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButton.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButton.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -25,7 +25,6 @@
package org.equanda.util.swing;
import javax.swing.*;
-import java.awt.*;
/**
* ScreenButton used by the ScreenButtonContainer
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonContainer.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonContainer.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonContainer.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,9 +24,9 @@
package org.equanda.util.swing;
+import javolution.lang.TextBuilder;
import org.equanda.util.SaveException;
import org.equanda.util.StringSplitter;
-import javolution.lang.TextBuilder;
import javax.swing.*;
import java.awt.*;
@@ -103,7 +103,7 @@
/**
* Create new buttons, recycling existing buttons as much as possible
*
- * @param txtMap
+ * @param txtMap map with texts to put in buttons
*/
public void refresh( Map txtMap )
{
@@ -140,27 +140,26 @@
buttonPanel.remove( buttonPanel.getComponentCount() - 1 );
}
- Dimension size = new Dimension( 100,
- buttonPanel.getMinimumSize().height
- + scrollPane.getHorizontalScrollBar().getMinimumSize().height );
+ Dimension size = new Dimension( 100, buttonPanel.getMinimumSize().height
+ + scrollPane.getHorizontalScrollBar().getMinimumSize().height );
scrollPane.setMinimumSize( size );
scrollPane.setPreferredSize( size );
}
- public JComponent getButtonsPanel() {return scrollPane;}
+ public JComponent getButtonsPanel() { return scrollPane; }
/**
* Called when a new button has been selected
*
- * @param buttonIndex
+ * @param buttonIndex button index
*/
protected abstract void onButtonSelect( int buttonIndex );
/**
* Factory method used to create a new ScreenButton. May be overrided to provide custom buttons.
*
- * @param idx
- * @param text
+ * @param idx index
+ * @param text text
* @return a new ScreenButton
*/
protected ScreenButton newScreenButton( int idx, String text )
@@ -208,7 +207,7 @@
catch ( Exception ex )
{
SaveException.saveException( ex, "during ScreenButtonContainer.setText\n" + newTxt + '\n'
- + ex.getMessage() );
+ + ex.getMessage() );
}
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonListener.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonListener.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/ScreenButtonListener.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -36,5 +36,5 @@
*
* @param button that the action was performed on
*/
- public void onButtonSelect( ScreenButton button );
+ void onButtonSelect( ScreenButton button );
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/SwingUtil.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/SwingUtil.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/SwingUtil.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -32,7 +32,7 @@
*
* @author NetRom team
*/
-public class SwingUtil
+public final class SwingUtil
{
private SwingUtil() {}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/layout/VerticalFlowLayout.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/layout/VerticalFlowLayout.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/layout/VerticalFlowLayout.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,7 +24,6 @@
package org.equanda.util.swing.layout;
-import java.lang.*;
import java.awt.*;
/**
@@ -211,9 +210,9 @@
return tarsiz;
}
- public void setVerticalFill( boolean vfill )
+ public void setVerticalFill( boolean verticalFill )
{
- this.vfill = vfill;
+ this.vfill = verticalFill;
}
public boolean getVerticalFill()
@@ -221,9 +220,9 @@
return vfill;
}
- public void setHorizontalFill( boolean hfill )
+ public void setHorizontalFill( boolean horizontalFill )
{
- this.hfill = hfill;
+ this.hfill = horizontalFill;
}
public boolean getHorizontalFill()
@@ -237,24 +236,24 @@
*
* @param target the container
* @param x the x coordinate of the area
- * @param y the y coordinate of the area
+ * @param basey the base y coordinate of the area
* @param width the width of the area
* @param height the height of the area
* @param first the first component of the container to place
* @param last the last component of the container to place
*/
- private void placethem( Container target, int x, int y, int width, int height,
+ private void placethem( Container target, int x, int basey, int width, int height,
int first, int last )
{
+ int y = basey;
int align = getAlignment();
//if ( align == this.TOP )
// y = 0;
- Insets insets = target.getInsets();
- if ( align == this.MIDDLE )
+ if ( align == MIDDLE )
{
y += height / 2;
}
- if ( align == this.BOTTOM )
+ if ( align == BOTTOM )
{
y += height;
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,17 +24,18 @@
package org.equanda.util.swing.list;
+import org.equanda.util.swing.JSortedList;
+import org.equanda.util.swing.JSortedListModel;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import org.equanda.util.swing.JSortedList;
-import org.equanda.util.swing.JSortedListModel;
/**
* This components contains two list :
@@ -179,8 +180,7 @@
protected void buildLayout()
{
GridBagConstraints constr = new GridBagConstraints( 0, 0, 1, 1, 0.0, 0.0
- , GridBagConstraints.CENTER, GridBagConstraints.BOTH,
- new Insets( 2, 2, 2, 2 ), 0, 0 );
+ , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets( 2, 2, 2, 2 ), 0, 0 );
// add available list title
constr.gridy = 0; // row
constr.gridx = 0; // column
@@ -219,9 +219,7 @@
add( removeButton, constr );
}
- /**
- * Cell renderer
- */
+ /** Cell renderer */
private class ListPaletteCellRenderer
extends JLabel
implements ListCellRenderer
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPaletteTranslator.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPaletteTranslator.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPaletteTranslator.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -1,3 +1,27 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
package org.equanda.util.swing.list;
/**
@@ -7,14 +31,13 @@
*/
public interface ListPaletteTranslator<ELEMENT>
{
+ String getAvailableListTitle();
- public String getAvailableListTitle();
+ String getAssignedListTitle();
- public String getAssignedListTitle();
+ String getAddButtonLabel();
- public String getAddButtonLabel();
+ String getRemoveButtonLabel();
- public String getRemoveButtonLabel();
-
- public String getElementDisplayValue( ELEMENT element );
+ String getElementDisplayValue( ELEMENT element );
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/tree/IconNodeRenderer.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/tree/IconNodeRenderer.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/tree/IconNodeRenderer.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -24,10 +24,10 @@
package org.equanda.util.swing.tree;
-import java.util.*;
+import javax.swing.*;
+import javax.swing.tree.DefaultTreeCellRenderer;
import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.*;
+import java.util.Map;
/**
Modified: trunk/equanda-util/src/main/java/org/equanda/util/ymport/ImportUtil.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/ymport/ImportUtil.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/ymport/ImportUtil.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -47,8 +47,10 @@
* @author NetRom team
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class ImportUtil
+public final class ImportUtil
{
+ private ImportUtil() {}
+
/**
* sends strings to the import servlet
*
@@ -134,7 +136,7 @@
httpConn.executeMethod( post );
responseBody = post.getResponseBodyAsString();
post.releaseConnection();
-
+
return responseBody.startsWith( "OK" ) ? null : responseBody;
}
@@ -173,15 +175,16 @@
*/
public static String quote( String in )
{
+ String calc = in;
StringBuilder res = new StringBuilder( "\"" );
int pos;
- while ( ( pos = in.indexOf( '\"' ) ) >= 0 )
+ while ( ( pos = calc.indexOf( '\"' ) ) >= 0 )
{
- res.append( in.substring( 0, pos ) );
+ res.append( calc.substring( 0, pos ) );
res.append( "\"\"" );
- in = in.substring( pos + 1 );
+ calc = calc.substring( pos + 1 );
}
- res.append( in );
+ res.append( calc );
res.append( '\"' );
return res.toString();
}
Modified: trunk/equanda-util/src/main/java/org/equanda/util/ymport/LenientSslProtocolSocketFactory.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/ymport/LenientSslProtocolSocketFactory.java 2008-12-03 12:57:46 UTC (rev 890)
+++ trunk/equanda-util/src/main/java/org/equanda/util/ymport/LenientSslProtocolSocketFactory.java 2008-12-03 14:09:45 UTC (rev 891)
@@ -40,7 +40,7 @@
/**
* A ssl socket factory for commons-httpclient which accepts self-signed certificates.
* Needs to be registered before use
- *
+ * <p/>
* Protocol myhttps = new Protocol( "https", new LenientSslProtocolSocketFactory(), 443 );
* Protocol.registerProtocol( "https", myhttps );
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
