From: Tuukka Lehtonen Date: Wed, 22 Jan 2020 09:05:42 +0000 (+0000) Subject: Merge "compile method in CompileProceduralComponentTypeRequest" X-Git-Tag: v1.43.0~118 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=6fc013b9a70621230879014575b244f3714d5ba8;hp=7013a85c61754523260d2d65e35fa88a28a853c9;p=simantics%2Fplatform.git Merge "compile method in CompileProceduralComponentTypeRequest" --- diff --git a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java index 46d31fabe..559b0e702 100644 --- a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java +++ b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java @@ -496,7 +496,7 @@ public class GraphDebugger extends Composite { public Browser createBrowser(Composite parent) { try { - browser = new Browser(parent, SWT.MOZILLA); + browser = new Browser(parent, SWT.WEBKIT); } catch (SWTError e) { //System.out.println("Could not instantiate Browser: " + e.getMessage()); browser = new Browser(parent, SWT.NONE); diff --git a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/VariableDebugger.java b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/VariableDebugger.java index 697a58939..c1f47624d 100644 --- a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/VariableDebugger.java +++ b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/VariableDebugger.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Association for Decentralized Information Management + * Copyright (c) 2007, 2020 Association for Decentralized Information Management * in Industry THTH ry. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -65,7 +65,6 @@ import org.simantics.db.Session; import org.simantics.db.common.ResourceArray; import org.simantics.db.common.procedure.adapter.DisposableListener; import org.simantics.db.common.request.UnaryRead; -import org.simantics.db.common.utils.Logger; import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.SelectionHints; import org.simantics.db.layer0.request.PossibleURI; @@ -90,6 +89,8 @@ import org.simantics.utils.bytes.Base64; import org.simantics.utils.ui.ErrorLogger; import org.simantics.utils.ui.ISelectionUtils; import org.simantics.utils.ui.PathUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -98,6 +99,8 @@ import org.simantics.utils.ui.PathUtils; */ public class VariableDebugger extends Composite { + private static final Logger LOGGER = LoggerFactory.getLogger(VariableDebugger.class); + public interface HistoryListener { void historyChanged(); } @@ -166,7 +169,7 @@ public class VariableDebugger extends Composite { @Override public void exception(Throwable t) { - Logger.defaultLogError(t); + LOGGER.error("Page content listener failed unexpectedly", t); } } @@ -261,15 +264,16 @@ public class VariableDebugger extends Composite { @Override public void drop(DropTargetEvent event) { label.setBackground(null); + String uri = null; try { - String uri = parseUri(event); + uri = parseUri(event); if (uri == null) { event.detail = DND.DROP_NONE; return; } changeLocation(uri); } catch (DatabaseException e) { - Logger.defaultLogError(e); + LOGGER.error("Changing location to URI {} failed", uri, e); } } @@ -330,13 +334,14 @@ public class VariableDebugger extends Composite { @Override public void widgetSelected(SelectionEvent e) { + String uri = null; try { - String uri = text.getText(); + uri = text.getText(); // Make sure that URI is resolvable to Variable session.sync(new ResourceURIToVariable(uri)); changeLocation(uri); } catch (DatabaseException e1) { - Logger.defaultLogError(e1); + LOGGER.error("Lookup failed for URI {}", uri, e1); } } @@ -356,7 +361,7 @@ public class VariableDebugger extends Composite { public Browser createBrowser(Composite parent) { try { - browser = new Browser(parent, SWT.MOZILLA); + browser = new Browser(parent, SWT.NONE); } catch (SWTError e) { //System.out.println("Could not instantiate Browser: " + e.getMessage()); browser = new Browser(parent, SWT.NONE); @@ -594,9 +599,9 @@ public class VariableDebugger extends Composite { else return value != null ? getValue(graph, r, value) : "null"; //$NON-NLS-1$ } catch (Throwable e) { try { - Logger.defaultLogError("getValue " + r.getURI(graph), e); //$NON-NLS-1$ + LOGGER.error("getValue({})", r.getURI(graph), e); //$NON-NLS-1$ } catch (DatabaseException e1) { - Logger.defaultLogError(e1); + LOGGER.error("Failed to get URI for problematic value variable", e1); } return e.getMessage(); } @@ -634,7 +639,7 @@ public class VariableDebugger extends Composite { String encoded = Base64.encode(uri.getBytes(utf8)); return encoded; } catch (Exception e) { - Logger.defaultLogError(e); + LOGGER.error("Failed to construct link string for variable", e); //$NON-NLS-1$ return e.getMessage(); } } @@ -681,11 +686,11 @@ public class VariableDebugger extends Composite { String rviString = getRVIString(graph, var); Object node = null; if(var instanceof AbstractChildVariable) { - VariableNode vn = ((AbstractChildVariable)var).node; + VariableNode vn = ((AbstractChildVariable)var).node; if(vn != null) node = vn.node; } if(var instanceof AbstractPropertyVariable) { - VariableNode vn = ((AbstractPropertyVariable)var).node; + VariableNode vn = ((AbstractPropertyVariable)var).node; if(vn != null) node = vn.node; } diff --git a/bundles/org.simantics.desktop.product/splash.svg b/bundles/org.simantics.desktop.product/splash.svg index 8d7aa725b..b984365f4 100644 --- a/bundles/org.simantics.desktop.product/splash.svg +++ b/bundles/org.simantics.desktop.product/splash.svg @@ -401,7 +401,7 @@ id="tspan6235" x="4.0821486" y="291.79337" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.6444446px;font-family:'Cascadia Code';-inkscape-font-specification:'Cascadia Code, Normal';fill:#ffffff;fill-opacity:1;stroke-width:0.26458335px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">1.42.0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.6444446px;font-family:'Cascadia Code';-inkscape-font-specification:'Cascadia Code, Normal';fill:#ffffff;fill-opacity:1;stroke-width:0.26458335px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">1.43.0 modulesWithErrors = new ArrayList(); SCLOsgi.SOURCE_REPOSITORY.forAllModules(new TObjectProcedure() { @Override public boolean execute(String moduleName) { - System.out.print(moduleName); - System.out.print(" - "); Failable module = SCLOsgi.MODULE_REPOSITORY.getModule(moduleName); if(module.didSucceed()) - System.out.println("succeeded"); + LOGGER.trace("{} - {}", moduleName, "succeeded"); else if(module == DoesNotExist.INSTANCE) - System.out.println("does not exist"); // should not happen + LOGGER.trace("{} - {}", moduleName, "does not exist"); // should not happen else { - System.out.println("error"); + LOGGER.trace("{} - {}", moduleName, "error"); modulesWithErrors.add(moduleName); } return true; diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml index cd214cf61..0d0bc2f07 100644 --- a/features/org.simantics.sdk.feature/feature.xml +++ b/features/org.simantics.sdk.feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index f35f163fe..67ce33201 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,7 +1,7 @@ - + diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd index ddb3a1702..1d7588e26 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd @@ -1,4 +1,4 @@ -target "Simantics 1.42.0" +target "Simantics 1.43.0" with source allEnvironments diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml index 6ca55771e..c636acba4 100644 --- a/releng/org.simantics.sdk.repository/pom.xml +++ b/releng/org.simantics.sdk.repository/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.simantics.sdk.repository - 1.42.0-SNAPSHOT + 1.43.0-SNAPSHOT eclipse-repository