- fixed usage of isEmpty() which is not available in java 1.5

- increased visibility of some methods git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6564 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Jan 11, 2010 · 2113fcd · 2113fcd
1 parent dd45928
commit 2113fcd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java
@@ -313,7 +313,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
 	       			tagCount=0;
 	       			while (tagsIt.hasNext()) {            	
 	       				final String tname = tagsIt.next();
-	       				if (!tname.isEmpty() && tname.charAt(0) != '/') {
+	       				if (tname.length() > 0 && tname.charAt(0) != '/') {
 	       					prop.putHTML("display_bookmarks_"+count+"_tags_"+tagCount+"_tag", tname);
 	       					tagCount++;
 	       				}

diff --git a/htroot/api/bookmarks/get_bookmarks.java b/htroot/api/bookmarks/get_bookmarks.java
@@ -101,7 +101,7 @@ else if (post.get("display").equals("rss") || post.get("display").equals("3")) {
 				count = print_XBEL(it, count);
 				prop.put("display_xbel", count);
 				break;
-       		} else if (qtype.equals("folders") && !query.isEmpty()) {       			
+       		} else if (query.length() > 0 && qtype.equals("folders")) {       			
         		if (query.length() > 0 && query.charAt(0) == '/') { root = query; } 
         			else { root = "/" + query; }
        		}

diff --git a/source/net/yacy/ai/example/ConnectFour.java b/source/net/yacy/ai/example/ConnectFour.java
@@ -58,7 +58,7 @@ public Coin nextRole() {
     }
 
     public static class Move extends AbstractFinding<Coin> implements Finding<Coin> {
-        private final int column;
+        protected final int column;
         public Move(Coin role, int column) {
             super(role, (column > (width / 2)) ? (width - column - 1) : column);
             this.column = column;

diff --git a/source/net/yacy/ai/greedy/Engine.java b/source/net/yacy/ai/greedy/Engine.java
@@ -37,12 +37,12 @@ public class Engine<
                     SpecificModel extends Model<SpecificRole, SpecificFinding>
                    > {
 
-    private final PriorityBlockingQueue<Agent<SpecificRole, SpecificFinding, SpecificModel>> agentQueue;
-    private final PriorityBlockingQueue<Challenge<SpecificRole, SpecificFinding, SpecificModel>> challengeQueue;
-    private final Agent<SpecificRole, SpecificFinding, SpecificModel> poisonAgent;
-    private final Challenge<SpecificRole, SpecificFinding, SpecificModel> poisonChallenge;
-    private final ConcurrentHashMap<SpecificModel, List<SpecificFinding>> settings;
-    private final ConcurrentHashMap<Asset<SpecificRole, SpecificFinding, SpecificModel>, SpecificModel> assets;
+    protected final PriorityBlockingQueue<Agent<SpecificRole, SpecificFinding, SpecificModel>> agentQueue;
+    protected final PriorityBlockingQueue<Challenge<SpecificRole, SpecificFinding, SpecificModel>> challengeQueue;
+    protected final Agent<SpecificRole, SpecificFinding, SpecificModel> poisonAgent;
+    protected final Challenge<SpecificRole, SpecificFinding, SpecificModel> poisonChallenge;
+    protected final ConcurrentHashMap<SpecificModel, List<SpecificFinding>> settings;
+    protected final ConcurrentHashMap<Asset<SpecificRole, SpecificFinding, SpecificModel>, SpecificModel> assets;
     private final int cores;
 
 

diff --git a/source/net/yacy/document/parser/rssParser.java b/source/net/yacy/document/parser/rssParser.java
@@ -152,7 +152,7 @@ public Document parse(final DigestURI location, final String mimeType, final Str
                     }
 
                     final String itemHeadline = scraper.getTitle();     
-                    if (itemHeadline != null && !itemHeadline.isEmpty()) {
+                    if (itemHeadline != null && itemHeadline.length() > 0) {
                         feedSections.add(itemHeadline);
                     }
 

diff --git a/source/net/yacy/kelondro/rwi/ReferenceContainerCache.java b/source/net/yacy/kelondro/rwi/ReferenceContainerCache.java
@@ -145,7 +145,7 @@ public void dump(final File heapFile, int writeBuffer) {
      * create a clone of the cache content that is sorted using the this.containerOrder
      * @return the sorted ReferenceContainer[]
      */
-    private ArrayList<ReferenceContainer<ReferenceType>> sortedClone() {
+    protected ArrayList<ReferenceContainer<ReferenceType>> sortedClone() {
         ArrayList<ReferenceContainer<ReferenceType>> cachecopy = new ArrayList<ReferenceContainer<ReferenceType>>(cache.size());
         synchronized (cache) {
             for (final Map.Entry<ByteArray, ReferenceContainer<ReferenceType>> entry: cache.entrySet()) {

diff --git a/source/net/yacy/kelondro/table/SplitTable.java b/source/net/yacy/kelondro/table/SplitTable.java
@@ -242,7 +242,7 @@ public void clear() throws IOException {
             try {
                 init();
             } catch (RowSpaceExceededException e1) {
-                throw new IOException(e1);
+                throw new IOException(e1.getMessage());
             }
         }
     }