From 2e3ff6ba450ca80d7cb4522cf6fa3a99587a484b Mon Sep 17 00:00:00 2001 From: Antti Villberg Date: Fri, 16 Nov 2018 15:11:00 +0200 Subject: [PATCH] Moved around packages a bit gitlab #206 Change-Id: I2366b6e7395750cc9b6649abd3e77ef1661d2d1f --- .../simantics/spreadsheet/graph/SpreadsheetGraphUtils.java | 2 +- .../spreadsheet/graph/SpreadsheetSessionManager.java | 2 +- .../META-INF/MANIFEST.MF | 3 +-- .../{ => client}/ContinuousSynchronizationJob.java | 2 +- .../{ => client}/StructuralChangeFlattener.java | 2 +- .../synchronization/{ => client}/Synchronizer.java | 2 +- .../{base => client}/UpdateComponentUids.java | 2 +- .../META-INF/MANIFEST.MF | 3 +-- .../AbstractSynchronizationEventHandler.java | 7 +------ 9 files changed, 9 insertions(+), 16 deletions(-) rename bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/{ => client}/ContinuousSynchronizationJob.java (97%) rename bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/{ => client}/StructuralChangeFlattener.java (99%) rename bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/{ => client}/Synchronizer.java (99%) rename bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/{base => client}/UpdateComponentUids.java (98%) rename bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/{base2 => protocol}/AbstractSynchronizationEventHandler.java (96%) diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetGraphUtils.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetGraphUtils.java index 297ac9dc9..032acfcfc 100644 --- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetGraphUtils.java +++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetGraphUtils.java @@ -38,7 +38,7 @@ import org.simantics.spreadsheet.Range; import org.simantics.spreadsheet.graph.synchronization.SpreadsheetSynchronizationEventHandler; import org.simantics.spreadsheet.resource.SpreadsheetResource; import org.simantics.spreadsheet.util.SpreadsheetUtils; -import org.simantics.structural.synchronization.Synchronizer; +import org.simantics.structural.synchronization.client.Synchronizer; import gnu.trove.iterator.TObjectIntIterator; import gnu.trove.map.hash.TObjectIntHashMap; diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetSessionManager.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetSessionManager.java index f50463ef0..ec8935f28 100644 --- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetSessionManager.java +++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetSessionManager.java @@ -23,7 +23,7 @@ import org.simantics.simulator.toolkit.db.StandardVariableSessionManager; import org.simantics.spreadsheet.graph.formula.SpreadsheetEvaluationEnvironment; import org.simantics.spreadsheet.graph.synchronization.SpreadsheetSynchronizationEventHandler; import org.simantics.spreadsheet.resource.SpreadsheetResource; -import org.simantics.structural.synchronization.Synchronizer; +import org.simantics.structural.synchronization.client.Synchronizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.simantics.structural.synchronization.client/META-INF/MANIFEST.MF b/bundles/org.simantics.structural.synchronization.client/META-INF/MANIFEST.MF index 6fe0a79e0..ba77d3e37 100644 --- a/bundles/org.simantics.structural.synchronization.client/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.structural.synchronization.client/META-INF/MANIFEST.MF @@ -13,6 +13,5 @@ Require-Bundle: org.simantics.databoard;bundle-version="0.6.5", org.simantics.datatypes.ontology;bundle-version="1.1.0", org.simantics.structural.synchronization;bundle-version="1.0.0";visibility:=reexport, org.slf4j.api -Export-Package: org.simantics.structural.synchronization, - org.simantics.structural.synchronization.base +Export-Package: org.simantics.structural.synchronization.client Automatic-Module-Name: org.simantics.structural.synchronization.client diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/ContinuousSynchronizationJob.java b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/ContinuousSynchronizationJob.java similarity index 97% rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/ContinuousSynchronizationJob.java rename to bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/ContinuousSynchronizationJob.java index 4b4edd7c4..47e9fa004 100644 --- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/ContinuousSynchronizationJob.java +++ b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/ContinuousSynchronizationJob.java @@ -1,4 +1,4 @@ -package org.simantics.structural.synchronization; +package org.simantics.structural.synchronization.client; import java.util.concurrent.ConcurrentMap; diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/StructuralChangeFlattener.java b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/StructuralChangeFlattener.java similarity index 99% rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/StructuralChangeFlattener.java rename to bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/StructuralChangeFlattener.java index 2809c5836..4503a82ea 100644 --- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/StructuralChangeFlattener.java +++ b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/StructuralChangeFlattener.java @@ -1,4 +1,4 @@ -package org.simantics.structural.synchronization; +package org.simantics.structural.synchronization.client; import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.TObjectIntHashMap; diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/Synchronizer.java b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/Synchronizer.java similarity index 99% rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/Synchronizer.java rename to bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/Synchronizer.java index 9c7428416..b2b4ea2ec 100644 --- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/Synchronizer.java +++ b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/Synchronizer.java @@ -1,4 +1,4 @@ -package org.simantics.structural.synchronization; +package org.simantics.structural.synchronization.client; import gnu.trove.map.hash.TObjectIntHashMap; import gnu.trove.set.hash.THashSet; diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/UpdateComponentUids.java b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/UpdateComponentUids.java similarity index 98% rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/UpdateComponentUids.java rename to bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/UpdateComponentUids.java index df63ada05..7209a19d6 100644 --- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/UpdateComponentUids.java +++ b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/client/UpdateComponentUids.java @@ -1,4 +1,4 @@ -package org.simantics.structural.synchronization.base; +package org.simantics.structural.synchronization.client; import org.eclipse.core.runtime.IProgressMonitor; import org.simantics.db.ReadGraph; diff --git a/bundles/org.simantics.structural.synchronization/META-INF/MANIFEST.MF b/bundles/org.simantics.structural.synchronization/META-INF/MANIFEST.MF index 63d4a6832..5e5454903 100644 --- a/bundles/org.simantics.structural.synchronization/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.structural.synchronization/META-INF/MANIFEST.MF @@ -4,8 +4,7 @@ Bundle-Name: Synchronization Bundle-SymbolicName: org.simantics.structural.synchronization;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.simantics.structural.synchronization.base2, - org.simantics.structural.synchronization.protocol, +Export-Package: org.simantics.structural.synchronization.protocol, org.simantics.structural.synchronization.utils Require-Bundle: org.simantics.databoard;bundle-version="0.6.5", org.eclipse.core.runtime;bundle-version="3.7.0", diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base2/AbstractSynchronizationEventHandler.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/protocol/AbstractSynchronizationEventHandler.java similarity index 96% rename from bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base2/AbstractSynchronizationEventHandler.java rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/protocol/AbstractSynchronizationEventHandler.java index 8dc051a7a..58bbbf0b3 100644 --- a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base2/AbstractSynchronizationEventHandler.java +++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/protocol/AbstractSynchronizationEventHandler.java @@ -1,4 +1,4 @@ -package org.simantics.structural.synchronization.base2; +package org.simantics.structural.synchronization.protocol; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; @@ -8,11 +8,6 @@ import java.util.Collection; import java.util.Map; import org.simantics.databoard.util.URIStringUtils; -import org.simantics.structural.synchronization.protocol.ChildInfo; -import org.simantics.structural.synchronization.protocol.Connection; -import org.simantics.structural.synchronization.protocol.SerializedVariable; -import org.simantics.structural.synchronization.protocol.SynchronizationEventHandler; -import org.simantics.structural.synchronization.protocol.SynchronizationException; /** *

A partial implementation of SynchronizationEventHandler that contains all generic -- 2.47.1