Fix error by change tabletype and close session (#1953)

* Fix error by change tabletype and close session

* Remove doens't exist recent path

Author: TruongQuangSB

java/bundles/org.eclipse.set.application/src/org/eclipse/set/application/cacheservice/CacheServiceImpl.java

@@ -71,7 +71,10 @@ private void invalidate(final ToolboxFileRole role) {
 					.flatMap(ele -> ele.values().stream())
 					.forEach(Cache::invalidate);
 		} else {
-			caches.get(role).values().forEach(Cache::invalidate);
+			caches.computeIfPresent(role, (k, v) -> {
+				v.values().forEach(Cache::invalidate);
+				return v;
+			});
 		}
 
 	}

java/bundles/org.eclipse.set.application/src/org/eclipse/set/application/controlarea/ControlAreaSelectionControl.java

@@ -110,7 +110,6 @@ public ControlAreaSelectionControl(final Composite parent,
 		createCombo(parent);
 		// Reset combo value, when close session
 		broker.subscribe(Events.CLOSE_SESSION, this::closeSession);
-		broker.subscribe(Events.MODEL_CHANGED, this::sessionChanged);
 	}
 
 	private void createCombo(final Composite parent) {
@@ -131,6 +130,9 @@ public void accept(final NewTableTypeEvent t) {
 			}
 		};
 
+		ToolboxEvents.subscribe(broker, NewTableTypeEvent.class,
+				newTableTypeHandler);
+
 		// register for session changes
 		application.getContext().runAndTrack(new RunAndTrack() {
 			@Override
@@ -389,18 +391,6 @@ private void closeSession(final Event event) {
 		final Object property = event.getProperty(IEventBroker.DATA);
 		if (property instanceof final ToolboxFileRole role
 				&& role.equals(ToolboxFileRole.SESSION)) {
-			ToolboxEvents.unsubscribe(broker, newTableTypeHandler);
-			// Reset combo to default
-			initCombo();
-		}
-	}
-
-	private void sessionChanged(final Event event) {
-		final Object property = event.getProperty(IEventBroker.DATA);
-		if (property instanceof final ToolboxFileRole role
-				&& role.equals(ToolboxFileRole.SESSION)) {
-			ToolboxEvents.subscribe(broker, NewTableTypeEvent.class,
-					newTableTypeHandler);
 			// Reset combo to default
 			initCombo();
 		}

java/bundles/org.eclipse.set.application/src/org/eclipse/set/application/handler/OpenPlanProHandler.java

@@ -119,7 +119,9 @@ protected String getTaskMessage() {
 	@Override
 	protected IModelSession validation(final IModelSession modelSession,
 			final Shell shell, final Path path) {
-		if (modelSession == null) {
+		if (modelSession == null || modelSession.getToolboxFile()
+				.getRole() != ToolboxFileRole.SESSION
+				&& modelSession.getPlanProSchnittstelle() == null) {
 			return null;
 		}
 		switch (modelSession.getFileValidateState()) {

java/bundles/org.eclipse.set.application/src/org/eclipse/set/application/tabletype/TableTypeSelectionControl.java

@@ -119,8 +119,6 @@ private void createTableCombo(final Composite parent) {
 			@Override
 			public boolean changed(final IEclipseContext context) {
 				setCombo(context.get(IModelSession.class));
-				ToolboxEvents.send(broker,
-						new NewTableTypeEvent(oldSelectedValue));
 				return true;
 			}
 		});

java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/configurationservice/UserConfigurationServiceImpl.java

@@ -113,6 +113,10 @@ protected void loadConfiguration() {
 						/* */});
 			configuration = (UserConfiguration) objectReader
 					.readValue(configurationFile);
+			configuration.lastOpenFiles.removeIf(p -> !p.toFile().exists());
+			configuration.lastOpenCompareFiles
+					.removeIf(p -> !p.toFile().exists());
+			saveConfiguration();
 		} catch (final IOException e) {
 			// If the configuration isn't valid, create a new one
 			configuration = new UserConfiguration();
@@ -198,6 +202,10 @@ public void setLastExportPath(final Path path) {
 
 	@Override
 	public Optional<Path> getLastFileOpenPath(final ToolboxFileRole role) {
+		if (configuration.lastFileOpenPath != null
+				&& !configuration.lastFileOpenPath.toFile().exists()) {
+			return Optional.empty();
+		}
 		return Optional.ofNullable(configuration.lastFileOpenPath);
 	}
 
@@ -237,6 +245,5 @@ private List<Path> getPathList(final ToolboxFileRole role) {
 			return getPathList(role);
 		}
 		return list;
-
 	}
 }

java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/session/ModelSession.java

@@ -21,6 +21,7 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.io.FileUtils;
@@ -231,12 +232,15 @@ public ModelSession(final ToolboxFile toolboxFile,
 		final IModelSession session = this;
 		final EditingDomain editingDomain = toolboxFile.getEditingDomain();
 		editingDomain.getCommandStack().addCommandStackListener(event -> {
-			setTitleFilename(IModelSessionExtensions.getTitleFilename(session,
-					ModelSession.this.serviceProvider.messages.ModelSession_ChangeIndicator));
-			ModelSession.this.serviceProvider.broker.post(
-					UIEvents.REQUEST_ENABLEMENT_UPDATE_TOPIC,
-					UIEvents.ALL_ELEMENT_ID);
 			checkForDirtyEvent();
+			if (isDirty()) {
+				setTitleFilename(IModelSessionExtensions.getTitleFilename(
+						session,
+						ModelSession.this.serviceProvider.messages.ModelSession_ChangeIndicator));
+				ModelSession.this.serviceProvider.broker.post(
+						UIEvents.REQUEST_ENABLEMENT_UPDATE_TOPIC,
+						UIEvents.ALL_ELEMENT_ID);
+			}
 		});
 		guid = Guid.create();
 		this.tempDir = tempDir;
@@ -598,6 +602,7 @@ public void init() {
 			}
 		} catch (final IOException e) {
 			serviceProvider.dialogService.error(mainWindow, e);
+			cleanUp();
 		} finally {
 			if (getPlanProSchnittstelle() != null) {
 				setNature();
@@ -984,6 +989,15 @@ protected void readModel() throws IOException {
 		} else {
 			final ModelContents modelContents = serviceProvider.modelLoader
 					.loadModel(toolboxFile, this::setValidationResult);
+			if (toolboxFile.getRole() != ToolboxFileRole.SESSION
+					&& modelContents.schnittStelle() == null) {
+				final String errorMsg = schnittstelleValidationResult
+						.getIoErrors()
+						.stream()
+						.map(Exception::getMessage)
+						.collect(Collectors.joining());
+				throw new IOException(errorMsg);
+			}
 			setPlanProSchnittstelle(modelContents.schnittStelle());
 			setPlanProLayoutinfo(modelContents.layoutInfo());
 		}
@@ -1042,7 +1056,8 @@ void setTitleFilename(final String filename) {
 			final String[] split = title.split(String.format("%s|%s", //$NON-NLS-1$
 					TITLE_SEPARATOR, TITLE_FILE_NAME_SEPARATOR));
 			final String titleProgrammPart = split[0];
-			if (toolboxFile.getRole() == ToolboxFileRole.COMPARE_PLANNING) {
+			if (toolboxFile.getRole() == ToolboxFileRole.COMPARE_PLANNING
+					&& split.length > 1) {
 				final String titleFileName = titleProgrammPart + TITLE_SEPARATOR
 						+ split[1];
 				if (filename == null) {

java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/session/SetSessionService.java

@@ -140,9 +140,8 @@ public boolean close(final IModelSession modelSession,
 		}
 
 		// show the no session part
-		if (getToolboxPartService()
-				.showPart(ToolboxConstants.NO_SESSION_PART_ID)
-				|| role == ToolboxFileRole.SESSION) {
+		if (role == ToolboxFileRole.SESSION && getToolboxPartService()
+				.showPart(ToolboxConstants.NO_SESSION_PART_ID)) {
 			loadedModels.keySet().forEach(this::closeLoadedSession);
 
 			actionItems.clear();

web/siteplan/src/components/FeatureService.vue

@@ -137,7 +137,7 @@ export default class FeatureService extends Vue {
     // Download the current model
     const modelType = store.state.planproModelType
     axios
-      .get<SiteplanModel>(`/${modelType}.json`)
+      .get<SiteplanModel>('/siteplanKR.json')
       .then(response => {
         this.modelLoaded(response.data)
         store.commit('setLoading', false)