[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20957 - in gnunet-java: . .idea src/org/gnunet/core src/or
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r20957 - in gnunet-java: . .idea src/org/gnunet/core src/org/gnunet/dht |
|
Date: |
Thu, 12 Apr 2012 11:00:04 +0200 |
Author: dold
Date: 2012-04-12 11:00:04 +0200 (Thu, 12 Apr 2012)
New Revision: 20957
Modified:
gnunet-java/.idea/workspace.xml
gnunet-java/ISSUES
gnunet-java/src/org/gnunet/core/Core.java
gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
Log:
still experimenting with core, updated issues
Modified: gnunet-java/.idea/workspace.xml
===================================================================
--- gnunet-java/.idea/workspace.xml 2012-04-12 08:43:48 UTC (rev 20956)
+++ gnunet-java/.idea/workspace.xml 2012-04-12 09:00:04 UTC (rev 20957)
@@ -4,41 +4,13 @@
<option name="ANALYZE_TEST_SOURCES" value="false" />
</component>
<component name="ChangeListManager">
- <list default="true" readonly="true"
id="92cdd5e3-f1ea-4d90-81fc-cf0bd20d2d2e" name="Default" comment="">
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/core" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/test/org/gnunet/util" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/Constructable.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/FixedSizeByteArray.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeByteArrayParser.java"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/core/Core.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/HashCodeMessage.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/IntEnum.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/PeerIdentityMessage.java" />
- <change type="MOVED"
beforePath="$PROJECT_DIR$/test/org/gnunet/construct/GetoptTest.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/util/GetoptTest.java" />
+ <list default="true" readonly="true"
id="92cdd5e3-f1ea-4d90-81fc-cf0bd20d2d2e" name="Default" comment="more parts of
Core implemented, still major problems">
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/libraries/commons_io_2_2.xml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml"
afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ISSUES"
afterPath="$PROJECT_DIR$/ISSUES" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/doc/gnunet-exercise.tex"
afterPath="$PROJECT_DIR$/doc/gnunet-exercise.tex" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/MsgMap.txt"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/MsgMap.txt" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/ReflectUtil.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/ReflectUtil.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/ByteFillParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/ByteFillParser.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/DoubleParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/DoubleParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeArrayParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeArrayParser.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/StringParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/StringParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/UnionParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/UnionParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/core/Core.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/core/Core.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.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/HashCode.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/HashCode.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$/src/org/gnunet/util/getopt/OptionAction.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/OptionAction.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java" />
</list>
<ignored path="gnunet-java.iws" />
<ignored path=".idea/workspace.xml" />
@@ -96,83 +68,84 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="DistributedHashTable.java" pinned="false"
current="true" current-in-tab="true">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
+ <file leaf-file-name="ATSInformation.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/ATSInformation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="347" column="38" selection-start="9881"
selection-end="9881" vertical-scroll-proportion="8.403134">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#7850#7862#0" expanded="true" />
- </folding>
+ <state line="13" column="0" selection-start="222"
selection-end="222" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Parser.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java">
+ <file leaf-file-name="ISSUES" pinned="false" current="true"
current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/ISSUES">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="17" selection-start="124"
selection-end="124" vertical-scroll-proportion="0.0">
+ <state line="352" column="31" selection-start="12564"
selection-end="12564" vertical-scroll-proportion="0.67971015">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PeerIdentityMessage.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/PeerIdentityMessage.java">
+ <file leaf-file-name="DistributedHashTable.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="229"
selection-end="229" vertical-scroll-proportion="0.0">
+ <state line="441" column="0" selection-start="12777"
selection-end="12777" vertical-scroll-proportion="0.0">
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="e#14218#14658#0" expanded="true" />
+ <element signature="e#14635#14636#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HashCodeMessage.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/HashCodeMessage.java">
+ <file leaf-file-name="Statistics.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="125"
selection-end="125" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="207" column="21" selection-start="6721"
selection-end="6721" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HashCode.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/HashCode.java">
+ <file leaf-file-name="gnunet-exercise.tex" pinned="false"
current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/doc/gnunet-exercise.tex">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="13" selection-start="183"
selection-end="183" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="16" column="21" selection-start="488"
selection-end="488" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="Core.java" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/core/Core.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="13" selection-start="468"
selection-end="468" vertical-scroll-proportion="0.0">
- <folding />
+ <state line="376" column="7" selection-start="9067"
selection-end="9067" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="e#12677#13485#0" expanded="true" />
+ <element signature="e#13466#13467#0" expanded="true" />
+ <element signature="e#13533#13791#0" expanded="true" />
+ <element signature="e#13772#13773#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="VariableSizeArrayParser.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java">
+ <file leaf-file-name="Service.java" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Service.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="13" selection-start="224"
selection-end="224" vertical-scroll-proportion="0.0">
+ <state line="3" column="22" selection-start="49"
selection-end="49" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UnionParser.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/UnionParser.java">
+ <file leaf-file-name="Server.java" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Server.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="70" column="0" selection-start="2408"
selection-end="2408" vertical-scroll-proportion="-18.04">
- <folding />
+ <state line="85" column="5" selection-start="1515"
selection-end="1515" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="e#957#978#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -180,19 +153,18 @@
<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="89" column="40" selection-start="2767"
selection-end="2769" vertical-scroll-proportion="-15.12">
+ <state line="348" column="42" selection-start="11249"
selection-end="11249" vertical-scroll-proportion="0.0">
<folding>
- <element signature="imports" expanded="true" />
- <element signature="e#3682#3720#0" expanded="true" />
+ <element signature="e#3681#3719#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="FillParser.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="0" selection-start="1335"
selection-end="1335" vertical-scroll-proportion="0.0">
+ <state line="62" column="9" selection-start="2011"
selection-end="2011" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -208,30 +180,30 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/FixedSizeByteArray.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeByteArrayParser.java"
/>
- <option value="$PROJECT_DIR$/src/org/gnunet/util/HashCodeMessage.java"
/>
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/ReflectUtil.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeArrayParser.java"
/>
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/ByteFillParser.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
- <option value="$PROJECT_DIR$/ISSUES" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/HashCode.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/util/PeerIdentityMessage.java" />
+ <option
value="$PROJECT_DIR$/test/org/gnunet/construct/QueryMessage.java" />
+ <option
value="$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/construct/IntegerFill.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillIntegerParser.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerFillParser.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/PeerIdentity.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/util/RunaboutMessageReceiver.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Server.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Strings.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java"
/>
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/UnionParser.java" />
+ <option value="$PROJECT_DIR$/doc/gnunet-exercise.tex" />
<option
value="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/core/Core.java" />
+ <option value="$PROJECT_DIR$/ISSUES" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-6" />
<option name="y" value="17" />
- <option name="width" value="1452" />
- <option name="height" value="889" />
+ <option name="width" value="1460" />
+ <option name="height" value="892" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -259,8 +231,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="PackagesPane" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -307,9 +277,17 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="lib" />
+ <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>
<PATH>
<PATH_ELEMENT>
@@ -321,12 +299,80 @@
<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="statistics" />
+ <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="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="core" />
+ <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="doc" />
+ <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="bin" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -425,7 +471,9 @@
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
@@ -514,7 +562,7 @@
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
- <component name="SvnConfiguration" maxAnnotateRevisions="500">
+ <component name="SvnConfiguration" maxAnnotateRevisions="500"
myUseAcceleration="nothing" myAutoUpdateAfterCommit="false"
cleanupOnStartRun="true">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="mySSHConnectionTimeout" value="30000" />
@@ -556,27 +604,27 @@
</option>
</component>
<component name="ToolWindowManager">
- <frame x="-6" y="17" width="1452" height="889" extended-state="0" />
+ <frame x="-6" y="17" width="1460" height="892" extended-state="6" />
<editor active="true" />
<layout>
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3292011" sideWeight="0.5" 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.33" 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="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63736266"
sideWeight="0.5" order="1" 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.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24841213"
sideWeight="0.6735254" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3282967"
sideWeight="0.5" 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.24982257" sideWeight="0.6318681" 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.32967034" sideWeight="0.5" 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.24982257" sideWeight="0.6318681" 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.32647464"
sideWeight="0.5" 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.32967034" sideWeight="0.5" 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.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24982257"
sideWeight="0.6703297" order="0" 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.32692307"
sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3997253" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
<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="Ant Build" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" 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.63736266"
sideWeight="0.5" 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.3997253" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -612,8 +660,11 @@
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
+ <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+ <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="changed GnunetMessage to use
unions" />
+ <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
+ <option name="LAST_COMMIT_MESSAGE" value="updated issues, doc" />
<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" />
@@ -627,132 +678,134 @@
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="changed GnunetMessage to use unions" />
+ <MESSAGE value="more parts of Core implemented, still major problems" />
+ <MESSAGE value="updated issues, doc" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="179" column="28" selection-start="6291"
selection-end="6291" vertical-scroll-proportion="0.0">
+ <state line="161" column="33" selection-start="5773"
selection-end="5773" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/ISSUES">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/PeerIdentity.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="320" column="87" selection-start="11358"
selection-end="11358" vertical-scroll-proportion="0.0">
+ <state line="15" column="13" selection-start="390" selection-end="390"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Program.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="13" selection-start="1209"
selection-end="1209" vertical-scroll-proportion="0.0">
+ <state line="11" column="22" selection-start="282" selection-end="282"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/UnionTest.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/MessageReceiver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="13" selection-start="123" selection-end="123"
vertical-scroll-proportion="0.0">
+ <state line="27" column="17" selection-start="919" selection-end="919"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/StringMessage.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/GnunetMessage.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">
+ <state line="5" column="19" selection-start="78" selection-end="78"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/VarTestMessage.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.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">
+ <state line="41" column="13" selection-start="1472"
selection-end="1472" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/ATSInformation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="0" selection-start="1335"
selection-end="1335" vertical-scroll-proportion="0.0">
+ <state line="13" column="0" selection-start="222" selection-end="222"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="13" selection-start="224" selection-end="224"
vertical-scroll-proportion="0.0">
- <folding />
+ <state line="348" column="42" selection-start="11249"
selection-end="11249" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="e#3681#3719#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="13" selection-start="468" selection-end="468"
vertical-scroll-proportion="0.0">
+ <state line="62" column="9" selection-start="2011"
selection-end="2011" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/HashCode.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Service.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="13" selection-start="183" selection-end="183"
vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="3" column="22" selection-start="49" selection-end="49"
vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/HashCodeMessage.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Server.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="125" selection-end="125"
vertical-scroll-proportion="0.0">
+ <state line="85" column="5" selection-start="1515"
selection-end="1515" vertical-scroll-proportion="0.0">
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="e#957#978#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/PeerIdentityMessage.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="229" selection-end="229"
vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="207" column="21" selection-start="6721"
selection-end="6721" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="89" column="40" selection-start="2767"
selection-end="2769" vertical-scroll-proportion="-15.12">
+ <state line="441" column="0" selection-start="12777"
selection-end="12777" vertical-scroll-proportion="0.0">
<folding>
- <element signature="imports" expanded="true" />
- <element signature="e#3682#3720#0" expanded="true" />
+ <element signature="e#14218#14658#0" expanded="true" />
+ <element signature="e#14635#14636#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java">
+ <entry file="file://$PROJECT_DIR$/doc/gnunet-exercise.tex">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="17" selection-start="124" selection-end="124"
vertical-scroll-proportion="0.0">
+ <state line="16" column="21" selection-start="488" selection-end="488"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/UnionParser.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/core/Core.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="70" column="0" selection-start="2408"
selection-end="2408" vertical-scroll-proportion="-18.04">
- <folding />
+ <state line="376" column="7" selection-start="9067"
selection-end="9067" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="e#12677#13485#0" expanded="true" />
+ <element signature="e#13466#13467#0" expanded="true" />
+ <element signature="e#13533#13791#0" expanded="true" />
+ <element signature="e#13772#13773#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
+ <entry file="file://$PROJECT_DIR$/ISSUES">
<provider selected="true" editor-type-id="text-editor">
- <state line="347" column="38" selection-start="9881"
selection-end="9881" vertical-scroll-proportion="8.403134">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#7850#7862#0" expanded="true" />
- </folding>
+ <state line="352" column="31" selection-start="12564"
selection-end="12564" vertical-scroll-proportion="0.67971015">
+ <folding />
</state>
</provider>
</entry>
Modified: gnunet-java/ISSUES
===================================================================
--- gnunet-java/ISSUES 2012-04-12 08:43:48 UTC (rev 20956)
+++ gnunet-java/ISSUES 2012-04-12 09:00:04 UTC (rev 20957)
@@ -347,6 +347,13 @@
========================================================================================
+
+* message dispatching with runabout: what can go wrong with inheritance and
how do we solve it
+ * an idea: inspect what messages a speciffic runabout can handle, record
their IDs,
+ match IDs on message receive
+
+
+
* are we in a hurry? when should gnunet-java be usable to students?
* according to the website the project begins very soon
* currently my progress with the tutorial is not that far, as the java APIs
are not
Modified: gnunet-java/src/org/gnunet/core/Core.java
===================================================================
--- gnunet-java/src/org/gnunet/core/Core.java 2012-04-12 08:43:48 UTC (rev
20956)
+++ gnunet-java/src/org/gnunet/core/Core.java 2012-04-12 09:00:04 UTC (rev
20957)
@@ -376,7 +376,7 @@
// XXX: only temporary for debugging
initOptions |= CoreOption.SEND_FULL_INBOUND.val;
- initOptions |= CoreOption.SEND_FULL_OUTBOUND.val;
+ initOptions |= CoreOption.SEND_HDR_OUTBOUND.val;
this.connectHandler = b.connectHandler;
this.disconnectHandler = b.disconnectHandler;
@@ -396,6 +396,8 @@
public class CoreReceiver extends RunaboutMessageReceiver {
public void visit(ConnectNotifyMessage m) {
+ logger.info("got connectnotify");
+
if (connectHandler != null) {
connectHandler.onConnect(m.peer);
}
@@ -403,6 +405,8 @@
}
public void visit(InitReplyMessage m) {
+ logger.info("got initreply");
+
myIdentity = m.myIdentity;
if (init != null) {
init.onInit(m.myIdentity);
@@ -412,16 +416,19 @@
}
public void visit(NotifyInboundTrafficMessage m) {
+ logger.info("got NotifyInbount");
+
client.receive(RelativeTime.FOREVER, this);
}
public void visit(NotifyOutboundTrafficMessage m) {
- System.out.println("outbound");
+ logger.info("got NotifyOutbound");
client.receive(RelativeTime.FOREVER, this);
}
public void visit(SendMessageReady m) {
+ logger.info("got SendMessageReady");
// todo: ...
Modified: gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/DistributedHashTable.java 2012-04-12
08:43:48 UTC (rev 20956)
+++ gnunet-java/src/org/gnunet/dht/DistributedHashTable.java 2012-04-12
09:00:04 UTC (rev 20957)
@@ -323,6 +323,17 @@
private final ResponseDispatcher rh = new ResponseDispatcher();
+ /**
+ *
+ * @param timeout
+ * @param type
+ * @param key
+ * @param replication
+ * @param routeOptions
+ * @param xquery
+ * @param cb
+ * @return
+ */
public Cancelable startGet(RelativeTime timeout, BlockType type, HashCode
key,
int replication, int routeOptions,
byte[] xquery, ResultCallback cb) {
@@ -429,8 +440,6 @@
return;
}
-
-
if (modePut) {
if (data == null) {
System.out.println("data required on put");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20957 - in gnunet-java: . .idea src/org/gnunet/core src/org/gnunet/dht,
gnunet <=