[GNUnet-SVN] r19747 - in gnunet-java: .idea src/org/gnunet/util

[gnunet]

Author: dold
Date: 2012-02-09 14:55:07 +0100 (Thu, 09 Feb 2012)
New Revision: 19747

Modified:
   gnunet-java/.idea/workspace.xml
   gnunet-java/src/org/gnunet/util/Resolver.java
Log:
fixed ipv6 localhost

Modified: gnunet-java/.idea/workspace.xml
===================================================================
--- gnunet-java/.idea/workspace.xml     2012-02-09 13:39:01 UTC (rev 19746)
+++ gnunet-java/.idea/workspace.xml     2012-02-09 13:55:07 UTC (rev 19747)
@@ -2,14 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list readonly="true" id="b4faf44d-8919-474e-bfab-5900bc40cc2b" 
name="Default" comment="" />
-    <list default="true" id="98f1d034-aef8-46c1-8b7a-dd150665aa24" name="New 
changelist" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/tools" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/tools/build" />
-      <change type="NEW" beforePath="" 
afterPath="$PROJECT_DIR$/tools/coverage" />
-      <change type="NEW" beforePath="" 
afterPath="$PROJECT_DIR$/tools/run-tests" />
-      <change type="NEW" beforePath="" 
afterPath="$PROJECT_DIR$/tools/update-msgtypes" />
+    <list default="true" id="98f1d034-aef8-46c1-8b7a-dd150665aa24" name="New 
changelist" comment="added cobertura">
       <change type="MODIFICATION" 
beforePath="$PROJECT_DIR$/.idea/workspace.xml" 
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" 
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Client.java" 
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
+      <change type="MODIFICATION" 
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" 
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
     </list>
     <ignored path="gnunet-java.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -67,37 +62,37 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="Parser.java" pinned="false" current="false" 
current-in-tab="false">
-        <entry 
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java">
+      <file leaf-file-name="Client.java" pinned="false" current="false" 
current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="24" column="7" selection-start="632" 
selection-end="632" vertical-scroll-proportion="0.0">
+            <state line="106" column="35" selection-start="3684" 
selection-end="3684" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Configuration.java" pinned="false" current="false" 
current-in-tab="false">
-        <entry 
file="file://$PROJECT_DIR$/src/org/gnunet/util/Configuration.java">
+      <file leaf-file-name="NetworkSizeEstimationServiceTest.java" 
pinned="false" current="false" current-in-tab="false">
+        <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="53" column="51" selection-start="1656" 
selection-end="1656" vertical-scroll-proportion="0.0">
+            <state line="23" column="5" selection-start="743" 
selection-end="743" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Client.java" pinned="false" current="true" 
current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
+      <file leaf-file-name="NetworkSizeEstimation.java" pinned="false" 
current="false" current-in-tab="false">
+        <entry 
file="file://$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="300" column="0" selection-start="10244" 
selection-end="10244" vertical-scroll-proportion="0.6054131">
+            <state line="170" column="12" selection-start="4498" 
selection-end="4498" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="log4j.properties" pinned="false" current="false" 
current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/log4j.properties">
+      <file leaf-file-name="ConstructTest.java" pinned="false" current="false" 
current-in-tab="false">
+        <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="6" column="0" selection-start="194" 
selection-end="194" vertical-scroll-proportion="0.0">
+            <state line="83" column="32" selection-start="2401" 
selection-end="2401" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -112,10 +107,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Resolver.java" pinned="false" current="false" 
current-in-tab="false">
+      <file leaf-file-name="Resolver.java" pinned="false" current="true" 
current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="334" column="20" selection-start="10112" 
selection-end="10112" vertical-scroll-proportion="0.0">
+            <state line="247" column="32" selection-start="6981" 
selection-end="6981" vertical-scroll-proportion="0.19373219">
               <folding />
             </state>
           </provider>
@@ -180,9 +175,9 @@
         <option value="$PROJECT_DIR$/src/org/gnunet/util/Configuration.java" />
         <option value="$PROJECT_DIR$/src/org/gnunet/util/Program.java" />
         <option value="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java" />
-        <option value="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
         <option value="$PROJECT_DIR$/ISSUES" />
         <option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
+        <option value="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
       </list>
     </option>
   </component>
@@ -616,6 +611,32 @@
               <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="org" />
+              <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="gnunet" />
+              <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="nse" />
+              <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="gnunet-java" />
+              <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="gnunet-java" />
+              <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="lib" />
               <option name="myItemType" 
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -931,7 +952,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-6" y="17" width="1452" height="889" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Messages" active="false" anchor="bottom" 
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 
weight="0.24313186" sideWeight="0.49713057" order="7" side_tool="false" 
content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" 
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 
weight="0.32967034" sideWeight="0.5" order="7" side_tool="false" 
content_ui="tabs" />
@@ -939,7 +960,7 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" 
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32967034" 
sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" 
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 
weight="0.24098124" sideWeight="0.6710875" order="1" side_tool="false" 
content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" 
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 
weight="0.23015873" sideWeight="0.58928573" order="1" side_tool="false" 
content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" 
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25613275" 
sideWeight="0.8543956" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" 
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25613275" 
sideWeight="0.7568681" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" 
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44230768" 
sideWeight="0.63708514" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" 
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 
weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" 
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 
weight="0.45054945" sideWeight="0.35786435" order="7" side_tool="true" 
content_ui="tabs" />
@@ -988,7 +1009,7 @@
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="added commons io jar" />
+    <option name="LAST_COMMIT_MESSAGE" value="added cobertura" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1012,6 +1033,8 @@
     <MESSAGE value="fixed various issues with command line parsing, rewrote 
configuration parser, fixed resolver" />
     <MESSAGE value="fix" />
     <MESSAGE value="added commons io jar" />
+    <MESSAGE value="added tools directory" />
+    <MESSAGE value="added cobertura" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1021,21 +1044,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="269" column="33" selection-start="8696" 
selection-end="8696" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="24" selection-start="121" selection-end="121" 
vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="67" column="0" selection-start="1826" 
selection-end="1826" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/grothoff/Runabout.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="104" column="0" selection-start="4232" 
selection-end="4232" vertical-scroll-proportion="0.0" />
@@ -1071,11 +1079,6 @@
         <state line="5" column="24" selection-start="80" selection-end="80" 
vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="334" column="20" selection-start="10112" 
selection-end="10112" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
     <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/construct/StringMessage.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="2" column="13" selection-start="44" selection-end="44" 
vertical-scroll-proportion="0.0" />
@@ -1096,13 +1099,41 @@
         <state line="30" column="19" selection-start="1030" 
selection-end="1030" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
+    <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="83" column="32" selection-start="2401" 
selection-end="2401" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry 
file="file://$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="23" column="5" selection-start="743" selection-end="743" 
vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry 
file="file://$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="170" column="12" selection-start="4498" 
selection-end="4498" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="300" column="0" selection-start="10244" 
selection-end="10244" vertical-scroll-proportion="0.6054131">
+        <state line="106" column="35" selection-start="3684" 
selection-end="3684" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="247" column="32" selection-start="6981" 
selection-end="6981" vertical-scroll-proportion="0.19373219">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

Modified: gnunet-java/src/org/gnunet/util/Resolver.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Resolver.java       2012-02-09 13:39:01 UTC 
(rev 19746)
+++ gnunet-java/src/org/gnunet/util/Resolver.java       2012-02-09 13:55:07 UTC 
(rev 19747)
@@ -261,7 +261,7 @@
 
     private InetAddress getInet6Localhost() {
         try {
-            return InetAddress.getByAddress(new byte[16]);
+            return InetAddress.getByAddress(new 
byte[]{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1});
         } catch (UnknownHostException e) {
             throw new RuntimeException();
         }