[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19001 - in gnunet-java: .idea lib src/org/gnunet/service s
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19001 - in gnunet-java: .idea lib src/org/gnunet/service src/org/gnunet/util test/org/gnunet/services |
|
Date: |
Thu, 5 Jan 2012 14:32:22 +0100 |
Author: dold
Date: 2012-01-05 14:32:22 +0100 (Thu, 05 Jan 2012)
New Revision: 19001
Added:
gnunet-java/lib/junit-4.10.jar
gnunet-java/lib/log4j-1.2.16.jar
gnunet-java/lib/slf4j-log4j12-1.6.4.jar
Modified:
gnunet-java/.idea/codeStyleSettings.xml
gnunet-java/.idea/workspace.xml
gnunet-java/src/org/gnunet/service/NetworkSizeEstimationService.java
gnunet-java/src/org/gnunet/util/AbsoluteTime.java
gnunet-java/src/org/gnunet/util/AbsoluteTimeMessage.java
gnunet-java/src/org/gnunet/util/RelativeTime.java
gnunet-java/src/org/gnunet/util/RelativeTimeMessage.java
gnunet-java/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
Log:
added libs
Modified: gnunet-java/.idea/codeStyleSettings.xml
===================================================================
--- gnunet-java/.idea/codeStyleSettings.xml 2012-01-05 13:31:44 UTC (rev
19000)
+++ gnunet-java/.idea/codeStyleSettings.xml 2012-01-05 13:32:22 UTC (rev
19001)
@@ -2,7 +2,11 @@
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
- <value />
+ <value>
+ <XML>
+ <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+ </XML>
+ </value>
</option>
</component>
</project>
Modified: gnunet-java/.idea/workspace.xml
===================================================================
--- gnunet-java/.idea/workspace.xml 2012-01-05 13:31:44 UTC (rev 19000)
+++ gnunet-java/.idea/workspace.xml 2012-01-05 13:32:22 UTC (rev 19001)
@@ -2,43 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" readonly="true"
id="b4faf44d-8919-474e-bfab-5900bc40cc2b" name="Default" comment="">
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/copyright" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/dictionaries" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/inspectionProfiles" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/libraries" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes"
/>
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/.name" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/ant.xml"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/dictionaries/dold.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/libraries/junit_4_10.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/libraries/lib.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/misc.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/modules.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ISSUES"
afterPath="$PROJECT_DIR$/ISSUES" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/exceptions/InternalLogicError.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/exceptions/InternalLogicError.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/service/NSE_UpdateMessage.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/service/NSE_UpdateMessage.java" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/lib/junit-4.10.jar" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/lib/log4j-1.2.16.jar" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/lib/slf4j-log4j12-1.6.4.jar" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/codeStyleSettings.xml"
afterPath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java"
/>
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java" />
- <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/Configuration.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Configuration.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/IOContinuation.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/IOContinuation.java" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTimeMessage.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTimeMessage.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/RunaboutMessageReceiver.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/RunaboutMessageReceiver.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/RelativeTimeMessage.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/RelativeTimeMessage.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/StatisticsServiceTest.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/services/StatisticsServiceTest.java" />
</list>
<ignored path="gnunet-java.iws" />
<ignored path=".idea/workspace.xml" />
@@ -96,91 +70,91 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="Runabout.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/grothoff/Runabout.java">
+ <file leaf-file-name="StatisticsService.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/service/StatisticsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="187" column="12" selection-start="7347"
selection-end="7347" vertical-scroll-proportion="0.0">
+ <state line="11" column="13" selection-start="245"
selection-end="245" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ConfigUtil.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.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="5" column="0" selection-start="70" selection-end="70"
vertical-scroll-proportion="0.0">
+ <state line="23" column="5" selection-start="767"
selection-end="767" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="IOContinuation.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/IOContinuation.java">
+ <file leaf-file-name="IntegerParser.java" pinned="false" current="true"
current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="0" selection-start="845"
selection-end="845" vertical-scroll-proportion="0.0">
+ <state line="200" column="13" selection-start="6405"
selection-end="6405" vertical-scroll-proportion="0.07977208">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RunaboutMessageReceiver.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/RunaboutMessageReceiver.java">
+ <file leaf-file-name="NestedParser.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="0" selection-start="93" selection-end="93"
vertical-scroll-proportion="0.0">
+ <state line="28" column="41" selection-start="825"
selection-end="825" 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="MessageLoader.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/MessageLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="272" column="12" selection-start="8767"
selection-end="8767" vertical-scroll-proportion="0.0">
+ <state line="89" column="0" selection-start="3088"
selection-end="3088" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="IntegerParser.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java">
+ <file leaf-file-name="Construct.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="12" selection-start="1877"
selection-end="1877" vertical-scroll-proportion="0.0">
+ <state line="43" column="24" selection-start="1457"
selection-end="1457" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ISSUES" pinned="false" current="true"
current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/ISSUES">
+ <file leaf-file-name="QueryMessage.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/QueryMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="128" column="0" selection-start="4143"
selection-end="4143" vertical-scroll-proportion="0.673774">
+ <state line="3" column="13" selection-start="62"
selection-end="62" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="InternalLogicError.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/exceptions/InternalLogicError.java">
+ <file leaf-file-name="AbsoluteTimeMessage.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTimeMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="41" selection-start="288"
selection-end="288" vertical-scroll-proportion="0.0">
+ <state line="21" column="5" selection-start="449"
selection-end="449" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Scheduler.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
+ <file leaf-file-name="RelativeTimeMessage.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/RelativeTimeMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="91" column="16" selection-start="2974"
selection-end="2974" vertical-scroll-proportion="0.0">
+ <state line="19" column="51" selection-start="499"
selection-end="499" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbsoluteTime.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java">
+ <file leaf-file-name="SequenceParser.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="103" column="28" selection-start="3270"
selection-end="3270" vertical-scroll-proportion="0.0">
+ <state line="37" column="0" selection-start="875"
selection-end="875" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -196,13 +170,7 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option
value="$PROJECT_DIR$/src/org/gnunet/util/RelativeTimeMessage.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTimeMessage.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java" />
- <option
value="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
/>
<option
value="$PROJECT_DIR$/test/org/gnunet/services/StatisticsServiceTest.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java"
/>
<option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
<option
value="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
/>
<option value="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java" />
@@ -212,6 +180,12 @@
<option value="$PROJECT_DIR$/src/org/gnunet/util/Configuration.java" />
<option
value="$PROJECT_DIR$/src/org/gnunet/exceptions/InternalLogicError.java" />
<option value="$PROJECT_DIR$/ISSUES" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java"
/>
+ <option
value="$PROJECT_DIR$/src/org/gnunet/util/RelativeTimeMessage.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTimeMessage.java" />
+ <option
value="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
/>
</list>
</option>
</component>
@@ -371,101 +345,79 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope">
- <subPane subId="Project Files">
+ <pane id="ProjectPane">
+ <subPane>
<PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="gnunet-java">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
</PATH>
<PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="gnunet-java">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="src">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="org">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
</PATH>
<PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="gnunet-java">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="src">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="org">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="gnunet">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="gnunet-java">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="src">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="org">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="gnunet">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
+ <PATH_ELEMENT>
+ <option name="myItemId" value="construct" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT USER_OBJECT="construct">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
</PATH>
- </subPane>
- </pane>
- <pane id="ProjectPane">
- <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="gnunet-java" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
<option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
+ <option name="myItemId" value="src" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -479,11 +431,11 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="test" />
+ <option name="myItemId" value="src" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gnunet" />
+ <option name="myItemId" value="org" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -500,6 +452,18 @@
<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="util" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -518,6 +482,14 @@
<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="service" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -540,10 +512,6 @@
<option name="myItemId" value="gnunet" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -567,7 +535,7 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="service" />
+ <option name="myItemId" value="construct" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -592,7 +560,29 @@
<option name="myItemId" value="gnunet" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="construct" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="parsers" />
+ <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>
+ </PATH>
</subPane>
</pane>
<pane id="PackagesPane">
@@ -623,6 +613,86 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scope">
+ <subPane subId="Project Files">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="gnunet-java">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="gnunet-java">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="src">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="org">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="gnunet-java">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="src">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="org">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="gnunet">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="gnunet-java">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="src">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="org">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="gnunet">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="construct">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
</panes>
</component>
<component name="PropertiesComponent">
@@ -847,6 +917,10 @@
<option name="myVcsRoot" value="$PROJECT_DIR$" />
<option name="myCopyRoot" value="$PROJECT_DIR$" />
</SvnCopyRootSimple>
+ <SvnCopyRootSimple>
+ <option name="myVcsRoot" value="$PROJECT_DIR$/.idea" />
+ <option name="myCopyRoot" value="$PROJECT_DIR$/.idea" />
+ </SvnCopyRootSimple>
</list>
</option>
<option name="myMoreRealMappingRoots">
@@ -858,29 +932,49 @@
</list>
</option>
</component>
+ <component name="TodoView" selected-index="0">
+ <todo-panel id="selected-file">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ <todo-panel id="all">
+ <are-packages-shown value="true" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ <todo-panel id="default-changelist">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </todo-panel>
+ </component>
<component name="ToolWindowManager">
<frame x="-6" y="17" width="1452" height="889" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
- <window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.37225273" 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" />
<window_info id="Palette" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <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.24166666" sideWeight="0.6710875" order="1" side_tool="false"
content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48763737"
sideWeight="0.49426112" 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.25613275" sideWeight="0.58928573" order="1" 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.33477634"
sideWeight="0.62774724" 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.25"
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" />
- <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="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2857143"
sideWeight="0.9126984" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.37225273" sideWeight="0.49713057" order="7" side_tool="false"
content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33"
sideWeight="0.5" order="6" 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.25613275" sideWeight="0.58928573" order="1" 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.3181818"
sideWeight="0.6978022" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.3021978" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29395604"
sideWeight="0.9126984" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Documentation" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true"
weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"
x="88" y="109" width="1260" height="692" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25"
sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48763737"
sideWeight="0.49426112" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3021978" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -917,7 +1011,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 MsgMap update shell
script" />
+ <option name="LAST_COMMIT_MESSAGE" value="fix" />
<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" />
@@ -932,6 +1026,8 @@
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="NSE client almost working" />
<MESSAGE value="added MsgMap update shell script" />
+ <MESSAGE value="fixes / documentation" />
+ <MESSAGE value="fix" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -941,117 +1037,84 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="9" selection-start="317" selection-end="317"
vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#614#630#0" expanded="true" />
- </folding>
- </state>
+ <state line="373" column="40" selection-start="13033"
selection-end="13033" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/exceptions/InternalLogicError.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="28" selection-start="3062"
selection-end="3062" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="11" column="41" selection-start="288" selection-end="288"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/MessageLoader.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/RunaboutMessageReceiver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="17" selection-start="1585"
selection-end="1585" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="5" column="22" selection-start="116" selection-end="116"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/log4j.properties">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="0" selection-start="62" selection-end="62"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="200" column="11" selection-start="5769"
selection-end="5769" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/datastructures/BloomFilter.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="13" selection-start="1649"
selection-end="1649" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="180" column="28" selection-start="5729"
selection-end="5729" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="373" column="40" selection-start="13033"
selection-end="13033" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="86" column="35" selection-start="2553"
selection-end="2553" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/service/StatisticsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="91" column="16" selection-start="2974"
selection-end="2974" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="11" column="13" selection-start="245" selection-end="245"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java">
+ <entry
file="file://$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="103" column="28" selection-start="3270"
selection-end="3270" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="23" column="5" selection-start="767" selection-end="767"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/grothoff/Runabout.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="187" column="12" selection-start="7347"
selection-end="7347" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="28" column="41" selection-start="825" selection-end="825"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/MessageLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="0" selection-start="70" selection-end="70"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="89" column="0" selection-start="3088"
selection-end="3088" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/IOContinuation.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="0" selection-start="845" selection-end="845"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="43" column="24" selection-start="1457"
selection-end="1457" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/RunaboutMessageReceiver.java">
+ <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/QueryMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="0" selection-start="93" selection-end="93"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="3" column="13" selection-start="62" selection-end="62"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/exceptions/InternalLogicError.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTimeMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="41" selection-start="288" selection-end="288"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="21" column="5" selection-start="449" selection-end="449"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Configuration.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/RelativeTimeMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="272" column="12" selection-start="8767"
selection-end="8767" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="19" column="51" selection-start="499" selection-end="499"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="12" selection-start="1877"
selection-end="1877" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="37" column="0" selection-start="875" selection-end="875"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/ISSUES">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="128" column="0" selection-start="4143"
selection-end="4143" vertical-scroll-proportion="0.673774">
+ <state line="200" column="13" selection-start="6405"
selection-end="6405" vertical-scroll-proportion="0.07977208">
<folding />
</state>
</provider>
Added: gnunet-java/lib/junit-4.10.jar
===================================================================
(Binary files differ)
Property changes on: gnunet-java/lib/junit-4.10.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: gnunet-java/lib/log4j-1.2.16.jar
===================================================================
(Binary files differ)
Property changes on: gnunet-java/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: gnunet-java/lib/slf4j-log4j12-1.6.4.jar
===================================================================
(Binary files differ)
Property changes on: gnunet-java/lib/slf4j-log4j12-1.6.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: gnunet-java/src/org/gnunet/service/NetworkSizeEstimationService.java
===================================================================
--- gnunet-java/src/org/gnunet/service/NetworkSizeEstimationService.java
2012-01-05 13:31:44 UTC (rev 19000)
+++ gnunet-java/src/org/gnunet/service/NetworkSizeEstimationService.java
2012-01-05 13:32:22 UTC (rev 19001)
@@ -36,7 +36,7 @@
System.out.println("got message back!");
for (NSE_Subscriber s : subscribers) {
- s.update(null, uMsg.sizeEstimate, uMsg.stdDeviation);
+ s.update(AbsoluteTime.fromNetwork(uMsg.timestamp),
uMsg.sizeEstimate, uMsg.stdDeviation);
}
if (!disconnected) {
Modified: gnunet-java/src/org/gnunet/util/AbsoluteTime.java
===================================================================
--- gnunet-java/src/org/gnunet/util/AbsoluteTime.java 2012-01-05 13:31:44 UTC
(rev 19000)
+++ gnunet-java/src/org/gnunet/util/AbsoluteTime.java 2012-01-05 13:32:22 UTC
(rev 19001)
@@ -194,11 +194,15 @@
return new AbsoluteTime(abs_value - duration.getMilliseconds());
}
- AbsoluteTimeMessage toNetwork() {
- return null;
+ public AbsoluteTimeMessage toNetwork() {
+ return new AbsoluteTimeMessage(this);
}
- static AbsoluteTime fromNetwork(AbsoluteTimeMessage m) {
- return null;
+ public static AbsoluteTime fromNetwork(AbsoluteTimeMessage m) {
+ if (m.value__ < 0) {
+ return AbsoluteTime.FOREVER;
+ } else {
+ return new AbsoluteTime(m.value__);
+ }
}
}
Modified: gnunet-java/src/org/gnunet/util/AbsoluteTimeMessage.java
===================================================================
--- gnunet-java/src/org/gnunet/util/AbsoluteTimeMessage.java 2012-01-05
13:31:44 UTC (rev 19000)
+++ gnunet-java/src/org/gnunet/util/AbsoluteTimeMessage.java 2012-01-05
13:32:22 UTC (rev 19001)
@@ -6,5 +6,18 @@
public class AbsoluteTimeMessage implements Message {
@UInt64
- public long __value;
+ public long value__;
+
+ public AbsoluteTimeMessage() {
+
+ }
+
+
+ public AbsoluteTimeMessage(final AbsoluteTime t) {
+ if (t.equals(RelativeTime.FOREVER)) {
+ this.value__ = -1;
+ } else {
+ this.value__ = t.getMilliseconds();
+ }
+ }
}
Modified: gnunet-java/src/org/gnunet/util/RelativeTime.java
===================================================================
--- gnunet-java/src/org/gnunet/util/RelativeTime.java 2012-01-05 13:31:44 UTC
(rev 19000)
+++ gnunet-java/src/org/gnunet/util/RelativeTime.java 2012-01-05 13:32:22 UTC
(rev 19001)
@@ -163,7 +163,6 @@
return rel_value == FOREVER.rel_value;
}
-
public boolean equals(Object o) {
return (o instanceof RelativeTime) && ((RelativeTime) o).rel_value ==
rel_value;
}
@@ -179,7 +178,11 @@
}
public static RelativeTime fromNetwork(RelativeTimeMessage m) {
- return null;
+ if (m.value__ < 0) {
+ return RelativeTime.FOREVER;
+ } else {
+ return new RelativeTime(m.value__);
+ }
}
}
Modified: gnunet-java/src/org/gnunet/util/RelativeTimeMessage.java
===================================================================
--- gnunet-java/src/org/gnunet/util/RelativeTimeMessage.java 2012-01-05
13:31:44 UTC (rev 19000)
+++ gnunet-java/src/org/gnunet/util/RelativeTimeMessage.java 2012-01-05
13:32:22 UTC (rev 19001)
@@ -16,6 +16,10 @@
this.value__ = value;
}
+ public RelativeTimeMessage() {
+ // default constructor needed for Construct
+ }
+
public RelativeTimeMessage(final RelativeTime t) {
if (t.equals(RelativeTime.FOREVER)) {
this.value__ = -1;
Modified:
gnunet-java/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
===================================================================
--- gnunet-java/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
2012-01-05 13:31:44 UTC (rev 19000)
+++ gnunet-java/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
2012-01-05 13:32:22 UTC (rev 19001)
@@ -17,14 +17,12 @@
NetworkSizeEstimationService svc;
@Override
public void update(AbsoluteTime timestamp, double estimate, double
deviation) {
- System.out.println("est:" + estimate + " dev: " + deviation);
+ System.out.println("est:" + estimate + " dev: " + deviation + " t:
");
success = true;
svc.disconnect();
}
}
-
-
@Test
public void test_1() {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19001 - in gnunet-java: .idea lib src/org/gnunet/service src/org/gnunet/util test/org/gnunet/services,
gnunet <=