cyclus / cyclist2

Cyclist2
Other
1 stars 12 forks source link

Save load #113

Closed FlanFlanagan closed 9 years ago

FlanFlanagan commented 9 years ago

Needs testing, but it appears to be working.

gidden commented 9 years ago

this has merge conflicts

gidden commented 9 years ago

the build fails:

Buildfile: /home/gidden/work/cyclus/cyclist/build.xml

setup-staging-area:
   [delete] Deleting directory /home/gidden/work/cyclus/cyclist/deploy
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
     [copy] Copying 1 file to /home/gidden/work/cyclus/cyclist/deploy/externalLibs
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/externalApps
     [copy] Copying 7 files to /home/gidden/work/cyclus/cyclist/deploy/externalApps
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/project
     [copy] Copying 237 files to /home/gidden/work/cyclus/cyclist/deploy/project
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/projectRefs

compile:
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/build/src
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/build/libs
    [mkdir] Created dir: /home/gidden/work/cyclus/cyclist/deploy/build/classes
     [copy] Copying 11 files to /home/gidden/work/cyclus/cyclist/deploy/build/libs
     [copy] Copying 237 files to /home/gidden/work/cyclus/cyclist/deploy/build/src
    [javac] Compiling 230 source files to /home/gidden/work/cyclus/cyclist/deploy/build/classes
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:29: error: package org.json.simple does not exist
    [javac] import org.json.simple.JSONObject;
    [javac]                       ^
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:30: error: package org.json.simple does not exist
    [javac] import org.json.simple.JSONValue;
    [javac]                       ^
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:510: error: cannot find symbol
    [javac]     static JSONObject outputFacility(facilityNode facility){
    [javac]            ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:532: error: cannot find symbol
    [javac]     static JSONObject outputInstitution(instituteNode institute){
    [javac]            ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:550: error: cannot find symbol
    [javac]     static JSONObject outputRegion(regionNode region){
    [javac]            ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:441: error: cannot find symbol
    [javac]             JSONObject ui = new JSONObject();
    [javac]             ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:441: error: cannot find symbol
    [javac]             JSONObject ui = new JSONObject();
    [javac]                                 ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:442: error: cannot find symbol
    [javac]             JSONObject facs = new JSONObject();
    [javac]             ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:442: error: cannot find symbol
    [javac]             JSONObject facs = new JSONObject();
    [javac]                                   ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:448: error: cannot find symbol
    [javac]             JSONObject inst = new JSONObject();
    [javac]             ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:448: error: cannot find symbol
    [javac]             JSONObject inst = new JSONObject();
    [javac]                                   ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:454: error: cannot find symbol
    [javac]             JSONObject reg = new JSONObject();
    [javac]             ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:454: error: cannot find symbol
    [javac]             JSONObject reg = new JSONObject();
    [javac]                                  ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:480: error: cannot find symbol
    [javac]             JSONObject json = (JSONObject) JSONValue.parse(uiString);
    [javac]             ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:480: error: cannot find symbol
    [javac]             JSONObject json = (JSONObject) JSONValue.parse(uiString);
    [javac]                                ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:480: error: cannot find symbol
    [javac]             JSONObject json = (JSONObject) JSONValue.parse(uiString);
    [javac]                                            ^
    [javac]   symbol:   variable JSONValue
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:516: error: cannot find symbol
    [javac]         JSONObject facObject = new JSONObject();
    [javac]         ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:516: error: cannot find symbol
    [javac]         JSONObject facObject = new JSONObject();
    [javac]                                    ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:537: error: cannot find symbol
    [javac]         JSONObject institObject = new JSONObject();
    [javac]         ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:537: error: cannot find symbol
    [javac]         JSONObject institObject = new JSONObject();
    [javac]                                       ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:555: error: cannot find symbol
    [javac]         JSONObject regionObject = new JSONObject();
    [javac]         ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/OutPut.java:555: error: cannot find symbol
    [javac]         JSONObject regionObject = new JSONObject();
    [javac]                                       ^
    [javac]   symbol:   class JSONObject
    [javac]   location: class OutPut
    [javac] Note: /home/gidden/work/cyclus/cyclist/deploy/build/src/edu/utexas/cycic/TimelineDisplay.java uses or overrides a deprecated API.
    [javac] Note: Recompile with -Xlint:deprecation for details.
    [javac] Note: Some input files use unchecked or unsafe operations.
    [javac] Note: Recompile with -Xlint:unchecked for details.
    [javac] 22 errors

BUILD FAILED
/home/gidden/work/cyclus/cyclist/build.xml:141: Compile failed; see the compiler error output for details.

Total time: 11 seconds
gidden commented 9 years ago

ok, merge conflicts again

gidden commented 9 years ago

(these are probably my fault)

gidden commented 9 years ago

hey @FlanFlanagan, I merged this and pushed to the release branch manually. it works pretty well, I had some trouble saving a file, loading it, and saving it again. but we at least can save once and load once. progress!