diff --git a/src/main/java/common/ConfigurationTTool.java b/src/main/java/common/ConfigurationTTool.java index 2d49da6f06c588387b4a65a9dfaf07e9c21f1524..f4ffe8b6b9f5aa373ec72cda4beb6179ca1b0bbe 100755 --- a/src/main/java/common/ConfigurationTTool.java +++ b/src/main/java/common/ConfigurationTTool.java @@ -493,12 +493,12 @@ public class ConfigurationTTool { sb.append("LastOpenFile: " + LastOpenFile + "\n"); sb.append("LastWindowAttributesX: " + LastWindowAttributesX + "\n"); sb.append("LastWindowAttributesY: " + LastWindowAttributesY + "\n"); - sb.append("LastWindowAttributesWidth: " + LastWindowAttributesWidth + "\n"); - sb.append("LastWindowAttributesHeight: " + LastWindowAttributesHeight + "\n"); - sb.append("LastWindowAttributesMax: " + LastWindowAttributesMax + "\n"); + sb.append("LastWindowAttributesWidth: ").append(LastWindowAttributesWidth).append("\n"); + sb.append("LastWindowAttributesHeight: ").append(LastWindowAttributesHeight).append("\n"); + sb.append("LastWindowAttributesMax: ").append(LastWindowAttributesMax).append("\n"); //Huy Truong - sb.append("ExternalServer " + ExternalServer + "\n"); + sb.append("ExternalServer ").append(ExternalServer).append("\n"); return sb.toString(); diff --git a/src/main/java/common/SpecConfigTTool.java b/src/main/java/common/SpecConfigTTool.java index f026b6ceb9ab1f7ec3e11921469e653f93d3a645..ada84c570bc2e0ef8b3b43cbad5ed9b7e4fd419b 100644 --- a/src/main/java/common/SpecConfigTTool.java +++ b/src/main/java/common/SpecConfigTTool.java @@ -1,3 +1,41 @@ +/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille + * + * ludovic.apvrille AT enst.fr + * + * This software is a computer program whose purpose is to allow the + * edition of TURTLE analysis, design and deployment diagrams, to + * allow the generation of RT-LOTOS or Java code from this diagram, + * and at last to allow the analysis of formal validation traces + * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP + * from INRIA Rhone-Alpes. + * + * This software is governed by the CeCILL license under French law and + * abiding by the rules of distribution of free software. You can use, + * modify and/ or redistribute the software under the terms of the CeCILL + * license as circulated by CEA, CNRS and INRIA at the following URL + * "http://www.cecill.info". + * + * As a counterpart to the access to the source code and rights to copy, + * modify and redistribute granted by the license, users are provided only + * with a limited warranty and the software's author, the holder of the + * economic rights, and the successive licensors have only limited + * liability. + * + * In this respect, the user's attention is drawn to the risks associated + * with loading, using, modifying and/or developing or reproducing the + * software by the user in light of its specific status of free software, + * that may mean that it is complicated to manipulate, and that also + * therefore means that it is reserved for developers and experienced + * professionals having in-depth computer knowledge. Users are therefore + * encouraged to load and test the software's suitability as regards their + * requirements in conditions enabling the security of their systems and/or + * data to be ensured and, more generally, to use and operate it in the + * same conditions as regards security. + * + * The fact that you are presently reading this means that you have had + * knowledge of the CeCILL license and that you accept its terms. + */ + package common; import java.io.ByteArrayInputStream; diff --git a/src/main/java/ui/graph/AUTGraphDisplay.java b/src/main/java/ui/graph/AUTGraphDisplay.java index 64dc8a4e47c67a88bdc82e0f7c1e6d48693e89ab..3881d604d8ea548903c1f0f8c7dfd1ad4e769133 100755 --- a/src/main/java/ui/graph/AUTGraphDisplay.java +++ b/src/main/java/ui/graph/AUTGraphDisplay.java @@ -47,10 +47,6 @@ import org.graphstream.graph.implementations.MultiNode; import org.graphstream.ui.view.Viewer; import org.graphstream.ui.view.ViewerListener; import org.graphstream.ui.view.ViewerPipe; -import org.graphstream.stream.file.FileSinkImages; -import org.graphstream.stream.file.FileSinkImages.LayoutPolicy; -import org.graphstream.stream.file.FileSinkImages.Resolutions; -import org.graphstream.stream.file.FileSinkImages.OutputType; import ui.file.PNGFilter; import ui.util.IconManager; @@ -63,7 +59,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.image.BufferedImage; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.logging.Logger; diff --git a/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java b/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java index 6fd8a78df4e83d21cbf259469e5ca081c673d020..323e3c91d9c22b6b8fe02a9f8160dbadf2e3ba33 100644 --- a/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java +++ b/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java @@ -230,7 +230,7 @@ public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements Ac } } - public void featureSelectionMade() { + private void featureSelectionMade() { panel.setFeatureSelectedIndex(featureList.getSelectedIndex()); } @@ -238,7 +238,6 @@ public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements Ac if (panel != null) panel.stopLoading(); dispose(); } - public void run() { // Loading main file describing models, giving information on this, and filling the array of models // Accessing the main file diff --git a/src/main/java/ui/networkmodelloader/NetworkModelPanel.java b/src/main/java/ui/networkmodelloader/NetworkModelPanel.java index 2bd68880a5dfe4803e3973f26cfb8ab2fc460a00..fe92176d25bad11cda3f1193e4149e2f4f6ecbac 100644 --- a/src/main/java/ui/networkmodelloader/NetworkModelPanel.java +++ b/src/main/java/ui/networkmodelloader/NetworkModelPanel.java @@ -98,7 +98,7 @@ public class NetworkModelPanel extends JPanel implements Runnable, MouseListener private boolean go = true; - public NetworkModelPanel(LoaderFacilityInterface _loader, ArrayList<NetworkModel> _listOfModels, ActionListener _listener, JTextArea _jta, JLabel _infoModels) { + NetworkModelPanel(LoaderFacilityInterface _loader, ArrayList<NetworkModel> _listOfModels, ActionListener _listener, JTextArea _jta, JLabel _infoModels) { loader = _loader; listOfModels = _listOfModels; listener = _listener; @@ -124,24 +124,24 @@ public class NetworkModelPanel extends JPanel implements Runnable, MouseListener addMouseListener(this); } - public void setJSP(JScrollPane _jsp) { + void setJSP(JScrollPane _jsp) { jsp = _jsp; jsp.setViewportView(this); } - public void setFeatureSelectedIndex(int _index) { + void setFeatureSelectedIndex(int _index) { featureSelectedIndex = _index; indexOfSelected = -1; repaint(); } - public void setProperty(int _index, boolean _mode) { + void setProperty(int _index, boolean _mode) { props[_index] = _mode; indexOfSelected = -1; repaint(); } - public void stopLoading() { + void stopLoading() { go = false; }