Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java =================================================================== --- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java (revision 1078) +++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java (revision 1079) @@ -198,8 +198,8 @@ else{ Map idProperties = extractIDProperties(spec); - for (String property: idProperties.keySet()){ - String value = idProperties.get(property); + for (Map.Entry property : idProperties.entrySet()) { + String value = property.getValue(); if (!value.equals("null")){ - hashcode = prime * hashcode + property.hashCode(); + hashcode = prime * hashcode + property.getKey().hashCode(); hashcode = prime * hashcode + value.hashCode(); } Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCTraceCorrector.java =================================================================== --- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCTraceCorrector.java (revision 1078) +++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCTraceCorrector.java (revision 1079) @@ -195,5 +195,6 @@ try { - outFile = new PrintStream(new BufferedOutputStream(new FileOutputStream(resultFile))); + outFile = new PrintStream + (new BufferedOutputStream(new FileOutputStream(resultFile)), false, "UTF-8"); outFile.println(""); } @@ -201,4 +202,7 @@ throw new IllegalArgumentException("could not create a corrected file name " + resultFile + " next to " + file); + } + catch (UnsupportedEncodingException e) { + throw new IllegalArgumentException("this host does not support UTF-8 encoding"); } @@ -673,5 +677,5 @@ *

*/ - private void dumpParams(PrintStream out, List params, String indent) { + private static void dumpParams(PrintStream out, List params, String indent) { for (Parameter param : params) { out.print(indent); @@ -696,5 +700,5 @@ * @return true if both lists contain the same parameters, false else. */ - private boolean parametersEqual(List params1, List params2) { + private static boolean parametersEqual(List params1, List params2) { if (params1 == null) { return params2 == null; @@ -734,5 +738,5 @@ *

*/ - private class Session { + private static class Session { /** */ @@ -798,5 +802,5 @@ *

*/ - private class Event { + private static class Event { /** */ @@ -873,5 +877,5 @@ *

*/ - private class Source { + private static class Source { /** */ @@ -984,7 +988,7 @@ Source other = (Source) obj; - if ((getToStringValue() != other.getToStringValue()) || - ((getToStringValue() != null) && - (!getToStringValue().equals(other.getToStringValue())))) + if (getToStringValue() != null ? + !getToStringValue().equals(other.getToStringValue()) : + other.getToStringValue() != null) { return false; @@ -1042,5 +1046,5 @@ *

*/ - private class Component { + private static class Component { /** */ @@ -1115,5 +1119,5 @@ *

*/ - private class ComponentFromToString extends Component { + private static class ComponentFromToString extends Component { /** */ @@ -1238,5 +1242,5 @@ *

*/ - private class Parameter { + private static class Parameter { /** */ Index: unk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCComponentTree.java =================================================================== --- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCComponentTree.java (revision 1078) +++ (revision ) @@ -1,305 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.plugin.jfc.guimodel; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementFactory; - -/** - *

- * @deprecated Use GUIElementTree instead, which provides a generalization. - *

- *

- * This class provides the interfaces for component trees. - *

- *

- * The component tree represents the hierarchical structure of the components "as it is" currently during - * a session. It may change during the session due to creation and destruction of components. - *

- * - * @author Steffen Herbold - * @author Fabian Glaser - * @version 1.0 - */ -public class JFCComponentTree { - - /** - *

- * Map of all GUI element specifications that are part of the tree for efficient searching. The - * keys of the map are the hash values of the GUI elements. - *

- */ - private Map guiElementSpecs; - - /** - *

- * Map of all children of GUI elements that are part of the tree. The keys of the map are the - * hash values of the parent GUI elements. - *

- */ - private Map> childRelations; - - /** - *

- * Map of all parents of GUI elements that are part of the tree. The keys of the map are the - * hash values of the child GUI elements. - *

- */ - private Map parentRelations; - - /** - *

- * the internally created GUI model - *

- */ - private GUIModel guiModel; - - /** - *

- * the GUI element factory used in the model - *

- */ - private IGUIElementFactory guiElementFactory = GUIElementFactory.getInstance(); - - /** - *

- * Map of all GUI elements that are part of the tree for efficient searching. The keys of the - * map are the hash values of the GUI elements. - *

- */ - private Map guiElements; - - /** - *

- * Creates a new JFCComponentTree. - *

- */ - public JFCComponentTree() { - guiElementSpecs = new HashMap(); - childRelations = new HashMap>(); - parentRelations = new HashMap(); - guiElements = new HashMap(); - guiModel = new GUIModel(); - } - - /** - *

- * Creates a JFCComponentTree with an already existing guiModel - * @param guiModel - *

- */ - public JFCComponentTree(GUIModel guiModel){ - guiElementSpecs = new HashMap(); - childRelations = new HashMap>(); - parentRelations = new HashMap(); - guiElements = new HashMap(); - this.guiModel = guiModel; - } - - /** - *

- * Adds a new component to the tree. - *

- * - * @param componentHash - * hash of the window to be created - * @param parentHash - * hash of the parent window - * @param componentSpec - * the component specification - */ - public void add(Integer componentHash, - Integer parentHash, - JFCGUIElementSpec componentSpec) - { - JFCGUIElement guiElement = guiElements.get(componentHash); - - if (guiElement == null) { - JFCGUIElementSpec parent = guiElementSpecs.get(parentHash); - if (parent != null) { - List otherChildren = childRelations.get(parentHash); - - if (otherChildren == null) { - otherChildren = new ArrayList(); - childRelations.put(parentHash, otherChildren); - } - - otherChildren.add(componentSpec); - - parentRelations.put(componentHash, parent); - } - guiElementSpecs.put(componentHash, componentSpec); - - List guiElementPath = new ArrayList(); - - while (componentSpec != null) { - guiElementPath.add(0, componentSpec); - componentSpec = parentRelations.get(componentSpec.getElementHash()); - } - - try { - guiElement = - (JFCGUIElement) guiModel.integratePath(guiElementPath, guiElementFactory); - } - catch (GUIModelException e) { - throw new RuntimeException("could not instantiate GUI element with id " + componentHash, e); - } - guiElements.put(componentHash, guiElement); - } - } - - /** - *

- * Searches the tree for a component with the specified hash and returns its - * {@link JFCGUIElementSpec} . - *

- * - * @param hash - * hash that is looked for - * @return {@link JFCGUIElementSpec} of the window with the given hash if found, null otherwise - */ - public JFCGUIElement find(int hash) { - JFCGUIElement guiElement = guiElements.get(hash); - if (guiElement == null) { - List guiElementPath = new ArrayList(); - - JFCGUIElementSpec child = guiElementSpecs.get(hash); - - if (child == null) { - throw new RuntimeException("no GUI element found with hash " + hash); - } - - while (child != null) { - guiElementPath.add(0, child); - child = parentRelations.get(child.getElementHash()); - } - - try { - guiElement = - (JFCGUIElement) guiModel.integratePath(guiElementPath, guiElementFactory); - } - catch (GUIModelException e) { - throw new RuntimeException("could not instantiate GUI element with id " + hash, e); - } - guiElements.put(hash, guiElement); - } - return guiElement; - } - - /** - *

- * Sets the name of a GUI element given its hash. - *

- * - * @param hash - * hash of the GUI element - * @param windowName - * new name of the GUI element - */ - public void setName(int hash, String windowName) { - JFCGUIElementSpec child = guiElementSpecs.get(hash); - if (child != null) { - child.setName(windowName); - - JFCGUIElement guiElement = guiElements.remove(hash); - if (guiElement == null) { - // we need to update the GUI model as well - find(hash); - } - } - } - - /** - *

- * Removes a window (defined by its hash) from the tree. All children of the window will be - * removed recursively. - *

- * - * @param hash - * hash of the window to be removed - * @return number of windows that were removed - */ - public int remove(long hash) { - JFCGUIElementSpec node = guiElementSpecs.remove(hash); - int removedCounter = 1; - - if (node != null) { - List nodesToBeRemoved = childRelations.remove(hash); - - // remove all children and sub-children, if any - if (nodesToBeRemoved != null) { - for (int i = 0; i < nodesToBeRemoved.size(); i++) { - JFCGUIElementSpec nodeToBeRemoved = nodesToBeRemoved.get(i); - List children = - childRelations.remove(nodeToBeRemoved.getElementHash()); - - if (children != null) { - nodesToBeRemoved.addAll(children); - } - - guiElementSpecs.remove(nodeToBeRemoved.getElementHash()); - parentRelations.remove(nodeToBeRemoved.getElementHash()); - removedCounter++; - } - } - - // the node may be a child node of a parent. So search for it and remove it - JFCGUIElementSpec parent = parentRelations.remove(hash); - if (parent != null) { - List children = childRelations.get(parent.getElementHash()); - - if (children != null) { - for (int i = 0; i < children.size(); i++) { - if (children.get(i).getElementHash() == hash) { - children.remove(i); - break; - } - } - - if (children.size() <= 0) { - childRelations.remove(parent.getElementHash()); - } - } - } - } - return removedCounter; - } - - /** - * @return the guiModel - */ - public GUIModel getGUIModel() { - return guiModel; - } - - /** - *

- * Returns the number of nodes contained in the JFCComponentTree. - *

- * - * @return number of nodes - */ - public int size() { - return guiElementSpecs.size(); - } - -}