]> gerrit.simantics Code Review - simantics/sysdyn.git/commit
Code Review / simantics / sysdyn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 5e42de4) | patch
Merge from trunk to branch jkauttio-dev
authorjkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Tue, 11 Mar 2014 13:20:51 +0000 (13:20 +0000)
committerjkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Tue, 11 Mar 2014 13:20:51 +0000 (13:20 +0000)
commit9342a6d0af65d635d1de5b24eb5a4bb6a298a4c7
treea6f82a0f650b2d92ad7f167286c7fbc48a555f69tree | snapshot
parent5e42de459c68af699577ec5e6c4bde69c9de1057commit | diff
Merge from trunk to branch jkauttio-dev

refs #2924

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches@29075 ac1ea38d-2e2b-0410-8846-a27921b304fc
107 files changed:
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ChartComposite.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/FilteringCategoryDataset.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/FilteringPieDataset.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/NumberAxis.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/AdjustableTab.java [moved from dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/AdjustableTab.java with 89% similarity] diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/RangeComposite.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarAxisTab.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarGeneralPropertiesTab.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarSeriesTab.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/pie/PieGeneralPropertiesTab.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/pie/PieSeriesTab.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/xyline/AxisPropertyComposite.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/xyline/XYLineAxisAndVariablesTab.java diff | blob | history
dev-jkauttio/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/xyline/XYLineGeneralPropertiesTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.feature/feature.xml diff | blob | history
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdynModule [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdynModule [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdynModule [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Tester For Molecules.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/references.txt [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.tg [deleted file] blob | history
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.tg [deleted file] blob | history
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.tg [deleted file] blob | history
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.tg [deleted file] blob | history
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.tg [deleted file] blob | history
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/references.txt [new file with mode: 0644] blob
dev-jkauttio/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/plugin.xml diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementNoBounds.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/DisposeExperiment.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SysdynExperimentActivator.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportFunctionLibrary.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelAsButtonHandler.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelButtonHandler.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModuleHandler.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportFunctionLibrary.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModelHandler.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModuleHandler.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayDependencyTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayFlowTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayIndexesTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/CommentTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/DependencyTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EquationTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExperimentTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FlowTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionLibraryTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/GameExperimentTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/HistoryDataTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/InputVariableTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java [deleted file] blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LookupTableTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LoopTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleInputTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleOutputTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleParameterTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTypeTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/PlaybackExperimentTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ReferenceDependencyTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResultTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SensitivityAnalysisExperimentTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SharedFunctionLibrariesTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/VariableInformationTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/NameAndArrayRangeModifyListener.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/CompletionProcessor.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/StockExpression.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ConfidenceBoundWidget.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/SensitivityChartAxisAndVariablesTab.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/SensitivitySeriesPropertyComposite.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendView.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/validation/UnitFunction.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn.ui/sysdyn.product diff | blob | history
dev-jkauttio/org.simantics.sysdyn/META-INF/MANIFEST.MF diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParserTokenManager.java diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt diff | blob | history
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java diff | blob | history
Simantics System Dynamics with internal solver.