Merge branch 'develop'

de.prob.core/src/de/prob/cli/clipatterns/PortPattern.java

-/**
- * 
- */
-package de.prob.cli.clipatterns;
-
-import java.util.regex.Matcher;
-
-import de.prob.cli.CliException;
-import de.prob.logging.Logger;
-
-/**
- * This {@link CliPattern} looks for a network port number where the executable
- * listens for commands.
- * 
- * If no port number is found, {@link #notFound()} throws a {@link CliException}
- * 
- * @author plagge
- */
-public class PortPattern extends CliPattern<Integer> {
-	int port;
-
-	public PortPattern() {
-		super("Port: (\\d+)$");
-	}
-
-	@Override
-	protected void setValue(Matcher matcher) throws IllegalArgumentException {
-		port = Integer.parseInt(matcher.group(1));
-		Logger.info("Server has startet and listens on port " + port);
-	}
-
-	/**
-	 * Returns the port number.
-	 */
-	@Override
-	public Integer getValue() {
-		return port;
-	}
-
-	@Override
-	public void notFound() throws CliException {
-		throw new CliException("Could not determine port of ProB server");
-	}
-
-}

de.prob.core/src/de/prob/core/command/AnalyseInvariantCommand.java

-package de.prob.core.command;
-
-import de.prob.parser.ISimplifiedROMap;
-import de.prob.prolog.output.IPrologTermOutput;
-import de.prob.prolog.term.ListPrologTerm;
-import de.prob.prolog.term.PrologTerm;
-
-public class AnalyseInvariantCommand implements ISimpleTextCommand {
-
-	private static final String UNKNOWN = "Unknown";
-	private static final String FALSE = "False";
-	private static final String TOTAL = "Total";
-	private static final String RESULT = "Result";
-	private static final String DESCRIPTION = "Desc";
-	private StringBuffer text;
-
-	@Override
-	public void writeCommand(IPrologTermOutput pto) {
-		// analyse_predicate(Type,Desc,Result,Total,False,Unknown)
-		pto.openTerm("analyse_predicate").printAtom("invariant")
-				.printVariable(DESCRIPTION).printVariable(RESULT)
-				.printVariable(TOTAL).printVariable(FALSE)
-				.printVariable(UNKNOWN).closeTerm();
-	}
-
-	@Override
-	public void processResult(ISimplifiedROMap<String, PrologTerm> bindings)
-			throws CommandException {
-		text = new StringBuffer();
-		text.append("Analysed: " + bindings.get(DESCRIPTION) + "\n");
-		text.append("-------------------------------------\n");
-		ListPrologTerm r = (ListPrologTerm) bindings.get(RESULT);
-		for (PrologTerm term : r) {
-			text.append(term);
-			text.append('\n');
-		}
-		text.append("-------------------------------------\n");
-		text.append("Total: " + bindings.get(TOTAL)+ "\n");
-		text.append("False: " + bindings.get(FALSE)+ "\n");
-		text.append("Unknown: " + bindings.get(UNKNOWN));
-	}
-
-	@Override
-	public String getResultingText() {
-		return text.toString();
-	}
-
-}

de.prob.core/src/de/prob/core/command/ISimpleTextCommand.java

-package de.prob.core.command;
-
-public interface ISimpleTextCommand extends IComposableCommand{
-	String getResultingText();
-}

de.prob.eventb.disprover.core/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

de.prob.eventb.disprover.core/.settings/org.eclipse.core.runtime.prefs

+eclipse.preferences.version=1
+line.separator=\n

de.prob.eventb.disprover.core/.settings/org.eclipse.jdt.core.prefs

-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8

de.prob.eventb.disprover.core/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: ProB Disprover Core for EventB
+Bundle-Name: ProB Disprover Core for Event-B
 Bundle-SymbolicName: de.prob.eventb.disprover.core;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Vendor: Heinrich-Heine University Dusseldorf
-Require-Bundle: de.prob.core;bundle-version="[9.5.1,9.6.0)",
+Bundle-Version: 2.2.0.qualifier
+Bundle-Vendor: HHU Düsseldorf STUPS Group
+Require-Bundle: de.prob.core;bundle-version="[9.6.0,9.7.0)",
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.eventb.core;bundle-version="[3.5.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.5.0,4.0.0)",

de.prob.eventb.disprover.ui/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

de.prob.eventb.disprover.ui/.settings/org.eclipse.core.runtime.prefs

+eclipse.preferences.version=1
+line.separator=\n

de.prob.eventb.disprover.ui/.settings/org.eclipse.jdt.core.prefs

-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8

de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: ProB Disprover UI for EventB
+Bundle-Name: ProB Disprover UI for Event-B
 Bundle-SymbolicName: de.prob.eventb.disprover.ui;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Vendor: Heinrich-Heine University Dusseldorf
-Require-Bundle: de.prob.core;bundle-version="[9.5.1,9.6.0)",
- de.prob.eventb.disprover.core;bundle-version="[2.1.1,2.2.0)",
- de.prob.ui;bundle-version="[7.5.1,7.6.0)",
+Bundle-Version: 2.2.0.qualifier
+Bundle-Vendor: HHU Düsseldorf STUPS Group
+Require-Bundle: de.prob.core;bundle-version="[9.6.0,9.7.0)",
+ de.prob.eventb.disprover.core;bundle-version="[2.2.0,2.3.0)",
+ de.prob.ui;bundle-version="[7.6.0,7.7.0)",
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.osgi;bundle-version="[3.16.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",

de.prob.eventb.disprover.ui/about.ini

-aboutText=ProB Disprover (c) 2009 http://www.stups.uni-duesseldorf.de/ProB
-featureImage=icons/feature.png
-
+aboutText=ProB Disprover (c) 2009-2024 https://prob.hhu.de/w/
+featureImage=icons/prob32.png

de.prob.eventb.disprover.ui/plugin.xml

@@ -93,7 +93,7 @@
             locationURI="popup:more_commands">
          <command
                commandId="de.prob.eventb.disprover.ui.exportpos"
-               icon="icons/prob_mini_logo.gif"
+               icon="icons/prob.png"
                label="Export POs for ProB (probcli)"
                style="push">
          </command>

de.prob.plugin/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

de.prob.plugin/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ProB Rodin2 UI Bindings
-Bundle-SymbolicName: de.prob.plugin;singleton:=true
-Bundle-Version: 2.4.1.qualifier
-Fragment-Host: de.prob.ui;bundle-version="[7.5.1,7.6.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Vendor: HHU Düsseldorf STUPS Group

de.prob.plugin/build.properties

-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               fragment.xml