rename package

KeYProject · Sep 19, 2024 · 061c43b · 061c43b
1 parent 5b797f3
commit 061c43b
Show file tree

Hide file tree

Showing 43 changed files with 57 additions and 83 deletions.
diff --git a/.../key/isabelletranslation/BSumHandler.java → ...ject/isabelletranslation/BSumHandler.java b/.../key/isabelletranslation/BSumHandler.java → ...ject/isabelletranslation/BSumHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.ldt.IntegerLDT;

diff --git a/...isabelletranslation/BooleanOpHandler.java → ...isabelletranslation/BooleanOpHandler.java b/...isabelletranslation/BooleanOpHandler.java → ...isabelletranslation/BooleanOpHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.ldt.BooleanLDT;

diff --git a/...lletranslation/DefinedSymbolsHandler.java → ...lletranslation/DefinedSymbolsHandler.java b/...lletranslation/DefinedSymbolsHandler.java → ...lletranslation/DefinedSymbolsHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.Namespace;

diff --git a/...key/isabelletranslation/FieldHandler.java → ...ect/isabelletranslation/FieldHandler.java b/...key/isabelletranslation/FieldHandler.java → ...ect/isabelletranslation/FieldHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Name;

diff --git a/...etranslation/IllegalFormulaException.java → ...etranslation/IllegalFormulaException.java b/...etranslation/IllegalFormulaException.java → ...etranslation/IllegalFormulaException.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 public class IllegalFormulaException extends Exception {
     /**

diff --git a/...elletranslation/InfiniteUnionHandler.java → ...elletranslation/InfiniteUnionHandler.java b/...elletranslation/InfiniteUnionHandler.java → ...elletranslation/InfiniteUnionHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...etranslation/InstanceOperatorHandler.java → ...etranslation/InstanceOperatorHandler.java b/...etranslation/InstanceOperatorHandler.java → ...etranslation/InstanceOperatorHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.Namespace;

diff --git a/...isabelletranslation/IntegerOpHandler.java → ...isabelletranslation/IntegerOpHandler.java b/...isabelletranslation/IntegerOpHandler.java → ...isabelletranslation/IntegerOpHandler.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.ldt.IntegerLDT;

diff --git a/.../isabelletranslation/IsabelleHandler.java → .../isabelletranslation/IsabelleHandler.java b/.../isabelletranslation/IsabelleHandler.java → .../isabelletranslation/IsabelleHandler.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...etranslation/IsabelleHandlerServices.java → ...etranslation/IsabelleHandlerServices.java b/...etranslation/IsabelleHandlerServices.java → ...etranslation/IsabelleHandlerServices.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.jspecify.annotations.NonNull;

diff --git a/...isabelletranslation/IsabelleLauncher.java → ...isabelletranslation/IsabelleLauncher.java b/...isabelletranslation/IsabelleLauncher.java → ...isabelletranslation/IsabelleLauncher.java
@@ -1,9 +1,6 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import org.jetbrains.annotations.NotNull;
-import org.key_project.util.collection.Pair;
-import de.unruh.isabelle.control.Isabelle;
-import de.unruh.isabelle.pure.Theory;
 import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...translation/IsabelleLauncherListener.java → ...translation/IsabelleLauncherListener.java b/...translation/IsabelleLauncherListener.java → ...translation/IsabelleLauncherListener.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import java.util.Collection;
 

diff --git a/...abelleLauncherProgressDialogMediator.java → ...abelleLauncherProgressDialogMediator.java b/...abelleLauncherProgressDialogMediator.java → ...abelleLauncherProgressDialogMediator.java
@@ -1,10 +1,10 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.core.KeYMediator;
 import de.uka.ilkd.key.gui.MainWindow;
 import de.uka.ilkd.key.gui.colors.ColorSettings;
-import key.isabelletranslation.gui.IsabelleProgressDialog;
-import key.isabelletranslation.gui.IsabelleProgressModel;
+import org.key_project.isabelletranslation.gui.IsabelleProgressDialog;
+import org.key_project.isabelletranslation.gui.IsabelleProgressModel;
 
 import javax.swing.*;
 import java.awt.*;
@@ -64,7 +64,7 @@ private void applyResults() {
             //TODO create own close action
         } finally {
             mediator.startInterface(true);
-            // switch to new open goal
+            //switch to new open goal
             mediator.getSelectionModel().defaultSelection();
         }
     }

diff --git a/...lletranslation/IsabelleMasterHandler.java → ...lletranslation/IsabelleMasterHandler.java b/...lletranslation/IsabelleMasterHandler.java → ...lletranslation/IsabelleMasterHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.ldt.JavaDLTheory;

diff --git a/.../isabelletranslation/IsabelleProblem.java → .../isabelletranslation/IsabelleProblem.java b/.../isabelletranslation/IsabelleProblem.java → .../isabelletranslation/IsabelleProblem.java
@@ -1,27 +1,6 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.proof.Goal;
-import de.unruh.isabelle.control.Isabelle;
-import de.unruh.isabelle.java.JIsabelle;
-import de.unruh.isabelle.mlvalue.*;
-import de.unruh.isabelle.pure.Implicits;
-import de.unruh.isabelle.pure.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import scala.Option;
-import scala.Tuple2;
-import scala.collection.immutable.List;
-import scala.collection.mutable.Builder;
-import scala.concurrent.Await;
-import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 public class IsabelleProblem {
     private final Goal goal;

diff --git a/...anslation/IsabelleResourceController.java → ...anslation/IsabelleResourceController.java b/...anslation/IsabelleResourceController.java → ...anslation/IsabelleResourceController.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.unruh.isabelle.control.Isabelle;
 import de.unruh.isabelle.control.IsabelleMLException;

diff --git a/...translation/IsabelleSettingsProvider.java → ...translation/IsabelleSettingsProvider.java b/...translation/IsabelleSettingsProvider.java → ...translation/IsabelleSettingsProvider.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.gui.MainWindow;
 import de.uka.ilkd.key.gui.settings.InvalidSettingsInputException;

diff --git a/...y/isabelletranslation/IsabelleSolver.java → ...t/isabelletranslation/IsabelleSolver.java b/...y/isabelletranslation/IsabelleSolver.java → ...t/isabelletranslation/IsabelleSolver.java
@@ -1,6 +1,4 @@
-package key.isabelletranslation;
-
-import de.unruh.isabelle.control.Isabelle;
+package org.key_project.isabelletranslation;
 
 import java.util.TimerTask;
 

diff --git a/...letranslation/IsabelleSolverInstance.java → ...letranslation/IsabelleSolverInstance.java b/...letranslation/IsabelleSolverInstance.java → ...letranslation/IsabelleSolverInstance.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.unruh.isabelle.control.Isabelle;
 import de.unruh.isabelle.control.IsabelleMLException;
@@ -172,7 +172,7 @@ public SolverState getState() {
 
     @Override
     public boolean wasInterrupted() {
-        return Thread.currentThread().isInterrupted();
+        return reasonOfInterruption != ReasonOfInterruption.NoInterruption;
     }
 
     @Override

diff --git a/...letranslation/IsabelleSolverListener.java → ...letranslation/IsabelleSolverListener.java b/...letranslation/IsabelleSolverListener.java → ...letranslation/IsabelleSolverListener.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 public interface IsabelleSolverListener extends IsabelleLauncherListener {
     void parsingStarted(IsabelleSolver solver, IsabelleProblem problem);

diff --git a/...slation/IsabelleTranslationExtension.java → ...slation/IsabelleTranslationExtension.java b/...slation/IsabelleTranslationExtension.java → ...slation/IsabelleTranslationExtension.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.core.KeYMediator;
 import de.uka.ilkd.key.gui.MainWindow;

diff --git a/...nslation/IsabelleTranslationSettings.java → ...nslation/IsabelleTranslationSettings.java b/...nslation/IsabelleTranslationSettings.java → ...nslation/IsabelleTranslationSettings.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.settings.AbstractSettings;
 import de.uka.ilkd.key.settings.Configuration;

diff --git a/...abelletranslation/IsabelleTranslator.java → ...abelletranslation/IsabelleTranslator.java b/...abelletranslation/IsabelleTranslator.java → ...abelletranslation/IsabelleTranslator.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.ldt.JavaDLTheory;

diff --git a/...letranslation/LogicalVariableHandler.java → ...letranslation/LogicalVariableHandler.java b/...letranslation/LogicalVariableHandler.java → ...letranslation/LogicalVariableHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...letranslation/NumberConstantsHandler.java → ...letranslation/NumberConstantsHandler.java b/...letranslation/NumberConstantsHandler.java → ...letranslation/NumberConstantsHandler.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...etranslation/ObserverFunctionHandler.java → ...etranslation/ObserverFunctionHandler.java b/...etranslation/ObserverFunctionHandler.java → ...etranslation/ObserverFunctionHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...abelletranslation/PolymorphicHandler.java → ...abelletranslation/PolymorphicHandler.java b/...abelletranslation/PolymorphicHandler.java → ...abelletranslation/PolymorphicHandler.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...sabelletranslation/QuantifierHandler.java → ...sabelletranslation/QuantifierHandler.java b/...sabelletranslation/QuantifierHandler.java → ...sabelletranslation/QuantifierHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...ey/isabelletranslation/SeqDefHandler.java → ...ct/isabelletranslation/SeqDefHandler.java b/...ey/isabelletranslation/SeqDefHandler.java → ...ct/isabelletranslation/SeqDefHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...abelletranslation/SledgehammerResult.java → ...abelletranslation/SledgehammerResult.java b/...abelletranslation/SledgehammerResult.java → ...abelletranslation/SledgehammerResult.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import scala.Option;
 import scala.Tuple2;

diff --git a/...slation/SortDependingFunctionHandler.java → ...slation/SortDependingFunctionHandler.java b/...slation/SortDependingFunctionHandler.java → ...slation/SortDependingFunctionHandler.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import org.key_project.logic.Term;

diff --git a/...abelletranslation/TranslateAllAction.java → ...abelletranslation/TranslateAllAction.java b/...abelletranslation/TranslateAllAction.java → ...abelletranslation/TranslateAllAction.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.core.KeYMediator;
 import de.uka.ilkd.key.gui.MainWindow;

diff --git a/...sabelletranslation/TranslationAction.java → ...sabelletranslation/TranslationAction.java b/...sabelletranslation/TranslationAction.java → ...sabelletranslation/TranslationAction.java
@@ -1,4 +1,4 @@
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.core.KeYMediator;
 import de.uka.ilkd.key.gui.MainWindow;

diff --git a/...nslation/UninterpretedSymbolsHandler.java → ...nslation/UninterpretedSymbolsHandler.java b/...nslation/UninterpretedSymbolsHandler.java → ...nslation/UninterpretedSymbolsHandler.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation;
+package org.key_project.isabelletranslation;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.ldt.HeapLDT;

diff --git a/...anslation/gui/IsabelleProgressDialog.java → ...anslation/gui/IsabelleProgressDialog.java b/...anslation/gui/IsabelleProgressDialog.java → ...anslation/gui/IsabelleProgressDialog.java
@@ -1,14 +1,14 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation.gui;
+package org.key_project.isabelletranslation.gui;
 
 import de.uka.ilkd.key.gui.IssueDialog;
 import de.uka.ilkd.key.gui.MainWindow;
 import org.key_project.util.java.SwingUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import key.isabelletranslation.gui.IsabelleProgressModel.ProcessColumn.ProcessData;
+import org.key_project.isabelletranslation.gui.IsabelleProgressModel.ProcessColumn.ProcessData;
 
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;

diff --git a/...ranslation/gui/IsabelleProgressModel.java → ...ranslation/gui/IsabelleProgressModel.java b/...ranslation/gui/IsabelleProgressModel.java → ...ranslation/gui/IsabelleProgressModel.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package key.isabelletranslation.gui;
+package org.key_project.isabelletranslation.gui;
 
 import java.awt.Color;
 import java.util.ArrayList;

diff --git a/...on/src/main/resources/META-INF/services/de.uka.ilkd.key.gui.extension.api.KeYGuiExtension b/...on/src/main/resources/META-INF/services/de.uka.ilkd.key.gui.extension.api.KeYGuiExtension
@@ -1 +1 @@
-key.isabelletranslation.IsabelleTranslationExtension
+org.key_project.isabelletranslation.IsabelleTranslationExtension
diff --git a/keyext.isabelletranslation/src/main/resources/key/isabelletranslation/defaultHandlers.txt b/keyext.isabelletranslation/src/main/resources/key/isabelletranslation/defaultHandlers.txt
diff --git a/...translation/IntegerOpHandler.preamble.xml → ...translation/IntegerOpHandler.preamble.xml b/...translation/IntegerOpHandler.preamble.xml → ...translation/IntegerOpHandler.preamble.xml
diff --git a/...in/resources/key/isabelletranslation/ROOT → .../org/key_project/isabelletranslation/ROOT b/...in/resources/key/isabelletranslation/ROOT → .../org/key_project/isabelletranslation/ROOT
diff --git a/.../UninterpretedSymbolsHandler.preamble.xml → .../UninterpretedSymbolsHandler.preamble.xml b/.../UninterpretedSymbolsHandler.preamble.xml → .../UninterpretedSymbolsHandler.preamble.xml
diff --git a/...lletranslation/src/main/resources/org/key_project/isabelletranslation/defaultHandlers.txt b/...lletranslation/src/main/resources/org/key_project/isabelletranslation/defaultHandlers.txt
@@ -0,0 +1,15 @@
+org.key_project.isabelletranslation.DefinedSymbolsHandler
+org.key_project.isabelletranslation.InstanceOperatorHandler
+org.key_project.isabelletranslation.BooleanOpHandler
+org.key_project.isabelletranslation.PolymorphicHandler
+org.key_project.isabelletranslation.QuantifierHandler
+org.key_project.isabelletranslation.LogicalVariableHandler
+org.key_project.isabelletranslation.NumberConstantsHandler
+org.key_project.isabelletranslation.IntegerOpHandler
+org.key_project.isabelletranslation.InfiniteUnionHandler
+org.key_project.isabelletranslation.BSumHandler
+org.key_project.isabelletranslation.SeqDefHandler
+org.key_project.isabelletranslation.SortDependingFunctionHandler
+org.key_project.isabelletranslation.FieldHandler
+org.key_project.isabelletranslation.ObserverFunctionHandler
+org.key_project.isabelletranslation.UninterpretedSymbolsHandler
diff --git a/...esources/key/isabelletranslation/root.tex → .../key_project/isabelletranslation/root.tex b/...esources/key/isabelletranslation/root.tex → .../key_project/isabelletranslation/root.tex