Datasets:

ASSERT-KTH

/

megadiff

like 1

Follow

ASSERT 13

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java index a9d467d4d..5e2c117a5 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java @@ -1,204 +1,208 @@ package org.apache.solr.client.solrj.impl; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You 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. */ import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; import java.util.concurrent.TimeoutException; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.util.ClientUtils; import org.apache.solr.common.SolrException; import org.apache.solr.common.cloud.CloudState; import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.ZkCoreNodeProps; import org.apache.solr.common.cloud.ZkNodeProps; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZooKeeperException; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.StrUtils; import org.apache.zookeeper.KeeperException; public class CloudSolrServer extends SolrServer { private volatile ZkStateReader zkStateReader; private String zkHost; // the zk server address private int zkConnectTimeout = 10000; private int zkClientTimeout = 10000; private volatile String defaultCollection; private LBHttpSolrServer lbServer; Random rand = new Random(); private MultiThreadedHttpConnectionManager connManager; /** * @param zkHost The address of the zookeeper quorum containing the cloud state */ public CloudSolrServer(String zkHost) throws MalformedURLException { connManager = new MultiThreadedHttpConnectionManager(); this.zkHost = zkHost; this.lbServer = new LBHttpSolrServer(new HttpClient(connManager)); } /** * @param zkHost The address of the zookeeper quorum containing the cloud state */ public CloudSolrServer(String zkHost, LBHttpSolrServer lbServer) { this.zkHost = zkHost; this.lbServer = lbServer; } public ZkStateReader getZkStateReader() { return zkStateReader; } /** Sets the default collection for request */ public void setDefaultCollection(String collection) { this.defaultCollection = collection; } /** Set the connect timeout to the zookeeper ensemble in ms */ public void setZkConnectTimeout(int zkConnectTimeout) { this.zkConnectTimeout = zkConnectTimeout; } /** Set the timeout to the zookeeper ensemble in ms */ public void setZkClientTimeout(int zkClientTimeout) { this.zkClientTimeout = zkClientTimeout; } /** * Connect to the zookeeper ensemble. * This is an optional method that may be used to force a connect before any other requests are sent. * * @throws IOException * @throws TimeoutException * @throws InterruptedException */ public void connect() { if (zkStateReader == null) { synchronized (this) { if (zkStateReader == null) { try { ZkStateReader zk = new ZkStateReader(zkHost, zkConnectTimeout, zkClientTimeout); zk.createClusterStateWatchersAndUpdate(); zkStateReader = zk; } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR, "", e); } catch (KeeperException e) { throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR, "", e); } catch (IOException e) { throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR, "", e); } catch (TimeoutException e) { throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR, "", e); } } } } } @Override public NamedList<Object> request(SolrRequest request) throws SolrServerException, IOException { connect(); // TODO: if you can hash here, you could favor the shard leader CloudState cloudState = zkStateReader.getCloudState(); SolrParams reqParams = request.getParams(); if (reqParams == null) { reqParams = new ModifiableSolrParams(); } String collection = reqParams.get("collection", defaultCollection); + if (collection == null) { + throw new SolrServerException("No collection param specified on request and no default collection has been set."); + } + // Extract each comma separated collection name and store in a List. List<String> collectionList = StrUtils.splitSmart(collection, ",", true); // Retrieve slices from the cloud state and, for each collection specified, // add it to the Map of slices. Map<String,Slice> slices = new HashMap<String,Slice>(); for (int i = 0; i < collectionList.size(); i++) { String coll= collectionList.get(i); ClientUtils.appendMap(coll, slices, cloudState.getSlices(coll)); } Set<String> liveNodes = cloudState.getLiveNodes(); // IDEA: have versions on various things... like a global cloudState version // or shardAddressVersion (which only changes when the shards change) // to allow caching. // build a map of unique nodes // TODO: allow filtering by group, role, etc Map<String,ZkNodeProps> nodes = new HashMap<String,ZkNodeProps>(); List<String> urlList = new ArrayList<String>(); for (Slice slice : slices.values()) { for (ZkNodeProps nodeProps : slice.getShards().values()) { ZkCoreNodeProps coreNodeProps = new ZkCoreNodeProps(nodeProps); String node = coreNodeProps.getNodeName(); if (!liveNodes.contains(coreNodeProps.getNodeName()) || !coreNodeProps.getState().equals( ZkStateReader.ACTIVE)) continue; if (nodes.put(node, nodeProps) == null) { String url = coreNodeProps.getCoreUrl(); urlList.add(url); } } } Collections.shuffle(urlList, rand); //System.out.println("########################## MAKING REQUEST TO " + urlList); LBHttpSolrServer.Req req = new LBHttpSolrServer.Req(request, urlList); LBHttpSolrServer.Rsp rsp = lbServer.request(req); return rsp.getResponse(); } public void close() { if (zkStateReader != null) { synchronized(this) { if (zkStateReader!= null) zkStateReader.close(); zkStateReader = null; } } if (connManager != null) { connManager.shutdown(); } } public LBHttpSolrServer getLbServer() { return lbServer; } }

diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java index 80b6e81..b006df0 100644 --- a/src/classes/share/javax/media/j3d/GroupRetained.java +++ b/src/classes/share/javax/media/j3d/GroupRetained.java @@ -1,3179 +1,3185 @@ /* * $RCSfile$ * * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * * Use is subject to license terms. * * $Revision$ * $Date$ * $State$ */ package javax.media.j3d; import java.util.Vector; import java.util.Enumeration; import java.util.ArrayList; import java.util.Hashtable; /** * Group node. */ class GroupRetained extends NodeRetained implements BHLeafInterface { /** * The Group Node's children vector. */ ArrayList children = new ArrayList(1); /** * The Group node's collision bounds in local coordinates. */ Bounds collisionBound = null; // The locale that this node is decended from Locale locale = null; // The list of lights that are scoped to this node // One such arraylist per path. If not in sharedGroup // then only index 0 is valid ArrayList lights = null; // The list of fogs that are scoped to this node // One such arraylist per path. If not in sharedGroup // then only index 0 is valid ArrayList fogs = null; // The list of model clips that are scoped to this node // One such arraylist per path. If not in sharedGroup // then only index 0 is valid ArrayList modelClips = null; // The list of alternateappearance that are scoped to this node // One such arraylist per path. If not in sharedGroup // then only index 0 is valid ArrayList altAppearances = null; // indicates whether this Group node can be the target of a collision boolean collisionTarget = false; // per child switchLinks ArrayList childrenSwitchLinks = null; // the immediate childIndex of a parentSwitchLink int parentSwitchLinkChildIndex = -1; // per shared path ordered path data ArrayList orderedPaths = null; /** * If collisionBound is set, this is equal to the * transformed collisionBounds, otherwise it is equal * to the transformed localBounds. * This variable is set to null unless collisionTarget = true. * This bound is only used by mirror Group. */ BoundingBox collisionVwcBounds; /** * Mirror group of this node, it is only used when * collisionTarget = true. Otherwise it is set to null. * If not in shared group, * only entry 0 is used. * */ ArrayList mirrorGroup; /** * key of mirror GroupRetained. */ HashKey key; /** * sourceNode of this mirror Group */ GroupRetained sourceNode; /** * The BHLeafNode for this GeometryAtom. */ BHLeafNode bhLeafNode = null; // // The following variables are used during compile // // true if this is the root of the scenegraph tree boolean isRoot = false; boolean allocatedLights = false; boolean allocatedFogs = false; boolean allocatedMclips = false; boolean allocatedAltApps = false; // > 0 if this group is being used in scoping int scopingRefCount = 0; ArrayList compiledChildrenList = null; boolean isInClearLive = false; // List of viewes scoped to this Group, for all subclasses // of group, except ViewSpecificGroup its a pointer to closest // ViewSpecificGroup parent // viewList for this node, if inSharedGroup is // false then only viewList(0) is valid // For VSGs, this list is an intersection of // higher level VSGs ArrayList viewLists = null; // True if this Node is descendent of ViewSpecificGroup; boolean inViewSpecificGroup = false; GroupRetained() { this.nodeType = NodeRetained.GROUP; localBounds = new BoundingSphere(); ((BoundingSphere)localBounds).setRadius( -1.0 ); } /** * Sets the collision bounds of a node. * @param bounds the bounding object for the node */ void setCollisionBounds(Bounds bounds) { if (bounds == null) { this.collisionBound = null; } else { this.collisionBound = (Bounds)bounds.clone(); } if (source.isLive()) { J3dMessage message = new J3dMessage(); message.type = J3dMessage.COLLISION_BOUND_CHANGED; message.threads = J3dThread.UPDATE_TRANSFORM | J3dThread.UPDATE_GEOMETRY; message.universe = universe; message.args[0] = this; VirtualUniverse.mc.processMessage(message); } } /** * Gets the collision bounds of a node. * @return the node's bounding object */ Bounds getCollisionBounds() { return (collisionBound == null ? null : (Bounds)collisionBound.clone()); } /** * Replaces the specified child with the child provided. * @param child the new child * @param index which child to replace */ void setChild(Node child, int index) { checkValidChild(child, "GroupRetained0"); if (this.source.isLive()) { universe.resetWaitMCFlag(); synchronized (universe.sceneGraphLock) { doSetChild(child, index); universe.setLiveState.clear(); } universe.waitForMC(); } else { doSetChild(child, index); if (universe != null) { synchronized (universe.sceneGraphLock) { universe.setLiveState.clear(); } } } dirtyBoundsCache(); } // The method that does the work once the lock is acquired. void doSetChild(Node child, int index) { NodeRetained oldchildr; J3dMessage[] messages = null; int numMessages = 0; int attachStartIndex = 0; // since we want to make sure the replacement of the child // including removal of the oldChild and insertion of the newChild // all happen in the same frame, we'll send all the necessary // messages to masterControl for processing in one call. // So let's first find out how many messages will be sent oldchildr = (NodeRetained) children.get(index); if (this.source.isLive()) { if (oldchildr != null) { numMessages+=3; // REMOVE_NODES, ORDERED_GROUP_REMOVED // VIEWSPECIFICGROUP_CLEAR attachStartIndex = 3; } if (child != null) { numMessages+=4; // INSERT_NODES,BEHAVIOR_ACTIVATE,ORDERED_GROUP_INSERTED, // VIEWSPECIFICGROUP_INIT } messages = new J3dMessage[numMessages]; for (int i = 0; i < numMessages; i++) { messages[i] = new J3dMessage(); } } if(oldchildr != null) { oldchildr.setParent(null); checkClearLive(oldchildr, messages, 0, index, null); if (this.source.isLive()) { universe.notifyStructureChangeListeners(false, this.source, (BranchGroup)oldchildr.source); } } removeChildrenData(index); if(child == null) { children.set(index, null); if (messages != null) { VirtualUniverse.mc.processMessage(messages); } return; } if (this.source.isLive()) { universe.notifyStructureChangeListeners(true, this.source, (BranchGroup)child); } NodeRetained childr = (NodeRetained) child.retained; childr.setParent(this); children.set(index, childr); insertChildrenData(index); checkSetLive(childr, index, messages, attachStartIndex, null); if (this.source.isLive()) { ((BranchGroupRetained)childr).isNew = true; } if (messages != null) { VirtualUniverse.mc.processMessage(messages); } } /** * Inserts the specified child at specified index. * @param child the new child * @param index position to insert new child at */ void insertChild(Node child, int index) { checkValidChild(child, "GroupRetained1"); if (this.source.isLive()) { universe.resetWaitMCFlag(); synchronized (universe.sceneGraphLock) { universe.notifyStructureChangeListeners(true, this.source, (BranchGroup)child); doInsertChild(child, index); universe.setLiveState.clear(); } universe.waitForMC(); } else { doInsertChild(child, index); if (universe != null) { synchronized (universe.sceneGraphLock) { universe.setLiveState.clear(); } } } dirtyBoundsCache(); } // The method that does the work once the lock is acquired. void doInsertChild(Node child, int index) { int i; NodeRetained childi; insertChildrenData(index); for (i=index; i<children.size(); i++) { childi = (NodeRetained) children.get(i); if(childi != null) childi.childIndex++; } if(child==null) { children.add(index, null); return; } NodeRetained childr = (NodeRetained) child.retained; childr.setParent(this); children.add(index, childr); checkSetLive(childr, index, null, 0, null); if (this.source.isLive()) { ((BranchGroupRetained)childr).isNew = true; } } /** * Removes the child at specified index. * @param index which child to remove */ void removeChild(int index) { if (this.source.isLive()) { universe.resetWaitMCFlag(); synchronized (universe.sceneGraphLock) { NodeRetained childr = (NodeRetained)children.get(index); doRemoveChild(index, null, 0); universe.setLiveState.clear(); universe.notifyStructureChangeListeners(false, this.source, (BranchGroup)childr.source); } universe.waitForMC(); } else { doRemoveChild(index, null, 0); if (universe != null) { synchronized (universe.sceneGraphLock) { universe.setLiveState.clear(); } } } dirtyBoundsCache(); } /** * Returns the index of the specified Node in this Group's list of Nodes * @param Node whose index is desired * @return index of the Node */ int indexOfChild(Node child) { if(child != null) return children.indexOf((NodeRetained)child.retained); else return children.indexOf(null); } /** * Removes the specified child from this Group's list of * children. If the specified child is not found, the method returns * quietly * * @param child to be removed */ void removeChild(Node child) { int i = indexOfChild(child); if(i >= 0) removeChild(i); } void removeAllChildren() { int n = children.size(); for(int i = n-1; i >= 0; i--) { removeChild(i); } } // The method that does the work once the lock is acquired. void doRemoveChild(int index, J3dMessage messages[], int messageIndex) { NodeRetained oldchildr, child; int i; oldchildr = (NodeRetained) children.get(index); int size = children.size(); for (i=index; i<size; i++) { child = (NodeRetained) children.get(i); if(child != null) child.childIndex--; } if(oldchildr != null) { oldchildr.setParent(null); checkClearLive(oldchildr, messages, messageIndex, index, null); } children.remove(index); removeChildrenData(index); if (nodeType == NodeRetained.SWITCH) { // force reEvaluation of switch children SwitchRetained sg = (SwitchRetained)this; sg.setWhichChild(sg.whichChild, true); } } /** * Returns the child specified by the index. * @param index which child to return * @return the children at location index */ Node getChild(int index) { SceneGraphObjectRetained sgo = (SceneGraphObjectRetained) children.get(index); if(sgo == null) return null; else return (Node) sgo.source; } /** * Returns an enumeration object of the children. * @return an enumeration object of the children */ Enumeration getAllChildren() { Vector userChildren=new Vector(children.size()); SceneGraphObjectRetained sgo; for(int i=0; i<children.size(); i++) { sgo = (SceneGraphObjectRetained)children.get(i); if(sgo != null) userChildren.add(sgo.source); else userChildren.add(null); } return userChildren.elements(); } void checkValidChild(Node child, String s) { if ((child != null) && (((child instanceof BranchGroup) && (((BranchGroupRetained) child.retained).attachedToLocale)) || (((NodeRetained)child.retained).parent != null))) { throw new MultipleParentException(J3dI18N.getString(s)); } } /** * Appends the specified child to this node's list of children. * @param child the child to add to this node's list of children */ void addChild(Node child) { checkValidChild(child, "GroupRetained2"); if (this.source.isLive()) { universe.resetWaitMCFlag(); synchronized (universe.sceneGraphLock) { universe.notifyStructureChangeListeners(true, this.source, (BranchGroup)child); doAddChild(child, null, 0); universe.setLiveState.clear(); } universe.waitForMC(); } else { doAddChild(child, null, 0); if (universe != null) { synchronized (universe.sceneGraphLock) { universe.setLiveState.clear(); } } } dirtyBoundsCache(); } // The method that does the work once the lock is acquired. void doAddChild(Node child, J3dMessage messages[], int messageIndex) { appendChildrenData(); if(child == null) { children.add(null); return; } NodeRetained childr = (NodeRetained) child.retained; childr.setParent(this); children.add(childr); checkSetLive(childr, children.size()-1, messages, messageIndex, null); if (this.source.isLive()) { ((BranchGroupRetained)childr).isNew = true; } } void moveTo(BranchGroup bg) { if (bg != null) { ((GroupRetained)bg.retained).dirtyBoundsCache(); } if (this.source.isLive()) { universe.resetWaitMCFlag(); synchronized (universe.sceneGraphLock) { GroupRetained oldParent = (GroupRetained)((BranchGroupRetained)bg.retained).parent; doMoveTo(bg); universe.setLiveState.clear(); if (oldParent==null) universe.notifyStructureChangeListeners(((BranchGroupRetained)bg.retained).locale, this.source, bg); else universe.notifyStructureChangeListeners(oldParent.source, this.source, bg); } universe.waitForMC(); } else { doMoveTo(bg); if (universe != null) { synchronized (universe.sceneGraphLock) { universe.setLiveState.clear(); } } } dirtyBoundsCache(); } // The method that does the work once the lock is acquired. void doMoveTo(BranchGroup branchGroup) { J3dMessage messages[] = null; int numMessages = 0; int detachStartIndex = 0; int attachStartIndex = 0; if(branchGroup != null) { BranchGroupRetained bg = (BranchGroupRetained) branchGroup.retained; GroupRetained g = (GroupRetained)bg.parent; // Find out how many messages to be created // Note that g can be NULL if branchGroup parent is // a Locale, in this case the following condition // will fail. // Figure out the number of messages based on whether the group // from which its moving from is live and group to which its // moving to is live if (g != null) { if (g.source.isLive()) { numMessages = 3; // REMOVE_NODES, ORDERED_GROUP_REMOVED,VIEWSPECIFICGROUP_CLEAR attachStartIndex = 3; } else { numMessages = 0; attachStartIndex = 0; } } else { // Attached to locale numMessages = 3; // REMOVE_NODES, ORDERED_GROUP_REMOVED, VIEWSPECIFICGROUP_CLEAR attachStartIndex = 3; } // Now, do the evaluation for the group that its going to be // attached to .. if (this.source.isLive()) { numMessages+=4; // INSERT_NODES, BEHAVIOR_ACTIVATE // ORDERED_GROUP_INSERTED, VIEWSPECIFICGROUP_INIT } messages = new J3dMessage[numMessages]; for (int i=0; i<numMessages; i++) { messages[i] = new J3dMessage(); messages[i].type = J3dMessage.INVALID_TYPE; } // Remove it from it's parents state if (g == null) { if (bg.locale != null) { bg.locale.doRemoveBranchGraph(branchGroup, messages, detachStartIndex); } } else { g.doRemoveChild(g.children.indexOf(bg), messages, detachStartIndex); } } // Add it to it's new parent doAddChild(branchGroup, messages, attachStartIndex); if (numMessages > 0) { int count = 0; for (int i=0; i < numMessages; i++) { if (messages[i].type != J3dMessage.INVALID_TYPE) { count++; } } if (count == numMessages) { // in most cases VirtualUniverse.mc.processMessage(messages); } else { J3dMessage ms[] = null; if (count > 0) { ms = new J3dMessage[count]; } int k=0; for (int i=0; i < numMessages; i++) { if (messages[i].type != J3dMessage.INVALID_TYPE) { ms[k++] = messages[i]; } } if (ms != null) { VirtualUniverse.mc.processMessage(ms); } } } } /** * Returns a count of this nodes' children. * @return the number of children descendant from this node */ int numChildren() { return children.size(); } // Remove a light from the list of lights void removeLight(int numLgt, LightRetained[] removelight, HashKey key) { ArrayList l; int index; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)lights.get(hkIndex); if (l != null) { for (int i = 0; i < numLgt; i++) { index = l.indexOf(removelight[i]); l.remove(index); } } } else { l = (ArrayList)lights.get(0); for (int i = 0; i < numLgt; i++) { index = l.indexOf(removelight[i]); l.remove(index); } } /* // XXXX: lights may remove twice or more during clearLive(), // one from itself and one call from every LightRetained // reference this. So there is case that this procedure get // called when light already removed. if (i >= 0) lights.remove(i); */ } void addAllNodesForScopedLight(int numLgts, LightRetained[] ml, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processAllNodesForScopedLight(numLgts, ml, list, k); } } else { processAllNodesForScopedLight(numLgts, ml, list, k); } } void processAllNodesForScopedLight(int numLgts, LightRetained[] ml, ArrayList list, HashKey k) { if (allocatedLights) { addLight(ml, numLgts, k); } if (this.source.isLive() || this.isInSetLive()) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained && (child.source.isLive() || child.isInSetLive())) ((GroupRetained)child).processAllNodesForScopedLight(numLgts, ml, list, k); else if (child instanceof LinkRetained && (child.source.isLive()|| child.isInSetLive())) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processAllNodesForScopedLight(numLgts, ml, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive()) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } // If its a group, then add the scope to the group, if // its a shape, then keep a list to be added during // updateMirrorObject void removeAllNodesForScopedLight(int numLgts, LightRetained[] ml, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processRemoveAllNodesForScopedLight(numLgts, ml, list, k); } } else { processRemoveAllNodesForScopedLight(numLgts, ml, list, k); } } void processRemoveAllNodesForScopedLight(int numLgts, LightRetained[] ml, ArrayList list, HashKey k) { if (allocatedLights) { removeLight(numLgts,ml, k); } // If the source is live, then notify the children if (this.source.isLive() && !isInClearLive) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained &&(child.source.isLive() && ! ((GroupRetained)child).isInClearLive)) ((GroupRetained)child).processRemoveAllNodesForScopedLight(numLgts, ml,list, k); else if (child instanceof LinkRetained && child.source.isLive()) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processRemoveAllNodesForScopedLight(numLgts, ml, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive() ) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } void addAllNodesForScopedFog(FogRetained mfog, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processAddNodesForScopedFog(mfog, list, k); } } else { processAddNodesForScopedFog(mfog, list, k); } } void processAddNodesForScopedFog(FogRetained mfog, ArrayList list, HashKey k) { // If this group has it own scoping list then add .. if (allocatedFogs) addFog(mfog, k); // If the source is live, then notify the children if (this.source.isLive() || this.isInSetLive()) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained && (child.source.isLive()|| child.isInSetLive())) ((GroupRetained)child).processAddNodesForScopedFog(mfog, list, k); else if (child instanceof LinkRetained && (child.source.isLive()||child.isInSetLive() )) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processAddNodesForScopedFog(mfog, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive()) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } // If its a group, then add the scope to the group, if // its a shape, then keep a list to be added during // updateMirrorObject void removeAllNodesForScopedFog(FogRetained mfog, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processRemoveAllNodesForScopedFog(mfog, list, k); } } else { processRemoveAllNodesForScopedFog(mfog, list, k); } } void processRemoveAllNodesForScopedFog(FogRetained mfog, ArrayList list, HashKey k) { // If the source is live, then notify the children if (allocatedFogs) removeFog(mfog, k); if (this.source.isLive() && !isInClearLive) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained &&(child.source.isLive() && ! ((GroupRetained)child).isInClearLive)) ((GroupRetained)child).processRemoveAllNodesForScopedFog(mfog, list, k); else if (child instanceof LinkRetained && child.source.isLive()) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processRemoveAllNodesForScopedFog(mfog, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive() ) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } void addAllNodesForScopedModelClip(ModelClipRetained mModelClip, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processAddNodesForScopedModelClip(mModelClip, list, k); } } else { processAddNodesForScopedModelClip(mModelClip, list, k); } } void processAddNodesForScopedModelClip(ModelClipRetained mModelClip, ArrayList list, HashKey k) { if (allocatedMclips) addModelClip(mModelClip, k); // If the source is live, then notify the children if (this.source.isLive() || this.isInSetLive()) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained && (child.source.isLive()||child.isInSetLive() )) ((GroupRetained)child).processAddNodesForScopedModelClip( mModelClip, list, k); else if (child instanceof LinkRetained && (child.source.isLive()||child.isInSetLive() )) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processAddNodesForScopedModelClip(mModelClip, list, k.append("+").append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive()) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } void removeAllNodesForScopedModelClip(ModelClipRetained mModelClip, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processRemoveAllNodesForScopedModelClip(mModelClip, list, k); } } else { processRemoveAllNodesForScopedModelClip(mModelClip, list, k); } } // If its a group, then add the scope to the group, if // its a shape, then keep a list to be added during // updateMirrorObject void processRemoveAllNodesForScopedModelClip(ModelClipRetained mModelClip, ArrayList list, HashKey k) { // If the source is live, then notify the children if (allocatedMclips) removeModelClip(mModelClip, k); if (this.source.isLive() && !isInClearLive) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained &&(child.source.isLive() && ! ((GroupRetained)child).isInClearLive)) ((GroupRetained)child).processRemoveAllNodesForScopedModelClip(mModelClip, list, k); else if (child instanceof LinkRetained && child.source.isLive()) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processRemoveAllNodesForScopedModelClip(mModelClip, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive() ) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } void addAllNodesForScopedAltApp(AlternateAppearanceRetained mAltApp, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processAddNodesForScopedAltApp(mAltApp, list, k); } } else { processAddNodesForScopedAltApp(mAltApp, list, k); } } // If its a group, then add the scope to the group, if // its a shape, then keep a list to be added during // updateMirrorObject void processAddNodesForScopedAltApp(AlternateAppearanceRetained mAltApp, ArrayList list, HashKey k) { // If the source is live, then notify the children if (allocatedAltApps) addAltApp(mAltApp, k); if (this.source.isLive() || this.isInSetLive()) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained && (child.source.isLive() || child.isInSetLive())) ((GroupRetained)child).processAddNodesForScopedAltApp(mAltApp, list, k); else if (child instanceof LinkRetained && child.source.isLive()) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processAddNodesForScopedAltApp(mAltApp, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive() ) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } void removeAllNodesForScopedAltApp(AlternateAppearanceRetained mAltApp, ArrayList list, HashKey k) { if (inSharedGroup) { for (int i = 0; i < localToVworldKeys.length; i++) { k.set(localToVworldKeys[i]); processRemoveNodesForScopedAltApp(mAltApp, list, k); } } else { processAddNodesForScopedAltApp(mAltApp, list, k); } } // If its a group, then add the scope to the group, if // its a shape, then keep a list to be added during // updateMirrorObject void processRemoveNodesForScopedAltApp(AlternateAppearanceRetained mAltApp, ArrayList list, HashKey k) { // If the source is live, then notify the children if (allocatedAltApps) removeAltApp(mAltApp, k); if (this.source.isLive() && !isInClearLive) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) { if (child instanceof GroupRetained &&(child.source.isLive() && ! ((GroupRetained)child).isInClearLive)) ((GroupRetained)child).processRemoveNodesForScopedAltApp(mAltApp, list, k); else if (child instanceof LinkRetained && child.source.isLive()) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } ((GroupRetained)(ln.sharedGroup)). processRemoveNodesForScopedAltApp(mAltApp, list, k.append("+"). append(ln.nodeId)); k.count = lastCount; } else if (child instanceof Shape3DRetained && child.source.isLive() ) { ((Shape3DRetained)child).getMirrorObjects(list, k); } else if (child instanceof MorphRetained && child.source.isLive()) { ((MorphRetained)child).getMirrorObjects(list, k); } } } } } synchronized void setLightScope() { // Make group's own copy ArrayList newLights; if (!allocatedLights) { allocatedLights = true; if (lights != null) { newLights = new ArrayList(lights.size()); int size = lights.size(); for (int i = 0; i < size; i++) { ArrayList l = (ArrayList)lights.get(i); if (l != null) { newLights.add(l.clone()); } else { newLights.add(null); } } } else { if (inSharedGroup) { newLights = new ArrayList(); for (int i = 0; i < localToVworldKeys.length; i++) { newLights.add(new ArrayList()); } } else { newLights = new ArrayList(); newLights.add(new ArrayList()); } } lights = newLights; } scopingRefCount++; } synchronized void removeLightScope() { scopingRefCount--; } synchronized void setFogScope() { // Make group's own copy ArrayList newFogs; if (!allocatedFogs) { allocatedFogs = true; if (fogs != null) { newFogs = new ArrayList(fogs.size()); int size = fogs.size(); for (int i = 0; i < size; i++) { ArrayList l = (ArrayList)fogs.get(i); if (l != null) { newFogs.add(l.clone()); } else { newFogs.add(null); } } } else { if (inSharedGroup) { newFogs = new ArrayList(); for (int i = 0; i < localToVworldKeys.length; i++) { newFogs.add(new ArrayList()); }; } else { newFogs = new ArrayList(); newFogs.add(new ArrayList()); } } fogs = newFogs; } scopingRefCount++; } synchronized void removeFogScope() { scopingRefCount--; } synchronized void setMclipScope() { // Make group's own copy ArrayList newMclips; if (!allocatedMclips) { allocatedMclips = true; if (modelClips != null) { newMclips = new ArrayList(modelClips.size()); int size = modelClips.size(); for (int i = 0; i < size; i++) { ArrayList l = (ArrayList)modelClips.get(i); if (l != null) { newMclips.add(l.clone()); } else { newMclips.add(null); } } } else { if (inSharedGroup) { newMclips =new ArrayList(); for (int i = 0; i < localToVworldKeys.length; i++) { newMclips.add(new ArrayList()); } } else { newMclips = new ArrayList(); newMclips.add(new ArrayList()); } } modelClips = newMclips; } scopingRefCount++; } synchronized void removeMclipScope() { scopingRefCount--; } synchronized void setAltAppScope() { // Make group's own copy ArrayList newAltApps; if (!allocatedAltApps) { allocatedAltApps = true; if (altAppearances != null) { newAltApps = new ArrayList(altAppearances.size()); int size = altAppearances.size(); for (int i = 0; i < size; i++) { ArrayList l = (ArrayList)altAppearances.get(i); if (l != null) { newAltApps.add(l.clone()); } else { newAltApps.add(null); } } } else { if (inSharedGroup) { newAltApps = new ArrayList(); for (int i = 0; i < localToVworldKeys.length; i++) { newAltApps.add(new ArrayList()); } } else { newAltApps = new ArrayList(); newAltApps.add(new ArrayList()); } } altAppearances = newAltApps; } scopingRefCount++; } synchronized void removeAltAppScope() { scopingRefCount--; } synchronized boolean usedInScoping() { return (scopingRefCount > 0); } // Add a light to the list of lights void addLight(LightRetained[] addlight, int numLgts, HashKey key) { ArrayList l; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)lights.get(hkIndex); if (l != null) { for (int i = 0; i < numLgts; i++) { l.add(addlight[i]); } } } else { l = (ArrayList)lights.get(0); for (int i = 0; i < numLgts; i++) { l.add(addlight[i]); } } } // Add a fog to the list of fogs void addFog(FogRetained fog, HashKey key) { ArrayList l; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)fogs.get(hkIndex); if (l != null) { l.add(fog); } } else { l = (ArrayList)fogs.get(0); l.add(fog); } } // Add a ModelClip to the list of ModelClip void addModelClip(ModelClipRetained modelClip, HashKey key) { ArrayList l; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)modelClips.get(hkIndex); if (l != null) { l.add(modelClip); } } else { l = (ArrayList)modelClips.get(0); l.add(modelClip); } } // Add a alt appearance to the list of alt appearance void addAltApp(AlternateAppearanceRetained altApp, HashKey key) { ArrayList l; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)altAppearances.get(hkIndex); if (l != null) { l.add(altApp); } } else { l = (ArrayList)altAppearances.get(0); l.add(altApp); } } // Remove a fog from the list of fogs void removeFog(FogRetained fog, HashKey key) { ArrayList l; int index; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)fogs.get(hkIndex); if (l != null) { index = l.indexOf(fog); l.remove(index); } } else { l = (ArrayList)fogs.get(0); index = l.indexOf(fog); l.remove(index); } } // Remove a ModelClip from the list of ModelClip void removeModelClip(ModelClipRetained modelClip, HashKey key) { ArrayList l; int index; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)modelClips.get(hkIndex); if (l != null) { index = l.indexOf(modelClip); l.remove(index); } } else { l = (ArrayList)modelClips.get(0); index = l.indexOf(modelClip); l.remove(index); } } // Remove a fog from the list of alt appearance void removeAltApp(AlternateAppearanceRetained altApp, HashKey key) { ArrayList l; int index; if (inSharedGroup) { int hkIndex = key.equals(localToVworldKeys, 0, localToVworldKeys.length); l = (ArrayList)altAppearances.get(hkIndex); if (l != null) { index = l.indexOf(altApp); l.remove(index); } } else { l = (ArrayList)altAppearances.get(0); index = l.indexOf(altApp); l.remove(index); } } void updatePickable(HashKey keys[], boolean pick[]) { int nchild = children.size()-1; super.updatePickable(keys, pick); int i=0; NodeRetained child; + // Fix for issue 540 + if (children.size()==0) { + return; + } + // End fix for issue 540 + for (i = 0; i < nchild; i++) { child = (NodeRetained)children.get(i); if(child != null) child.updatePickable(keys, (boolean []) pick.clone()); } // No need to clone for the last value child = (NodeRetained)children.get(i); if(child != null) child.updatePickable(keys, pick); } void updateCollidable(HashKey keys[], boolean collide[]) { int nchild = children.size()-1; super.updateCollidable(keys, collide); int i=0; NodeRetained child; for (i = 0; i < nchild; i++) { child = (NodeRetained)children.get(i); if(child != null) child.updateCollidable(keys, (boolean []) collide.clone()); } // No need to clone for the last value child = (NodeRetained)children.get(i); if(child != null) child.updateCollidable(keys, collide); } void setAlternateCollisionTarget(boolean target) { if (collisionTarget == target) return; collisionTarget = target; if (source.isLive()) { // Notify parent TransformGroup to add itself // Since we want to update collisionVwcBounds when // transform change in TransformStructure. TransformGroupRetained tg; J3dMessage message = new J3dMessage(); message.threads = J3dThread.UPDATE_GEOMETRY; message.universe = universe; // send message to GeometryStructure to add/remove this // group node in BHTree as AlternateCollisionTarget int numPath; CachedTargets newCtArr[] = null; if (target) { createMirrorGroup(); TargetsInterface ti = getClosestTargetsInterface( TargetsInterface.TRANSFORM_TARGETS); if (ti != null) { // update targets CachedTargets ct; Targets targets = new Targets(); numPath = mirrorGroup.size(); newCtArr = new CachedTargets[numPath]; for (int i=0; i<numPath; i++) { ct = ti.getCachedTargets(TargetsInterface.TRANSFORM_TARGETS, i, -1); if (ct != null) { targets.addNode((NnuId)mirrorGroup.get(i), Targets.GRP_TARGETS); newCtArr[i] = targets.snapShotAdd(ct); } else { newCtArr[i] = null; } } // update target threads and propagate change to above // nodes in scene graph ti.updateTargetThreads(TargetsInterface.TRANSFORM_TARGETS, newCtArr); ti.resetCachedTargets(TargetsInterface.TRANSFORM_TARGETS, newCtArr, -1); } message.type = J3dMessage.INSERT_NODES; message.args[0] = mirrorGroup.toArray(); message.args[1] = ti; message.args[2] = newCtArr; } else { TargetsInterface ti = getClosestTargetsInterface(TargetsInterface.TRANSFORM_TARGETS); if (ti != null) { // update targets Targets targets = new Targets(); CachedTargets ct; numPath = mirrorGroup.size(); newCtArr = new CachedTargets[numPath]; for (int i=0; i<numPath; i++) { ct = ti.getCachedTargets(TargetsInterface.TRANSFORM_TARGETS, i, -1); if (ct != null) { targets.addNode((NnuId)mirrorGroup.get(i), Targets.GRP_TARGETS); //Note snapShotRemove calls targets.clearNode() newCtArr[i] = targets.snapShotRemove(ct); } else { newCtArr[i] = null; } } // update target threads and propagate change to above // nodes in scene graph ti.updateTargetThreads(TargetsInterface.TRANSFORM_TARGETS, newCtArr); ti.resetCachedTargets(TargetsInterface.TRANSFORM_TARGETS, newCtArr, -1); } message.type = J3dMessage.REMOVE_NODES; message.args[0] = mirrorGroup.toArray(); message.args[1] = ti; message.args[2] = newCtArr; mirrorGroup = null; // for gc } VirtualUniverse.mc.processMessage(message); } } boolean getAlternateCollisionTarget() { return collisionTarget; } /** * This checks is setLive needs to be called. If it does, it gets the * needed info and calls it. */ void checkSetLive(NodeRetained child, int childIndex, J3dMessage messages[], int messageIndex, NodeRetained linkNode) { checkSetLive(child, childIndex, localToVworldKeys, inSharedGroup, messages, messageIndex, linkNode); } /** * This checks is setLive needs to be called. If it does, it gets the * needed info and calls it. */ void checkSetLive(NodeRetained child, int childIndex, HashKey keys[], boolean isShared, J3dMessage messages[], int messageIndex, NodeRetained linkNode) { SceneGraphObject me = this.source; SetLiveState s; J3dMessage createMessage; boolean sendMessages = false; boolean sendOGMessage = true; boolean sendVSGMessage = true; if (me.isLive()) { s = universe.setLiveState; s.reset(locale); s.refCount = refCount; s.inSharedGroup = isShared; s.inBackgroundGroup = inBackgroundGroup; s.inViewSpecificGroup = inViewSpecificGroup; s.geometryBackground = geometryBackground; s.keys = keys; s.viewLists = viewLists; s.parentBranchGroupPaths = branchGroupPaths; // Note that there is no need to clone individual // branchGroupArray since they will get replace (not append) // by creating a new reference in child's group. s.branchGroupPaths = (ArrayList) branchGroupPaths.clone(); s.orderedPaths = orderedPaths; // Make the scoped fogs and lights of the child to include, the // the scoped fog of this group s.lights = lights; s.altAppearances = altAppearances; s.fogs = fogs; s.modelClips = modelClips; boolean pick[]; boolean collide[]; if (!inSharedGroup) { pick = new boolean[1]; collide = new boolean[1]; } else { pick = new boolean[localToVworldKeys.length]; collide = new boolean[localToVworldKeys.length]; } findPickableFlags(pick); super.updatePickable(null, pick); s.pickable = pick; findCollidableFlags(collide); super.updateCollidable(null, collide); s.collidable = collide; TargetsInterface transformInterface, switchInterface; transformInterface = initTransformStates(s, true); switchInterface = initSwitchStates(s, this, child, linkNode, true); if (s.inViewSpecificGroup && (s.changedViewGroup == null)) { s.changedViewGroup = new ArrayList(); s.changedViewList = new ArrayList(); s.keyList = new int[10]; s.viewScopedNodeList = new ArrayList(); s.scopedNodesViewList = new ArrayList(); } childCheckSetLive(child, childIndex, s, linkNode); CachedTargets[] newCtArr = null; newCtArr = updateTransformStates(s, transformInterface, true); updateSwitchStates(s, switchInterface, true); // We're sending multiple messages in the call, inorder to // have all these messages to be process as an atomic operation. // We need to create an array of messages to MasterControl, this // will ensure that all these messages will get the same time stamp. // If it is called from "moveTo", messages is not null. if (messages == null) { int numMessages = 2; if(s.ogList.size() > 0) { numMessages++; } else { sendOGMessage = false; } if(s.changedViewGroup != null) { numMessages++; } else { sendVSGMessage = false; } messages = new J3dMessage[numMessages]; messageIndex = 0; for(int mIndex=0; mIndex < numMessages; mIndex++) { messages[mIndex] = new J3dMessage(); } sendMessages = true; } if(sendOGMessage) { createMessage = messages[messageIndex++]; createMessage.threads = J3dThread.UPDATE_RENDER | J3dThread.UPDATE_RENDERING_ENVIRONMENT; createMessage.type = J3dMessage.ORDERED_GROUP_INSERTED; createMessage.universe = universe; createMessage.args[0] = s.ogList.toArray(); createMessage.args[1] = s.ogChildIdList.toArray(); createMessage.args[2] = s.ogOrderedIdList.toArray(); createMessage.args[3] = s.ogCIOList.toArray(); createMessage.args[4] = s.ogCIOTableList.toArray(); } if(sendVSGMessage) { createMessage = messages[messageIndex++]; createMessage.threads = J3dThread.UPDATE_RENDERING_ENVIRONMENT; createMessage.type = J3dMessage.VIEWSPECIFICGROUP_INIT; createMessage.universe = universe; createMessage.args[0] = s.changedViewGroup; createMessage.args[1] = s.changedViewList; createMessage.args[2] = s.keyList; } createMessage = messages[messageIndex++]; createMessage.threads = s.notifyThreads; createMessage.type = J3dMessage.INSERT_NODES; createMessage.universe = universe; createMessage.args[0] = s.nodeList.toArray(); if (newCtArr != null) { createMessage.args[1] = transformInterface; createMessage.args[2] = newCtArr; } else { createMessage.args[1] = null; createMessage.args[2] = null; } if (s.viewScopedNodeList != null) { createMessage.args[3] = s.viewScopedNodeList; createMessage.args[4] = s.scopedNodesViewList; } // execute user behavior's initialize methods int sz = s.behaviorNodes.size(); for (int i=0; i < sz; i++) { BehaviorRetained b; b = (BehaviorRetained)s.behaviorNodes.get(i); b.executeInitialize(); } s.behaviorNodes.clear(); createMessage = messages[messageIndex++]; createMessage.threads = J3dThread.UPDATE_BEHAVIOR; createMessage.type = J3dMessage.BEHAVIOR_ACTIVATE; createMessage.universe = universe; if (sendMessages == true) { VirtualUniverse.mc.processMessage(messages); } if (nodeType == NodeRetained.SWITCH) { // force reEvaluation of switch children SwitchRetained sw = (SwitchRetained)this; sw.setWhichChild(sw.whichChild, true); } //Reset SetLiveState to free up memory. s.reset(null); } } void checkClearLive(NodeRetained child, J3dMessage messages[], int messageIndex, int childIndex, NodeRetained linkNode) { checkClearLive(child, localToVworldKeys, inSharedGroup, messages, messageIndex, childIndex, linkNode); } /** * This checks if clearLive needs to be called. If it does, it gets the * needed info and calls it. */ void checkClearLive(NodeRetained child, HashKey keys[], boolean isShared, J3dMessage messages[], int messageIndex, int childIndex, NodeRetained linkNode) { SceneGraphObject me = this.source; J3dMessage destroyMessage; boolean sendMessages = false; boolean sendOGMessage = true; boolean sendVSGMessage = true; int i, j; TransformGroupRetained tg; if (me.isLive()) { SetLiveState s = universe.setLiveState; s.reset(locale); s.refCount = refCount; s.inSharedGroup = isShared; s.inBackgroundGroup = inBackgroundGroup; s.inViewSpecificGroup = inViewSpecificGroup; s.keys = keys; s.fogs = fogs; s.lights = lights; s.altAppearances = altAppearances; s.modelClips = modelClips; // Issue 312: Allocate data structures if we are in a ViewSpecificGroup if (s.inViewSpecificGroup && (s.changedViewGroup == null)) { s.changedViewGroup = new ArrayList(); s.changedViewList = new ArrayList(); s.keyList = new int[10]; s.viewScopedNodeList = new ArrayList(); s.scopedNodesViewList = new ArrayList(); } if (this instanceof OrderedGroupRetained && linkNode == null) { // set this regardless of refCount s.ogList.add(this); s.ogChildIdList.add(new Integer(childIndex)); s.ogCIOList.add(this); int[] newArr = null; OrderedGroupRetained og = (OrderedGroupRetained)this; if(og.userChildIndexOrder != null) { newArr = new int[og.userChildIndexOrder.length]; System.arraycopy(og.userChildIndexOrder, 0, newArr, 0, og.userChildIndexOrder.length); } s.ogCIOTableList.add(newArr); } // Issue 312: always initialize s.viewLists s.viewLists = viewLists; TargetsInterface transformInterface, switchInterface; transformInterface = initTransformStates(s, false); switchInterface = initSwitchStates(s, this, child, linkNode, false); child.clearLive(s); CachedTargets[] newCtArr = null; newCtArr = updateTransformStates(s, transformInterface, false); updateSwitchStates(s, switchInterface, false); // We're sending multiple messages in the call, inorder to // have all these messages to be process as an atomic operation. // We need to create an array of messages to MasterControl, this // will ensure that all these messages will get the same time stamp. // If it is called from "moveTo", messages is not null. if (messages == null) { int numMessages = 1; if(s.ogList.size() > 0) { numMessages++; } else { sendOGMessage = false; } if(s.changedViewGroup != null) { numMessages++; } else { sendVSGMessage = false; } messages = new J3dMessage[numMessages]; messageIndex = 0; for(int mIndex=0; mIndex < numMessages; mIndex++) { messages[mIndex] = new J3dMessage(); } sendMessages = true; } if(sendOGMessage) { destroyMessage = messages[messageIndex++]; destroyMessage.threads = J3dThread.UPDATE_RENDER | J3dThread.UPDATE_RENDERING_ENVIRONMENT; destroyMessage.type = J3dMessage.ORDERED_GROUP_REMOVED; destroyMessage.universe = universe; destroyMessage.args[0] = s.ogList.toArray(); destroyMessage.args[1] = s.ogChildIdList.toArray(); destroyMessage.args[3] = s.ogCIOList.toArray(); destroyMessage.args[4] = s.ogCIOTableList.toArray(); } // Issue 312: We need to send the REMOVE_NODES message to the // RenderingEnvironmentStructure before we send VIEWSPECIFICGROUP_CLEAR, // since the latter clears the list of views that is referred to by // scopedNodesViewList and used by removeNodes. destroyMessage = messages[messageIndex++]; destroyMessage.threads = s.notifyThreads; destroyMessage.type = J3dMessage.REMOVE_NODES; destroyMessage.universe = universe; destroyMessage.args[0] = s.nodeList.toArray(); if (newCtArr != null) { destroyMessage.args[1] = transformInterface; destroyMessage.args[2] = newCtArr; } else { destroyMessage.args[1] = null; destroyMessage.args[2] = null; } if (s.viewScopedNodeList != null) { destroyMessage.args[3] = s.viewScopedNodeList; destroyMessage.args[4] = s.scopedNodesViewList; } if(sendVSGMessage) { destroyMessage = messages[messageIndex++]; destroyMessage.threads = J3dThread.UPDATE_RENDERING_ENVIRONMENT; destroyMessage.type = J3dMessage.VIEWSPECIFICGROUP_CLEAR; destroyMessage.universe = universe; destroyMessage.args[0] = s.changedViewGroup; destroyMessage.args[1] = s.keyList; } if (sendMessages == true) { VirtualUniverse.mc.processMessage(messages); } s.reset(null); // for GC } } TargetsInterface initTransformStates(SetLiveState s, boolean isSetLive) { int numPaths = (inSharedGroup)? s.keys.length : 1; TargetsInterface ti = getClosestTargetsInterface( TargetsInterface.TRANSFORM_TARGETS); if (isSetLive) { s.currentTransforms = localToVworld; s.currentTransformsIndex = localToVworldIndex; s.localToVworldKeys = localToVworldKeys; s.localToVworld = s.currentTransforms; s.localToVworldIndex = s.currentTransformsIndex; s.parentTransformLink = parentTransformLink; if (parentTransformLink != null) { if (parentTransformLink instanceof TransformGroupRetained) { TransformGroupRetained tg; tg = (TransformGroupRetained) parentTransformLink; s.childTransformLinks = tg.childTransformLinks; } else { SharedGroupRetained sg; sg = (SharedGroupRetained) parentTransformLink; s.childTransformLinks = sg.childTransformLinks; } } } int transformLevels[] = new int[numPaths]; findTransformLevels(transformLevels); s.transformLevels = transformLevels; if (ti != null) { Targets[] newTargets = new Targets[numPaths]; for(int i=0; i<numPaths; i++) { if (s.transformLevels[i] >= 0) { newTargets[i] = new Targets(); } else { newTargets[i] = null; } } s.transformTargets = newTargets; // XXXX: optimization for targetThreads computation, require // cleanup in GroupRetained.doSetLive() //s.transformTargetThreads = 0; } return ti; } CachedTargets[] updateTransformStates(SetLiveState s, TargetsInterface ti, boolean isSetLive) { CachedTargets[] newCtArr = null; if (ti != null) { if (isSetLive) { CachedTargets ct; int newTargetThreads = 0; int hkIndex; newCtArr = new CachedTargets[localToVworld.length]; // update targets if (! inSharedGroup) { if (s.transformTargets[0] != null) { ct = ti.getCachedTargets( TargetsInterface.TRANSFORM_TARGETS, 0, -1); if (ct != null) { newCtArr[0] = s.transformTargets[0].snapShotAdd(ct); } } else { newCtArr[0] = null; } } else { for (int i=0; i<s.keys.length; i++) { if (s.transformTargets[i] != null) { ct = ti.getCachedTargets( TargetsInterface.TRANSFORM_TARGETS, i, -1); if (ct != null) { newCtArr[i] = s.transformTargets[i].snapShotAdd(ct); } } else { newCtArr[i] = null; } } } } else { CachedTargets ct; int hkIndex; newCtArr = new CachedTargets[localToVworld.length]; if (! inSharedGroup) { if (s.transformTargets[0] != null) { ct = ti.getCachedTargets( TargetsInterface.TRANSFORM_TARGETS, 0, -1); if (ct != null) { newCtArr[0] = s.transformTargets[0].snapShotRemove(ct); } } else { newCtArr[0] = null; } } else { for (int i=0; i<s.keys.length; i++) { if (s.transformTargets[i] != null) { ct = ti.getCachedTargets( TargetsInterface.TRANSFORM_TARGETS, i, -1); if (ct != null) { newCtArr[i] = s.transformTargets[i].snapShotRemove(ct); } } else { newCtArr[i] = null; } } } } // update target threads and propagate change to above // nodes in scene graph ti.updateTargetThreads(TargetsInterface.TRANSFORM_TARGETS, newCtArr); ti.resetCachedTargets(TargetsInterface.TRANSFORM_TARGETS, newCtArr, -1); } return newCtArr; } TargetsInterface initSwitchStates(SetLiveState s, NodeRetained parentNode, NodeRetained childNode, NodeRetained linkNode, boolean isSetLive) { NodeRetained child; NodeRetained parent; int i,j; findSwitchInfo(s, parentNode, childNode, linkNode); TargetsInterface ti = getClosestTargetsInterface( TargetsInterface.SWITCH_TARGETS); if (ti != null) { Targets[] newTargets = null; int numPaths = (inSharedGroup)? s.keys.length : 1; newTargets = new Targets[numPaths]; for(i=0; i<numPaths; i++) { if (s.switchLevels[i] >= 0) { newTargets[i] = new Targets(); } else { newTargets[i] = null; } } s.switchTargets = newTargets; } if (isSetLive) { // set switch states if (nodeType == NodeRetained.SWITCH) { i = parentSwitchLinkChildIndex; s.childSwitchLinks = (ArrayList)childrenSwitchLinks.get(i); s.parentSwitchLink = this; } else { if (nodeType == NodeRetained.SHAREDGROUP) { i = parentSwitchLinkChildIndex; s.childSwitchLinks = (ArrayList)childrenSwitchLinks.get(i); s.parentSwitchLink = this; } else { s.parentSwitchLink = parentSwitchLink; if (parentSwitchLink != null) { i = parentSwitchLinkChildIndex; s.childSwitchLinks = (ArrayList) parentSwitchLink.childrenSwitchLinks.get(i); } } } if (ti != null) { s.switchStates = ti.getTargetsData( TargetsInterface.SWITCH_TARGETS, parentSwitchLinkChildIndex); } else { s.switchStates = new ArrayList(1); s.switchStates.add(new SwitchState(false)); } } return ti; } void updateSwitchStates(SetLiveState s, TargetsInterface ti, boolean isSetLive) { // update switch leaves's compositeSwitchMask for ancestors // and update switch leaves' switchOn flag if at top level switch if (ti != null) { if (isSetLive) { CachedTargets[] newCtArr = null; CachedTargets ct; newCtArr = new CachedTargets[localToVworld.length]; // update targets if (! inSharedGroup) { if (s.switchTargets[0] != null) { ct = ti.getCachedTargets( TargetsInterface.SWITCH_TARGETS, 0, parentSwitchLinkChildIndex); if (ct != null) { newCtArr[0] = s.switchTargets[0].snapShotAdd(ct); } else { newCtArr[0] = s.switchTargets[0].snapShotInit(); } } else { newCtArr[0] = null; } } else { for (int i=0; i<s.keys.length; i++) { if (s.switchTargets[i] != null) { ct = ti.getCachedTargets( TargetsInterface.SWITCH_TARGETS, i, parentSwitchLinkChildIndex); if (ct != null) { newCtArr[i] = s.switchTargets[i].snapShotAdd(ct); } else { newCtArr[i] = s.switchTargets[i].snapShotInit(); } } else { newCtArr[i] = null; } } } ti.resetCachedTargets(TargetsInterface.SWITCH_TARGETS, newCtArr, parentSwitchLinkChildIndex); if (ti instanceof SwitchRetained) { ((SwitchRetained)ti).traverseSwitchParent(); } else if (ti instanceof SharedGroupRetained) { ((SharedGroupRetained)ti).traverseSwitchParent(); } } else { CachedTargets ct; CachedTargets[] newCtArr = new CachedTargets[localToVworld.length]; if (! inSharedGroup) { if (s.switchTargets[0] != null) { ct = ti.getCachedTargets( TargetsInterface.SWITCH_TARGETS, 0, parentSwitchLinkChildIndex); if (ct != null) { newCtArr[0] = s.switchTargets[0].snapShotRemove(ct); } } else { newCtArr[0] = null; } } else { for (int i=0; i<s.keys.length; i++) { if (s.switchTargets[i] != null) { ct = ti.getCachedTargets( TargetsInterface.SWITCH_TARGETS, i, parentSwitchLinkChildIndex); if (ct != null) { newCtArr[i] = s.switchTargets[i].snapShotRemove(ct); } } else { newCtArr[i] = null; } } } ti.resetCachedTargets(TargetsInterface.SWITCH_TARGETS, newCtArr, parentSwitchLinkChildIndex); } } } void appendChildrenData() { } void insertChildrenData(int index) { } void removeChildrenData(int index) { } TargetsInterface getClosestTargetsInterface(int type) { return (type == TargetsInterface.TRANSFORM_TARGETS)? (TargetsInterface)parentTransformLink: (TargetsInterface)parentSwitchLink; } synchronized void updateLocalToVworld() { NodeRetained child; // For each children call ..... for (int i=children.size()-1; i>=0; i--) { child = (NodeRetained)children.get(i); if(child != null) child.updateLocalToVworld(); } } void setNodeData(SetLiveState s) { super.setNodeData(s); orderedPaths = s.orderedPaths; } void removeNodeData(SetLiveState s) { if((!inSharedGroup) || (s.keys.length == localToVworld.length)) { orderedPaths = null; } else { // Set it back to its parent localToVworld data. This is b/c the // parent has changed it localToVworld data arrays. orderedPaths = s.orderedPaths; } super.removeNodeData(s); } void setLive(SetLiveState s) { doSetLive(s); super.markAsLive(); } // Note that SwitchRetained, OrderedGroupRetained and SharedGroupRetained // override this method void childDoSetLive(NodeRetained child, int childIndex, SetLiveState s) { if(child!=null) child.setLive(s); } // Note that BranchRetained, OrderedGroupRetained and SharedGroupRetained // TransformGroupRetained override this method void childCheckSetLive(NodeRetained child, int childIndex, SetLiveState s, NodeRetained linkNode) { child.setLive(s); } /** * This version of setLive calls setLive on all of its chidren. */ void doSetLive(SetLiveState s) { int i, nchildren; BoundingSphere boundingSphere = new BoundingSphere(); NodeRetained child; super.doSetLive(s); locale = s.locale; inViewSpecificGroup = s.inViewSpecificGroup; nchildren = children.size(); ArrayList savedScopedLights = s.lights; ArrayList savedScopedFogs = s.fogs; ArrayList savedScopedAltApps = s.altAppearances; ArrayList savedScopedMclips = s.modelClips; boolean oldpickableArray[] = (boolean []) s.pickable.clone(); boolean oldcollidableArray[] = (boolean []) s.collidable.clone(); boolean workingpickableArray[] = new boolean[oldpickableArray.length]; boolean workingcollidableArray[] = new boolean[oldcollidableArray.length]; ArrayList oldBranchGroupPaths = s.branchGroupPaths; setScopingInfo(s); if (!(this instanceof ViewSpecificGroupRetained)) { viewLists = s.viewLists; } for (i=0; i<nchildren; i++) { child = (NodeRetained)children.get(i); // Restore old values before child.setLive(s) System.arraycopy(oldpickableArray, 0, workingpickableArray, 0, oldpickableArray.length); System.arraycopy(oldcollidableArray, 0, workingcollidableArray, 0, oldcollidableArray.length); s.pickable = workingpickableArray; s.collidable = workingcollidableArray; // s.branchGroupPaths will be modified by child setLive() // so we have to restore it every time. s.parentBranchGroupPaths = branchGroupPaths; s.branchGroupPaths = (ArrayList) oldBranchGroupPaths.clone(); s.inViewSpecificGroup = inViewSpecificGroup; childDoSetLive(child, i, s); } if (collisionTarget) { processCollisionTarget(s); } s.lights = savedScopedLights; s.fogs = savedScopedFogs; s.altAppearances = savedScopedAltApps; s.modelClips = savedScopedMclips; } void setScopingInfo(SetLiveState s) { int i, k, hkIndex; // If this is a scoped group , then copy the parent's // scoping info if (allocatedLights) { if (s.lights != null) { // Add the parent's scoping info to this group if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)lights.get(hkIndex); ArrayList src = (ArrayList)s.lights.get(i); if (src != null) { int size = src.size(); for (k = 0; k < size; k++) { l.add(src.get(k)); } } } } else { ArrayList l = (ArrayList)lights.get(0); ArrayList src = (ArrayList)s.lights.get(0); int size = src.size(); for (i = 0; i < size; i++) { l.add(src.get(i)); } } } s.lights = lights; } else { lights = s.lights; } if (allocatedFogs) { if (s.fogs != null) { // Add the parent's scoping info to this group if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)fogs.get(hkIndex); ArrayList src = (ArrayList)s.fogs.get(i); if (src != null) { int size = src.size(); for (k = 0; k < size; k++) { l.add(src.get(k)); } } } } else { ArrayList l = (ArrayList)fogs.get(0); ArrayList src = (ArrayList)s.fogs.get(0); int size = src.size(); for (i = 0; i < size; i++) { l.add(src.get(i)); } } } s.fogs = fogs; } else { fogs = s.fogs; } if (allocatedMclips) { if (s.modelClips != null) { // Add the parent's scoping info to this group if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)modelClips.get(hkIndex); ArrayList src = (ArrayList)s.modelClips.get(i); if (src != null) { int size = src.size(); for (k = 0; k < size; k++) { l.add(src.get(k)); } } } } else { ArrayList l = (ArrayList)modelClips.get(0); ArrayList src = (ArrayList)s.modelClips.get(0); int size = src.size(); for (i = 0; i < size; i++) { l.add(src.get(i)); } } } s.modelClips = modelClips; } else { modelClips = s.modelClips; } if (allocatedAltApps) { if (s.altAppearances != null) { // Add the parent's scoping info to this group if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)altAppearances.get(hkIndex); ArrayList src = (ArrayList)s.altAppearances.get(i); if (src != null) { int size = src.size(); for (k = 0; k < size; k++) { l.add(src.get(k)); } } } } else { ArrayList l = (ArrayList)altAppearances.get(0); ArrayList src = (ArrayList)s.altAppearances.get(0); int size = src.size(); for (i = 0; i < size; i++) { l.add(src.get(i)); } } } s.altAppearances = altAppearances; } else { altAppearances = s.altAppearances; } } void processCollisionTarget(SetLiveState s) { GroupRetained g; if (mirrorGroup == null) { mirrorGroup = new ArrayList(); } Bounds bound = (collisionBound != null ? collisionBound : getEffectiveBounds()); if (inSharedGroup) { for (int i=0; i < s.keys.length; i++) { int j; g = new GroupRetained(); g.key = s.keys[i]; g.localToVworld = new Transform3D[1][]; g.localToVworldIndex = new int[1][]; j = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); if(j < 0) { System.err.println("GroupRetained : Can't find hashKey"); } g.localToVworld[0] = localToVworld[j]; g.localToVworldIndex[0] = localToVworldIndex[j]; g.collisionVwcBounds = new BoundingBox(); g.collisionVwcBounds.transform(bound, g.getCurrentLocalToVworld(0)); g.sourceNode = this; g.locale = locale; // need by getVisibleGeometryAtom() mirrorGroup.add(g); /* System.err.println("processCollisionTarget mirrorGroup.add() : " + g.getId() + " mirrorGroup.size() " + mirrorGroup.size()); */ if (s.transformTargets != null && s.transformTargets[i] != null) { s.transformTargets[i].addNode(g, Targets.GRP_TARGETS); } s.nodeList.add(g); } } else { g = new GroupRetained(); g.localToVworld = new Transform3D[1][]; g.localToVworldIndex = new int[1][]; g.localToVworld[0] = localToVworld[0]; g.localToVworldIndex[0] = localToVworldIndex[0]; g.collisionVwcBounds = new BoundingBox(); g.collisionVwcBounds.transform(bound, g.getCurrentLocalToVworld(0)); g.sourceNode = this; g.locale = locale; // need by getVisibleGeometryAtom() mirrorGroup.add(g); if (s.transformTargets != null && s.transformTargets[0] != null) { s.transformTargets[0].addNode(g, Targets.GRP_TARGETS); } s.nodeList.add(g); } } void computeCombineBounds(Bounds bounds) { if (!VirtualUniverse.mc.cacheAutoComputedBounds) { if (boundsAutoCompute) { for (int i=children.size()-1; i>=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) child.computeCombineBounds(bounds); } } else { // Should this be lock too ? ( MT safe ? ) synchronized(localBounds) { bounds.combine(localBounds); } } } else { if (cachedBounds!=null && boundsAutoCompute) { bounds.combine(cachedBounds); return; } if (boundsAutoCompute) { cachedBounds = new BoundingSphere(); ((BoundingSphere)cachedBounds).setRadius(-1); for (int i=children.size()-1; i>=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) child.computeCombineBounds(cachedBounds); } bounds.combine(cachedBounds); } else { // Should this be lock too ? ( MT safe ? ) synchronized(localBounds) { bounds.combine(localBounds); } } } } /** * Gets the bounding object of a node. * @return the node's bounding object */ Bounds getBounds() { if ( boundsAutoCompute) { if (cachedBounds!=null) { return (Bounds) cachedBounds.clone(); } BoundingSphere boundingSphere = new BoundingSphere(); boundingSphere.setRadius(-1.0); for (int i=children.size()-1; i>=0; i--) { NodeRetained child = (NodeRetained)children.get(i); if(child != null) child.computeCombineBounds((Bounds) boundingSphere); } return (Bounds) boundingSphere; } return super.getBounds(); } /** * Gets the bounding object of a node. * @return the node's bounding object */ Bounds getEffectiveBounds() { if ( boundsAutoCompute) { return getBounds(); } return super.getEffectiveBounds(); } // returns true if children cannot be read/written and none of the // children can read their parent (i.e., "this") group node boolean isStaticChildren() { if (source.getCapability(Group.ALLOW_CHILDREN_READ) || source.getCapability(Group.ALLOW_CHILDREN_WRITE)) { return false; } for (int i = children.size() - 1; i >= 0; i--) { SceneGraphObjectRetained nodeR = (SceneGraphObjectRetained) children.get(i); if (nodeR != null && nodeR.source.getCapability(Node.ALLOW_PARENT_READ)) { return false; } } return true; } boolean isStatic() { return (super.isStatic() && isStaticChildren()); } /** * This compiles() a group */ void setCompiled() { super.setCompiled(); for (int i=children.size()-1; i>=0; i--) { SceneGraphObjectRetained node = (SceneGraphObjectRetained) children.get(i); if (node != null) node.setCompiled(); } } void traverse(boolean sameLevel, int level) { SceneGraphObjectRetained node; if (!sameLevel) { super.traverse(true, level); if (source.getCapability(Group.ALLOW_CHILDREN_READ)) { System.err.print(" (r)"); } else if (isStatic()) { System.err.print(" (s)"); } else if (source.getCapability(Group.ALLOW_CHILDREN_WRITE)) { System.err.print(" (w)"); } } level++; for (int i = 0; i < children.size(); i++) { node = (SceneGraphObjectRetained) children.get(i); if (node != null) { node.traverse(false, level); } } } void compile(CompileState compState) { SceneGraphObjectRetained node; super.compile(compState); mergeFlag = SceneGraphObjectRetained.MERGE; if (!isStatic()) { compState.keepTG = true; mergeFlag = SceneGraphObjectRetained.DONT_MERGE; } if (isRoot || this.usedInScoping() || (parent instanceof SwitchRetained)) { mergeFlag = SceneGraphObjectRetained.DONT_MERGE; } compiledChildrenList = new ArrayList(5); for (int i = 0; i < children.size(); i++) { node = (SceneGraphObjectRetained) children.get(i); if (node != null) { node.compile(compState); } } if (J3dDebug.devPhase && J3dDebug.debug) { compState.numGroups++; } } void merge(CompileState compState) { GroupRetained saveParentGroup = null; SceneGraphObjectRetained node; if (mergeFlag != SceneGraphObjectRetained.MERGE_DONE) { if (mergeFlag == SceneGraphObjectRetained.DONT_MERGE) { // don't merge/eliminate this node super.merge(compState); saveParentGroup = compState.parentGroup; compState.parentGroup = this; } for (int i = 0; i < children.size(); i++) { node = (SceneGraphObjectRetained) children.get(i); if (node != null) { node.merge(compState); } } if (compState.parentGroup == this) { this.children = compiledChildrenList; compState.doShapeMerge(); compiledChildrenList = null; compState.parentGroup = saveParentGroup; } else { // this group node can be eliminated this.children.clear(); if (J3dDebug.devPhase && J3dDebug.debug) { compState.numMergedGroups++; } } mergeFlag = SceneGraphObjectRetained.MERGE_DONE; } else { if (compState.parentGroup != null) { compState.parentGroup.compiledChildrenList.add(this); parent = compState.parentGroup; } } } /** * This version of clearLive calls clearLive on all of its chidren. */ void clearLive(SetLiveState s) { int i, k, hkIndex, nchildren; NodeRetained child; int parentScopedLtSize = 0; int parentScopedFogSize = 0; int parentScopedMcSize = 0; int parentScopedAltAppSize = 0; int groupScopedLtSize = 0; int groupScopedFogSize = 0; int groupScopedMcSize = 0; int groupScopedAltAppSize = 0; int size; isInClearLive = true; // Save this for later use in this method. Temporary. to be removed when OG cleanup. HashKey[] savedLocalToVworldKeys = localToVworldKeys; super.clearLive(s); nchildren = this.children.size(); if (!(this instanceof ViewSpecificGroupRetained)) { viewLists = s.viewLists; } ArrayList savedParentLights = s.lights; if (allocatedLights) { s.lights = lights; } ArrayList savedParentFogs = s.fogs; if (allocatedFogs) { s.fogs = fogs; } ArrayList savedParentMclips = s.modelClips; if (allocatedMclips) { s.modelClips = modelClips; } ArrayList savedParentAltApps = s.altAppearances; if (allocatedAltApps) { s.altAppearances = altAppearances; } for (i=nchildren-1; i >=0 ; i--) { child = (NodeRetained)children.get(i); if (this instanceof OrderedGroupRetained) { OrderedGroupRetained og = (OrderedGroupRetained)this; // adjust refCount, which has been decremented //in super.clearLive if ((refCount+1) == s.refCount) { //only need to do it once if in shared group. Add //all the children to the list of OG_REMOVED message s.ogList.add(this); s.ogChildIdList.add(new Integer(i)); } s.orderedPaths = (ArrayList)og.childrenOrderedPaths.get(i); } if (child != null) { child.clearLive(s); } } // Has its own copy // XXXX: Handle the case of // was non-zero, gone to zero? if (savedParentLights != null) { if (allocatedLights) { if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)savedParentLights.get(hkIndex); ArrayList gl = (ArrayList)lights.get(hkIndex); if (l != null) { size = l.size(); for (k = 0; k < size; k++) { gl.remove(l.get(k)); } } } } else { ArrayList l = (ArrayList)savedParentLights.get(0); ArrayList gl = (ArrayList)lights.get(0); size = l.size(); for (int m = 0; m < size; m++) { gl.remove(l.get(m)); } } } } if (savedParentFogs != null) { if (allocatedFogs) { if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)savedParentFogs.get(hkIndex); ArrayList gl = (ArrayList)fogs.get(hkIndex); if (l != null) { size = l.size(); for (k = 0; k < size; k++) { gl.remove(l.get(k)); } } } } else { ArrayList l = (ArrayList)savedParentFogs.get(0); size = l.size(); for (int m = 0; m < size; m++) { fogs.remove(l.get(m)); } } } } if (savedParentMclips != null) { if (allocatedMclips) { if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)savedParentMclips.get(hkIndex); ArrayList gl = (ArrayList)modelClips.get(hkIndex); if (l != null) { size = l.size(); for (k = 0; k < size; k++) { gl.remove(l.get(k)); } } } } else { ArrayList l = (ArrayList)savedParentMclips.get(0); size = l.size(); for (int m = 0; m < size; m++) { modelClips.remove(l.get(m)); } } } } if (savedParentAltApps != null) { if (allocatedAltApps) { if (inSharedGroup) { for (i=0; i < s.keys.length; i++) { hkIndex = s.keys[i].equals(localToVworldKeys, 0, localToVworldKeys.length); ArrayList l = (ArrayList)savedParentAltApps.get(hkIndex); ArrayList gl = (ArrayList)altAppearances.get(hkIndex); if (l != null) { size = l.size(); for (k = 0; k < size; k++) { gl.remove(l.get(k)); } } } } else { ArrayList l = (ArrayList)savedParentAltApps.get(0); size = l.size(); for (int m = 0; m < size; m++) { altAppearances.remove(l.get(m)); } } } } if (collisionTarget) { GroupRetained g; if (inSharedGroup) { for (i=s.keys.length-1; i >=0; i--) { HashKey hkey = s.keys[i]; for (int j = mirrorGroup.size()-1; j >=0 ; j--) { g = (GroupRetained) mirrorGroup.get(j); if (g.key.equals(hkey)) { s.nodeList.add(mirrorGroup.remove(j)); if (s.transformTargets != null && s.transformTargets[j] != null) { s.transformTargets[j].addNode(g, Targets.GRP_TARGETS); } break; } } } } else { g = (GroupRetained)mirrorGroup.get(0); if (s.transformTargets != null && s.transformTargets[0] != null) { s.transformTargets[0].addNode(g, Targets.GRP_TARGETS); } s.nodeList.add(mirrorGroup.remove(0)); } } s.lights = savedParentLights; s.modelClips = savedParentMclips; s.fogs = savedParentFogs; s.altAppearances = savedParentAltApps; isInClearLive = false; } // This is only used by alternateCollisionTarget public BoundingBox computeBoundingHull() { return collisionVwcBounds; } // If isSwitchOn cached here, we don't need to traverse up the tree public boolean isEnable() { return isNodeSwitchOn(this.sourceNode, key); } // If isSwitchOn cached here, we don't need to traverse up the tree // This method does nothing with vis. public boolean isEnable(int vis) { return isNodeSwitchOn(this.sourceNode, key); } // Can't use getLocale, it is used by BranchGroupRetained public Locale getLocale2() { return locale; } /** * Return true of nodeR is not under a switch group or * nodeR is enable under a switch group. */ static boolean isNodeSwitchOn(NodeRetained node, HashKey key) { NodeRetained prevNode = null; if (key != null) { key = new HashKey(key); } synchronized (node.universe.sceneGraphLock) { do { if ((node instanceof SwitchRetained) && (prevNode != null) && !validSwitchChild((SwitchRetained) node, prevNode)) { return false; } prevNode = node; if (node instanceof SharedGroupRetained) { // retrieve the last node ID String nodeId = key.getLastNodeId(); Vector parents = ((SharedGroupRetained) node).parents; // find the matching link for(int i=parents.size()-1; i >=0; i--) { NodeRetained link = (NodeRetained) parents.get(i); if (link.nodeId.equals(nodeId)) { node = link; break; } } if (node == prevNode) { // Fail to found a matching link, this is // probably cause by BHTree not yet updated // because message not yet arrive // when collision so it return current node as target. return false; } } else { node = node.parent; } } while (node != null); // reach locale } return true; } /** * Determinte if nodeR is a valid child to render for * Switch Node swR. */ static boolean validSwitchChild(SwitchRetained sw, NodeRetained node) { int whichChild = sw.whichChild; if (whichChild == Switch.CHILD_NONE) { return false; } if (whichChild == Switch.CHILD_ALL) { return true; } ArrayList children = sw.children; if (whichChild >= 0) { // most common case return (children.get(whichChild) == node); } // Switch.CHILD_MASK for (int i=children.size()-1; i >=0; i--) { if (sw.childMask.get(i) && (children.get(i) == node)) { return true; } } return false; } /** * Create mirror group when this Group AlternateCollisionTarget * is set to true while live. */ void createMirrorGroup() { GroupRetained g; mirrorGroup = new ArrayList(); Bounds bound = (collisionBound != null ? collisionBound : getEffectiveBounds()); if (inSharedGroup) { for (int i=0; i < localToVworldKeys.length; i++) { g = new GroupRetained(); g.key = localToVworldKeys[i]; g.localToVworld = new Transform3D[1][]; g.localToVworldIndex = new int[1][]; g.localToVworld[0] = localToVworld[i]; g.localToVworldIndex[0] = localToVworldIndex[i]; g.collisionVwcBounds = new BoundingBox(); g.collisionVwcBounds.transform(bound, g.getCurrentLocalToVworld()); g.sourceNode = this; g.locale = locale; // need by getVisibleGeometryAtom() mirrorGroup.add(g); } } else { g = new GroupRetained(); g.localToVworld = new Transform3D[1][]; g.localToVworldIndex = new int[1][]; g.localToVworld[0] = localToVworld[0]; g.localToVworldIndex[0] = localToVworldIndex[0]; g.collisionVwcBounds = new BoundingBox(); g.collisionVwcBounds.transform(bound, g.getCurrentLocalToVworld()); g.sourceNode = this; g.locale = locale; // need by getVisibleGeometryAtom() mirrorGroup.add(g); } } void setBoundsAutoCompute(boolean autoCompute) { if (autoCompute != boundsAutoCompute) { super.setBoundsAutoCompute(autoCompute); if (!autoCompute) { localBounds = getEffectiveBounds(); } if (source.isLive() && collisionBound == null && autoCompute && mirrorGroup != null) { J3dMessage message = new J3dMessage(); message.type = J3dMessage.COLLISION_BOUND_CHANGED; message.threads = J3dThread.UPDATE_TRANSFORM | J3dThread.UPDATE_GEOMETRY; message.universe = universe; message.args[0] = this; VirtualUniverse.mc.processMessage(message); } } } void setBounds(Bounds bounds) { super.setBounds(bounds); if (source.isLive() && !boundsAutoCompute && collisionBound == null && mirrorGroup != null) { J3dMessage message = new J3dMessage(); message.type = J3dMessage.COLLISION_BOUND_CHANGED; message.threads = J3dThread.UPDATE_TRANSFORM | J3dThread.UPDATE_GEOMETRY; message.universe = universe; message.args[0] = this; VirtualUniverse.mc.processMessage(message); } } int[] processViewSpecificInfo(int mode, HashKey k, View v, ArrayList vsgList, int[] keyList, ArrayList leafList) { int nchildren = children.size(); if (source.isLive()) { for (int i = 0; i < nchildren; i++) { NodeRetained child = (NodeRetained) children.get(i); if (child instanceof LeafRetained) { if (child instanceof LinkRetained) { int lastCount = k.count; LinkRetained ln = (LinkRetained) child; if (k.count == 0) { k.append(locale.nodeId); } keyList = ((GroupRetained)(ln.sharedGroup)). processViewSpecificInfo(mode, k.append("+").append(ln.nodeId), v, vsgList, keyList, leafList); k.count = lastCount; } else { ((LeafRetained)child).getMirrorObjects(leafList, k); } } else { keyList = child.processViewSpecificInfo(mode, k, v, vsgList, keyList, leafList); } } } return keyList; } void findSwitchInfo(SetLiveState s, NodeRetained parentNode, NodeRetained childNode, NodeRetained linkNode) { NodeRetained child; NodeRetained parent; parentSwitchLinkChildIndex = -1; // traverse up scene graph to find switch parent information if (!inSharedGroup) { child = (linkNode == null)? childNode: linkNode; parent = parentNode; while (parent != null) { if (parent instanceof SwitchRetained) { s.switchLevels[0]++; if (s.closestSwitchParents[0] == null) { s.closestSwitchParents[0] = (SwitchRetained)parent; s.closestSwitchIndices[0] = ((SwitchRetained)parent).switchIndexCount++; } if (parentSwitchLinkChildIndex == -1) { parentSwitchLinkChildIndex = ((GroupRetained)parent).children.indexOf(child); } } else if (parent instanceof SharedGroupRetained) { if (parentSwitchLinkChildIndex == -1) { parentSwitchLinkChildIndex = ((GroupRetained)parent).children.indexOf(child); } } child = parent; parent = child.parent; } } else { HashKey key; int i,j; s.switchLevels = new int[localToVworldKeys.length]; s.closestSwitchParents = new SwitchRetained[localToVworldKeys.length]; s.closestSwitchIndices = new int[localToVworldKeys.length]; for (i=0; i<localToVworldKeys.length; i++) { s.switchLevels[i] = -1; s.closestSwitchParents[i] = null; s.closestSwitchIndices[i] = -1; } for (i=0; i < localToVworldKeys.length; i++) { child = (linkNode == null)? childNode: linkNode; parent = parentNode; key = new HashKey(localToVworldKeys[i]); while (parent != null) { if (parent instanceof SwitchRetained) { s.switchLevels[i]++; if (s.closestSwitchParents[i] == null) { s.closestSwitchParents[i] = (SwitchRetained)parent; s.closestSwitchIndices[i] = ((SwitchRetained)parent).switchIndexCount++; } if (parentSwitchLinkChildIndex == -1) { parentSwitchLinkChildIndex = ((GroupRetained)parent).children.indexOf(child); } } else if (parent instanceof SharedGroupRetained) { String nodeId = key.getLastNodeId(); Vector parents = ((SharedGroupRetained) parent).parents; NodeRetained ln; if (parentSwitchLinkChildIndex == -1) { parentSwitchLinkChildIndex = ((GroupRetained)parent).children.indexOf(child); } for(j=0; j< parents.size(); j++) { ln = (NodeRetained)parents.get(j); if (ln.nodeId.equals(nodeId)) { parent = ln; break; } } } child = parent; parent = child.parent; } } } } static void gatherBlUsers(ArrayList blUsers, Object[] blArr) { ArrayList users; for (int i=0; i<blArr.length; i++) { users = ((BoundingLeafRetained)blArr[i]).users; synchronized(users) { blUsers.addAll(users); } } } // recursively found all geometryAtoms under this Group void searchGeometryAtoms(UnorderList list) { for (int i = children.size()-1; i >=0; i--) { NodeRetained child = (NodeRetained)children.get(i); child.searchGeometryAtoms(list); } } }

diff --git a/src/org/python/modules/cPickle.java b/src/org/python/modules/cPickle.java index 173d5d6d..5495d29f 100644 --- a/src/org/python/modules/cPickle.java +++ b/src/org/python/modules/cPickle.java @@ -1,2414 +1,2418 @@ /* * Copyright 1998 Finn Bock. * * This program contains material copyrighted by: * Copyright (c) 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, * The Netherlands. */ /* note about impl: instanceof vs. CPython type(.) is . */ package org.python.modules; import java.math.BigInteger; import java.util.Hashtable; import org.python.core.ArgParser; import org.python.core.ClassDictInit; import org.python.core.Py; import org.python.core.PyBoolean; import org.python.core.PyBuiltinFunction; import org.python.core.PyClass; import org.python.core.PyDictionary; import org.python.core.PyException; import org.python.core.PyFile; import org.python.core.PyFloat; import org.python.core.PyFunction; import org.python.core.PyInstance; import org.python.core.PyInteger; import org.python.core.PyJavaInstance; import org.python.core.PyList; import org.python.core.PyLong; import org.python.core.PyMethod; import org.python.core.PyModule; import org.python.core.PyNone; import org.python.core.PyObject; import org.python.core.PyReflectedFunction; import org.python.core.PySequence; import org.python.core.PyString; import org.python.core.PyStringMap; import org.python.core.PyTuple; import org.python.core.PyType; import org.python.core.PyUnicode; import org.python.core.__builtin__; import org.python.core.codecs; import org.python.core.imp; /** * * From the python documentation: * <p> * The <tt>cPickle.java</tt> module implements a basic but powerful algorithm * for ``pickling'' (a.k.a. serializing, marshalling or flattening) nearly * arbitrary Python objects. This is the act of converting objects to a * stream of bytes (and back: ``unpickling''). * This is a more primitive notion than * persistency -- although <tt>cPickle.java</tt> reads and writes file * objects, it does not handle the issue of naming persistent objects, nor * the (even more complicated) area of concurrent access to persistent * objects. The <tt>cPickle.java</tt> module can transform a complex object * into a byte stream and it can transform the byte stream into an object * with the same internal structure. The most obvious thing to do with these * byte streams is to write them onto a file, but it is also conceivable * to send them across a network or store them in a database. The module * <tt>shelve</tt> provides a simple interface to pickle and unpickle * objects on ``dbm''-style database files. * <P> * <b>Note:</b> The <tt>cPickle.java</tt> have the same interface as the * standard module <tt>pickle</tt>except that <tt>Pickler</tt> and * <tt>Unpickler</tt> are factory functions, not classes (so they cannot be * used as base classes for inheritance). * This limitation is similar for the original cPickle.c version. * * <P> * Unlike the built-in module <tt>marshal</tt>, <tt>cPickle.java</tt> handles * the following correctly: * <P> * * <UL><LI>recursive objects (objects containing references to themselves) * * <P> * * <LI>object sharing (references to the same object in different places) * * <P> * * <LI>user-defined classes and their instances * * <P> * * </UL> * * <P> * The data format used by <tt>cPickle.java</tt> is Python-specific. This has * the advantage that there are no restrictions imposed by external * standards such as XDR (which can't represent pointer sharing); however * it means that non-Python programs may not be able to reconstruct * pickled Python objects. * * <P> * By default, the <tt>cPickle.java</tt> data format uses a printable ASCII * representation. This is slightly more voluminous than a binary * representation. The big advantage of using printable ASCII (and of * some other characteristics of <tt>cPickle.java</tt>'s representation) is * that for debugging or recovery purposes it is possible for a human to read * the pickled file with a standard text editor. * * <P> * A binary format, which is slightly more efficient, can be chosen by * specifying a nonzero (true) value for the <i>bin</i> argument to the * <tt>Pickler</tt> constructor or the <tt>dump()</tt> and <tt>dumps()</tt> * functions. The binary format is not the default because of backwards * compatibility with the Python 1.4 pickle module. In a future version, * the default may change to binary. * * <P> * The <tt>cPickle.java</tt> module doesn't handle code objects. * <P> * For the benefit of persistency modules written using <tt>cPickle.java</tt>, * it supports the notion of a reference to an object outside the pickled * data stream. Such objects are referenced by a name, which is an * arbitrary string of printable ASCII characters. The resolution of * such names is not defined by the <tt>cPickle.java</tt> module -- the * persistent object module will have to implement a method * <tt>persistent_load()</tt>. To write references to persistent objects, * the persistent module must define a method <tt>persistent_id()</tt> which * returns either <tt>None</tt> or the persistent ID of the object. * * <P> * There are some restrictions on the pickling of class instances. * * <P> * First of all, the class must be defined at the top level in a module. * Furthermore, all its instance variables must be picklable. * * <P> * * <P> * When a pickled class instance is unpickled, its <tt>__init__()</tt> method * is normally <i>not</i> invoked. <b>Note:</b> This is a deviation * from previous versions of this module; the change was introduced in * Python 1.5b2. The reason for the change is that in many cases it is * desirable to have a constructor that requires arguments; it is a * (minor) nuisance to have to provide a <tt>__getinitargs__()</tt> method. * * <P> * If it is desirable that the <tt>__init__()</tt> method be called on * unpickling, a class can define a method <tt>__getinitargs__()</tt>, * which should return a <i>tuple</i> containing the arguments to be * passed to the class constructor (<tt>__init__()</tt>). This method is * called at pickle time; the tuple it returns is incorporated in the * pickle for the instance. * <P> * Classes can further influence how their instances are pickled -- if the * class defines the method <tt>__getstate__()</tt>, it is called and the * return state is pickled as the contents for the instance, and if the class * defines the method <tt>__setstate__()</tt>, it is called with the * unpickled state. (Note that these methods can also be used to * implement copying class instances.) If there is no * <tt>__getstate__()</tt> method, the instance's <tt>__dict__</tt> is * pickled. If there is no <tt>__setstate__()</tt> method, the pickled * object must be a dictionary and its items are assigned to the new * instance's dictionary. (If a class defines both <tt>__getstate__()</tt> * and <tt>__setstate__()</tt>, the state object needn't be a dictionary * -- these methods can do what they want.) This protocol is also used * by the shallow and deep copying operations defined in the <tt>copy</tt> * module. * <P> * Note that when class instances are pickled, their class's code and * data are not pickled along with them. Only the instance data are * pickled. This is done on purpose, so you can fix bugs in a class or * add methods and still load objects that were created with an earlier * version of the class. If you plan to have long-lived objects that * will see many versions of a class, it may be worthwhile to put a version * number in the objects so that suitable conversions can be made by the * class's <tt>__setstate__()</tt> method. * * <P> * When a class itself is pickled, only its name is pickled -- the class * definition is not pickled, but re-imported by the unpickling process. * Therefore, the restriction that the class must be defined at the top * level in a module applies to pickled classes as well. * * <P> * * <P> * The interface can be summarized as follows. * * <P> * To pickle an object <tt>x</tt> onto a file <tt>f</tt>, open for writing: * * <P> * <dl><dd><pre> * p = pickle.Pickler(f) * p.dump(x) * </pre></dl> * * <P> * A shorthand for this is: * * <P> * <dl><dd><pre> * pickle.dump(x, f) * </pre></dl> * * <P> * To unpickle an object <tt>x</tt> from a file <tt>f</tt>, open for reading: * * <P> * <dl><dd><pre> * u = pickle.Unpickler(f) * x = u.load() * </pre></dl> * * <P> * A shorthand is: * * <P> * <dl><dd><pre> * x = pickle.load(f) * </pre></dl> * * <P> * The <tt>Pickler</tt> class only calls the method <tt>f.write()</tt> with a * string argument. The <tt>Unpickler</tt> calls the methods * <tt>f.read()</tt> (with an integer argument) and <tt>f.readline()</tt> * (without argument), both returning a string. It is explicitly allowed to * pass non-file objects here, as long as they have the right methods. * * <P> * The constructor for the <tt>Pickler</tt> class has an optional second * argument, <i>bin</i>. If this is present and nonzero, the binary * pickle format is used; if it is zero or absent, the (less efficient, * but backwards compatible) text pickle format is used. The * <tt>Unpickler</tt> class does not have an argument to distinguish * between binary and text pickle formats; it accepts either format. * * <P> * The following types can be pickled: * * <UL><LI><tt>None</tt> * * <P> * * <LI>integers, long integers, floating point numbers * * <P> * * <LI>strings * * <P> * * <LI>tuples, lists and dictionaries containing only picklable objects * * <P> * * <LI>classes that are defined at the top level in a module * * <P> * * <LI>instances of such classes whose <tt>__dict__</tt> or * <tt>__setstate__()</tt> is picklable * * <P> * * </UL> * * <P> * Attempts to pickle unpicklable objects will raise the * <tt>PicklingError</tt> exception; when this happens, an unspecified * number of bytes may have been written to the file. * * <P> * It is possible to make multiple calls to the <tt>dump()</tt> method of * the same <tt>Pickler</tt> instance. These must then be matched to the * same number of calls to the <tt>load()</tt> method of the * corresponding <tt>Unpickler</tt> instance. If the same object is * pickled by multiple <tt>dump()</tt> calls, the <tt>load()</tt> will all * yield references to the same object. <i>Warning</i>: this is intended * for pickling multiple objects without intervening modifications to the * objects or their parts. If you modify an object and then pickle it * again using the same <tt>Pickler</tt> instance, the object is not * pickled again -- a reference to it is pickled and the * <tt>Unpickler</tt> will return the old value, not the modified one. * (There are two problems here: (a) detecting changes, and (b) * marshalling a minimal set of changes. I have no answers. Garbage * Collection may also become a problem here.) * * <P> * Apart from the <tt>Pickler</tt> and <tt>Unpickler</tt> classes, the * module defines the following functions, and an exception: * * <P> * <dl><dt><b><tt>dump</tt></a></b> (<var>object, file</var><big>[</big><var>, * bin</var><big>]</big>) * <dd> * Write a pickled representation of <i>obect</i> to the open file object * <i>file</i>. This is equivalent to * "<tt>Pickler(<i>file</i>, <i>bin</i>).dump(<i>object</i>)</tt>". * If the optional <i>bin</i> argument is present and nonzero, the binary * pickle format is used; if it is zero or absent, the (less efficient) * text pickle format is used. * </dl> * * <P> * <dl><dt><b><tt>load</tt></a></b> (<var>file</var>) * <dd> * Read a pickled object from the open file object <i>file</i>. This is * equivalent to "<tt>Unpickler(<i>file</i>).load()</tt>". * </dl> * * <P> * <dl><dt><b><tt>dumps</tt></a></b> (<var>object</var><big>[</big><var>, * bin</var><big>]</big>) * <dd> * Return the pickled representation of the object as a string, instead * of writing it to a file. If the optional <i>bin</i> argument is * present and nonzero, the binary pickle format is used; if it is zero * or absent, the (less efficient) text pickle format is used. * </dl> * * <P> * <dl><dt><b><tt>loads</tt></a></b> (<var>string</var>) * <dd> * Read a pickled object from a string instead of a file. Characters in * the string past the pickled object's representation are ignored. * </dl> * * <P> * <dl><dt><b><a name="l2h-3763"><tt>PicklingError</tt></a></b> * <dd> * This exception is raised when an unpicklable object is passed to * <tt>Pickler.dump()</tt>. * </dl> * * * <p> * For the complete documentation on the pickle module, please see the * "Python Library Reference" * <p><hr><p> * * The module is based on both original pickle.py and the cPickle.c * version, except that all mistakes and errors are my own. * <p> * @author Finn Bock, [email protected] * @version cPickle.java,v 1.30 1999/05/15 17:40:12 fb Exp */ public class cPickle implements ClassDictInit { /** * The doc string */ public static String __doc__ = "Java implementation and optimization of the Python pickle module\n" + "\n" + "$Id$\n"; /** * The program version. */ public static String __version__ = "1.30"; /** * File format version we write. */ public static final String format_version = "2.0"; /** * Old format versions we can read. */ public static final String[] compatible_formats = new String[] { "1.0", "1.1", "1.2", "1.3", "2.0" }; /** * Highest protocol version supported. */ public static final int HIGHEST_PROTOCOL = 2; public static String[] __depends__ = new String[] { "copy_reg", }; public static PyObject PickleError; public static PyObject PicklingError; public static PyObject UnpickleableError; public static PyObject UnpicklingError; public static final PyString BadPickleGet = new PyString("cPickle.BadPickleGet"); final static char MARK = '('; final static char STOP = '.'; final static char POP = '0'; final static char POP_MARK = '1'; final static char DUP = '2'; final static char FLOAT = 'F'; final static char INT = 'I'; final static char BININT = 'J'; final static char BININT1 = 'K'; final static char LONG = 'L'; final static char BININT2 = 'M'; final static char NONE = 'N'; final static char PERSID = 'P'; final static char BINPERSID = 'Q'; final static char REDUCE = 'R'; final static char STRING = 'S'; final static char BINSTRING = 'T'; final static char SHORT_BINSTRING = 'U'; final static char UNICODE = 'V'; final static char BINUNICODE = 'X'; final static char APPEND = 'a'; final static char BUILD = 'b'; final static char GLOBAL = 'c'; final static char DICT = 'd'; final static char EMPTY_DICT = '}'; final static char APPENDS = 'e'; final static char GET = 'g'; final static char BINGET = 'h'; final static char INST = 'i'; final static char LONG_BINGET = 'j'; final static char LIST = 'l'; final static char EMPTY_LIST = ']'; final static char OBJ = 'o'; final static char PUT = 'p'; final static char BINPUT = 'q'; final static char LONG_BINPUT = 'r'; final static char SETITEM = 's'; final static char TUPLE = 't'; final static char EMPTY_TUPLE = ')'; final static char SETITEMS = 'u'; final static char BINFLOAT = 'G'; final static char PROTO = 0x80; final static char NEWOBJ = 0x81; final static char EXT1 = 0x82; final static char EXT2 = 0x83; final static char EXT4 = 0x84; final static char TUPLE1 = 0x85; final static char TUPLE2 = 0x86; final static char TUPLE3 = 0x87; final static char NEWTRUE = 0x88; final static char NEWFALSE = 0x89; final static char LONG1 = 0x8A; final static char LONG4 = 0x8B; private static PyDictionary dispatch_table; private static PyDictionary extension_registry; private static PyDictionary inverted_registry; private static PyType BuiltinFunctionType = PyType.fromClass(PyBuiltinFunction.class); private static PyType ReflectedFunctionType = PyType.fromClass(PyReflectedFunction.class); private static PyType ClassType = PyType.fromClass(PyClass.class); private static PyType TypeType = PyType.fromClass(PyType.class); private static PyType DictionaryType = PyType.fromClass(PyDictionary.class); private static PyType StringMapType = PyType.fromClass(PyStringMap.class); private static PyType FloatType = PyType.fromClass(PyFloat.class); private static PyType FunctionType = PyType.fromClass(PyFunction.class); private static PyType InstanceType = PyType.fromClass(PyInstance.class); private static PyType IntType = PyType.fromClass(PyInteger.class); private static PyType ListType = PyType.fromClass(PyList.class); private static PyType LongType = PyType.fromClass(PyLong.class); private static PyType NoneType = PyType.fromClass(PyNone.class); private static PyType StringType = PyType.fromClass(PyString.class); private static PyType UnicodeType = PyType.fromClass(PyUnicode.class); private static PyType TupleType = PyType.fromClass(PyTuple.class); private static PyType FileType = PyType.fromClass(PyFile.class); private static PyType BoolType = PyType.fromClass(PyBoolean.class); private static PyObject dict; private static final int BATCHSIZE = 1024; /** * Initialization when module is imported. */ public static void classDictInit(PyObject dict) { cPickle.dict = dict; // XXX: Hack for JPython 1.0.1. By default __builtin__ is not in // sys.modules. imp.importName("__builtin__", true); PyModule copyreg = (PyModule)importModule("copy_reg"); dispatch_table = (PyDictionary)copyreg.__getattr__("dispatch_table"); extension_registry = (PyDictionary)copyreg.__getattr__("_extension_registry"); inverted_registry = (PyDictionary)copyreg.__getattr__("_inverted_registry"); PickleError = buildClass("PickleError", Py.Exception, "_PickleError", ""); PicklingError = buildClass("PicklingError", PickleError, "_empty__init__", ""); UnpickleableError = buildClass("UnpickleableError", PicklingError, "_UnpickleableError", ""); UnpicklingError = buildClass("UnpicklingError", PickleError, "_empty__init__", ""); } // An empty __init__ method public static PyObject _empty__init__(PyObject[] arg, String[] kws) { PyObject dict = new PyStringMap(); dict.__setitem__("__module__", new PyString("cPickle")); return dict; } public static PyObject _PickleError(PyObject[] arg, String[] kws) { PyObject dict = _empty__init__(arg, kws); dict.__setitem__("__init__", getJavaFunc("_PickleError__init__")); dict.__setitem__("__str__", getJavaFunc("_PickleError__str__")); return dict; } public static void _PickleError__init__(PyObject[] arg, String[] kws) { ArgParser ap = new ArgParser("__init__", arg, kws, "self", "args"); PyObject self = ap.getPyObject(0); PyObject args = ap.getList(1); self.__setattr__("args", args); } public static PyString _PickleError__str__(PyObject[] arg, String[] kws) { ArgParser ap = new ArgParser("__str__", arg, kws, "self"); PyObject self = ap.getPyObject(0); PyObject args = self.__getattr__("args"); if (args.__len__() > 0 && args.__getitem__(0).__len__() > 0) return args.__getitem__(0).__str__(); else return new PyString("(what)"); } public static PyObject _UnpickleableError(PyObject[] arg, String[] kws) { PyObject dict = _empty__init__(arg, kws); dict.__setitem__("__init__", getJavaFunc("_UnpickleableError__init__")); dict.__setitem__("__str__", getJavaFunc("_UnpickleableError__str__")); return dict; } public static void _UnpickleableError__init__(PyObject[] arg, String[] kws) { ArgParser ap = new ArgParser("__init__", arg, kws, "self", "args"); PyObject self = ap.getPyObject(0); PyObject args = ap.getList(1); self.__setattr__("args", args); } public static PyString _UnpickleableError__str__(PyObject[] arg, String[] kws) { ArgParser ap = new ArgParser("__str__", arg, kws, "self"); PyObject self = ap.getPyObject(0); PyObject args = self.__getattr__("args"); PyObject a = args.__len__() > 0 ? args.__getitem__(0) : new PyString("(what)"); return new PyString("Cannot pickle %s objects").__mod__(a).__str__(); } /** * @param file a file-like object, can be a cStringIO.StringIO, * a PyFile or any python object which implements a * <i>write</i> method. The data will be written as text. * @returns a new Pickler instance. */ public static Pickler Pickler(PyObject file) { return new Pickler(file, 0); } /** * @param file a file-like object, can be a cStringIO.StringIO, * a PyFile or any python object which implements a * <i>write</i> method. * @param protocol pickle protocol version (0 - text, 1 - pre-2.3 binary, 2 - 2.3) * @returns a new Pickler instance. */ public static Pickler Pickler(PyObject file, int protocol) { return new Pickler(file, protocol); } /** * Returns a unpickler instance. * @param file a file-like object, can be a cStringIO.StringIO, * a PyFile or any python object which implements a * <i>read</i> and <i>readline</i> method. * @returns a new Unpickler instance. */ public static Unpickler Unpickler(PyObject file) { return new Unpickler(file); } /** * Shorthand function which pickles the object on the file. * @param object a data object which should be pickled. * @param file a file-like object, can be a cStringIO.StringIO, * a PyFile or any python object which implements a * <i>write</i> method. The data will be written as * text. * @returns a new Unpickler instance. */ public static void dump(PyObject object, PyObject file) { dump(object, file, 0); } /** * Shorthand function which pickles the object on the file. * @param object a data object which should be pickled. * @param file a file-like object, can be a cStringIO.StringIO, * a PyFile or any python object which implements a * <i>write</i> method. * @param protocol pickle protocol version (0 - text, 1 - pre-2.3 binary, 2 - 2.3) * @returns a new Unpickler instance. */ public static void dump(PyObject object, PyObject file, int protocol) { new Pickler(file, protocol).dump(object); } /** * Shorthand function which pickles and returns the string representation. * @param object a data object which should be pickled. * @returns a string representing the pickled object. */ public static String dumps(PyObject object) { return dumps(object, 0); } /** * Shorthand function which pickles and returns the string representation. * @param object a data object which should be pickled. * @param protocol pickle protocol version (0 - text, 1 - pre-2.3 binary, 2 - 2.3) * @returns a string representing the pickled object. */ public static String dumps(PyObject object, int protocol) { cStringIO.StringIO file = cStringIO.StringIO(); dump(object, file, protocol); return file.getvalue(); } /** * Shorthand function which unpickles a object from the file and returns * the new object. * @param file a file-like object, can be a cStringIO.StringIO, * a PyFile or any python object which implements a * <i>read</i> and <i>readline</i> method. * @returns a new object. */ public static Object load(PyObject file) { return new Unpickler(file).load(); } /** * Shorthand function which unpickles a object from the string and * returns the new object. * @param str a strings which must contain a pickled object * representation. * @returns a new object. */ public static Object loads(PyObject str) { cStringIO.StringIO file = cStringIO.StringIO(str.toString()); return new Unpickler(file).load(); } // Factory for creating IOFile representation. private static IOFile createIOFile(PyObject file) { Object f = file.__tojava__(cStringIO.StringIO.class); if (f != Py.NoConversion) return new cStringIOFile(file); else if (__builtin__.isinstance(file, FileType)) return new FileIOFile(file); else return new ObjectIOFile(file); } // IOFiles encapsulates and optimise access to the different file // representation. interface IOFile { public abstract void write(String str); // Usefull optimization since most data written are chars. public abstract void write(char str); public abstract void flush(); public abstract String read(int len); // Usefull optimization since all readlines removes the // trainling newline. public abstract String readlineNoNl(); } // Use a cStringIO as a file. static class cStringIOFile implements IOFile { cStringIO.StringIO file; cStringIOFile(PyObject file) { this.file = (cStringIO.StringIO)file.__tojava__(Object.class); } public void write(String str) { file.write(str); } public void write(char ch) { file.writeChar(ch); } public void flush() {} public String read(int len) { return file.read(len); } public String readlineNoNl() { return file.readlineNoNl(); } } // Use a PyFile as a file. static class FileIOFile implements IOFile { PyFile file; FileIOFile(PyObject file) { this.file = (PyFile)file.__tojava__(PyFile.class); if (this.file.getClosed()) throw Py.ValueError("I/O operation on closed file"); } public void write(String str) { file.write(str); } public void write(char ch) { file.write(cStringIO.getString(ch)); } public void flush() {} public String read(int len) { return file.read(len).toString(); } public String readlineNoNl() { String line = file.readline().toString(); return line.substring(0, line.length()-1); } } // Use any python object as a file. static class ObjectIOFile implements IOFile { char[] charr = new char[1]; StringBuffer buff = new StringBuffer(); PyObject write; PyObject read; PyObject readline; final int BUF_SIZE = 256; ObjectIOFile(PyObject file) { // this.file = file; write = file.__findattr__("write"); read = file.__findattr__("read"); readline = file.__findattr__("readline"); } public void write(String str) { buff.append(str); if (buff.length() > BUF_SIZE) flush(); } public void write(char ch) { buff.append(ch); if (buff.length() > BUF_SIZE) flush(); } public void flush() { write.__call__(new PyString(buff.toString())); buff.setLength(0); } public String read(int len) { return read.__call__(new PyInteger(len)).toString(); } public String readlineNoNl() { String line = readline.__call__().toString(); return line.substring(0, line.length()-1); } } /** * The Pickler object * @see cPickle#Pickler(PyObject) * @see cPickle#Pickler(PyObject,int) */ static public class Pickler { private IOFile file; private int protocol; /** * The undocumented attribute fast of the C version of cPickle disables * memoization. Since having memoization on won't break anything, having * this dummy setter for fast here won't break any code expecting it to * do something. However without it code that sets fast fails(ie * test_cpickle.py), so it's worth having. */ public boolean fast = false; private PickleMemo memo = new PickleMemo(); /** * To write references to persistent objects, the persistent module * must assign a method to persistent_id which returns either None * or the persistent ID of the object. * For the benefit of persistency modules written using pickle, * it supports the notion of a reference to an object outside * the pickled data stream. * Such objects are referenced by a name, which is an arbitrary * string of printable ASCII characters. */ public PyObject persistent_id = null; /** * Hmm, not documented, perhaps it shouldn't be public? XXX: fixme. */ public PyObject inst_persistent_id = null; public Pickler(PyObject file, int protocol) { this.file = createIOFile(file); this.protocol = protocol; } /** * Write a pickled representation of the object. * @param object The object which will be pickled. */ public void dump(PyObject object) { if (protocol >= 2) { file.write(PROTO); file.write((char) protocol); } save(object); file.write(STOP); file.flush(); } private static final int get_id(PyObject o) { // we don't pickle Java instances so we don't have to consider that case return System.identityHashCode(o); } // Save name as in pickle.py but semantics are slightly changed. private void put(int i) { if (protocol > 0) { if (i < 256) { file.write(BINPUT); file.write((char)i); return; } file.write(LONG_BINPUT); file.write((char)( i & 0xFF)); file.write((char)((i >>> 8) & 0xFF)); file.write((char)((i >>> 16) & 0xFF)); file.write((char)((i >>> 24) & 0xFF)); return; } file.write(PUT); file.write(String.valueOf(i)); file.write("\n"); } // Same name as in pickle.py but semantics are slightly changed. private void get(int i) { if (protocol > 0) { if (i < 256) { file.write(BINGET); file.write((char)i); return; } file.write(LONG_BINGET); file.write((char)( i & 0xFF)); file.write((char)((i >>> 8) & 0xFF)); file.write((char)((i >>> 16) & 0xFF)); file.write((char)((i >>> 24) & 0xFF)); return; } file.write(GET); file.write(String.valueOf(i)); file.write("\n"); } private void save(PyObject object) { save(object, false); } private void save(PyObject object, boolean pers_save) { if (!pers_save) { if (persistent_id != null) { PyObject pid = persistent_id.__call__(object); if (pid != Py.None) { save_pers(pid); return; } } } int d = get_id(object); PyType t = object.getType(); if (t == TupleType && object.__len__() == 0) { if (protocol > 0) save_empty_tuple(object); else save_tuple(object); return; } int m = getMemoPosition(d, object); if (m >= 0) { get(m); return; } if (save_type(object, t)) return; if (inst_persistent_id != null) { PyObject pid = inst_persistent_id.__call__(object); if (pid != Py.None) { save_pers(pid); return; } } if (Py.isSubClass(t, PyType.TYPE)) { save_global(object); return; } PyObject tup = null; PyObject reduce = dispatch_table.__finditem__(t); if (reduce == null) { reduce = object.__findattr__("__reduce_ex__"); if (reduce != null) { tup = reduce.__call__(Py.newInteger(protocol)); } else { reduce = object.__findattr__("__reduce__"); if (reduce == null) throw new PyException(UnpickleableError, object); tup = reduce.__call__(); } } else { tup = reduce.__call__(object); } if (tup instanceof PyString) { save_global(object, tup); return; } if (!(tup instanceof PyTuple)) { throw new PyException(PicklingError, "Value returned by " + reduce.__repr__() + " must be a tuple"); } int l = tup.__len__(); if (l < 2 || l > 5) { throw new PyException(PicklingError, "tuple returned by " + reduce.__repr__() + " must contain two to five elements"); } PyObject callable = tup.__finditem__(0); PyObject arg_tup = tup.__finditem__(1); PyObject state = (l > 2) ? tup.__finditem__(2) : Py.None; PyObject listitems = (l > 3) ? tup.__finditem__(3) : Py.None; PyObject dictitems = (l > 4) ? tup.__finditem__(4) : Py.None; if (!(arg_tup instanceof PyTuple) && arg_tup != Py.None) { throw new PyException(PicklingError, "Second element of tupe returned by " + reduce.__repr__() + " must be a tuple"); } save_reduce(callable, arg_tup, state, listitems, dictitems, putMemo(d, object)); } final private void save_pers(PyObject pid) { if (protocol == 0) { file.write(PERSID); file.write(pid.toString()); file.write("\n"); } else { save(pid, true); file.write(BINPERSID); } } final private void save_reduce(PyObject callable, PyObject arg_tup, PyObject state, PyObject listitems, PyObject dictitems, int memoId) { PyObject callableName = callable.__findattr__("__name__"); if(protocol >= 2 && callableName != null && "__newobj__".equals(callableName.toString())) { PyObject cls = arg_tup.__finditem__(0); if(cls.__findattr__("__new__") == null) throw new PyException(PicklingError, "args[0] from __newobj__ args has no __new__"); // TODO: check class save(cls); save(arg_tup.__getslice__(Py.One, Py.None)); file.write(NEWOBJ); } else { save(callable); save(arg_tup); file.write(REDUCE); } put(memoId); if (listitems != Py.None) { batch_appends(listitems); } if (dictitems != Py.None) { batch_setitems(dictitems); } if (state != Py.None) { save(state); file.write(BUILD); } } final private boolean save_type(PyObject object, PyType type) { //System.out.println("save_type " + object + " " + cls); if (type == NoneType) save_none(object); else if (type == StringType) save_string(object); else if (type == UnicodeType) save_unicode(object); else if (type == IntType) save_int(object); else if (type == LongType) save_long(object); else if (type == FloatType) save_float(object); else if (type == TupleType) save_tuple(object); else if (type == ListType) save_list(object); else if (type == DictionaryType || type == StringMapType) save_dict(object); else if (type == InstanceType) save_inst((PyInstance)object); else if (type == ClassType) save_global(object); else if (type == TypeType) save_global(object); else if (type == FunctionType) save_global(object); else if (type == BuiltinFunctionType) save_global(object); else if (type == ReflectedFunctionType) save_global(object); else if (type == BoolType) save_bool(object); else return false; return true; } final private void save_none(PyObject object) { file.write(NONE); } final private void save_int(PyObject object) { if (protocol > 0) { int l = ((PyInteger)object).getValue(); char i1 = (char)( l & 0xFF); char i2 = (char)((l >>> 8 ) & 0xFF); char i3 = (char)((l >>> 16) & 0xFF); char i4 = (char)((l >>> 24) & 0xFF); if (i3 == '\0' && i4 == '\0') { if (i2 == '\0') { file.write(BININT1); file.write(i1); return; } file.write(BININT2); file.write(i1); file.write(i2); return; } file.write(BININT); file.write(i1); file.write(i2); file.write(i3); file.write(i4); } else { file.write(INT); file.write(object.toString()); file.write("\n"); } } private void save_bool(PyObject object) { int value = ((PyBoolean)object).getValue(); if(protocol >= 2) { file.write(value != 0 ? NEWTRUE : NEWFALSE); } else { file.write(INT); file.write(value != 0 ? "01" : "00"); file.write("\n"); } } private void save_long(PyObject object) { if(protocol >= 2) { BigInteger integer = ((PyLong)object).getValue(); byte[] bytes = integer.toByteArray(); int l = bytes.length; if(l < 256) { file.write(LONG1); file.write((char)l); } else { file.write(LONG4); writeInt4(l); } - for(int i = 0; i < l; i++) { - int b = bytes[i]; - if(b < 0) - b += 256; + // Write in reverse order: pickle orders by little + // endian whereas BigInteger orders by big endian + for (int i = l - 1; i >= 0; i--) { + int b = bytes[i] & 0xff; file.write((char)b); } } else { file.write(LONG); file.write(object.toString()); file.write("\n"); } } private void writeInt4(int l) { char i1 = (char)( l & 0xFF); char i2 = (char)((l >>> 8 ) & 0xFF); char i3 = (char)((l >>> 16) & 0xFF); char i4 = (char)((l >>> 24) & 0xFF); file.write(i1); file.write(i2); file.write(i3); file.write(i4); } final private void save_float(PyObject object) { if (protocol > 0) { file.write(BINFLOAT); double value= ((PyFloat) object).getValue(); // It seems that struct.pack('>d', ..) and doubleToLongBits // are the same. Good for me :-) long bits = Double.doubleToLongBits(value); file.write((char)((bits >>> 56) & 0xFF)); file.write((char)((bits >>> 48) & 0xFF)); file.write((char)((bits >>> 40) & 0xFF)); file.write((char)((bits >>> 32) & 0xFF)); file.write((char)((bits >>> 24) & 0xFF)); file.write((char)((bits >>> 16) & 0xFF)); file.write((char)((bits >>> 8) & 0xFF)); file.write((char)((bits >>> 0) & 0xFF)); } else { file.write(FLOAT); file.write(object.toString()); file.write("\n"); } } final private void save_string(PyObject object) { boolean unicode = ((PyString) object).isunicode(); String str = object.toString(); if (protocol > 0) { if (unicode) str = codecs.PyUnicode_EncodeUTF8(str, "struct"); int l = str.length(); if (l < 256 && !unicode) { file.write(SHORT_BINSTRING); file.write((char)l); } else { if (unicode) file.write(BINUNICODE); else file.write(BINSTRING); file.write((char)( l & 0xFF)); file.write((char)((l >>> 8 ) & 0xFF)); file.write((char)((l >>> 16) & 0xFF)); file.write((char)((l >>> 24) & 0xFF)); } file.write(str); } else { if (unicode) { file.write(UNICODE); file.write(codecs.PyUnicode_EncodeRawUnicodeEscape(str, "strict", true)); } else { file.write(STRING); file.write(object.__repr__().toString()); } file.write("\n"); } put(putMemo(get_id(object), object)); } private void save_unicode(PyObject object) { if (protocol > 0) { String str = codecs.PyUnicode_EncodeUTF8(object.toString(), "struct"); file.write(BINUNICODE); writeInt4(str.length()); file.write(str); } else { file.write(UNICODE); file.write(codecs.PyUnicode_EncodeRawUnicodeEscape(object.toString(), "strict", true)); file.write("\n"); } put(putMemo(get_id(object), object)); } private void save_tuple(PyObject object) { int d = get_id(object); int len = object.__len__(); if (len > 0 && len <= 3 && protocol >= 2) { for (int i = 0; i < len; i++) save(object.__finditem__(i)); int m = getMemoPosition(d, object); if (m >= 0) { for (int i = 0; i < len; i++) file.write(POP); get(m); } else { char opcode = (char) (TUPLE1 + len - 1); file.write(opcode); put(putMemo(d, object)); } return; } file.write(MARK); for (int i = 0; i < len; i++) save(object.__finditem__(i)); if (len > 0) { int m = getMemoPosition(d, object); if (m >= 0) { if (protocol > 0) { file.write(POP_MARK); get(m); return; } for (int i = 0; i < len+1; i++) file.write(POP); get(m); return; } } file.write(TUPLE); put(putMemo(d, object)); } final private void save_empty_tuple(PyObject object) { file.write(EMPTY_TUPLE); } private void save_list(PyObject object) { if (protocol > 0) file.write(EMPTY_LIST); else { file.write(MARK); file.write(LIST); } put(putMemo(get_id(object), object)); batch_appends(object); } private void batch_appends(PyObject object) { int countInBatch = 0; for (PyObject nextObj : object.asIterable()) { if(protocol == 0) { save(nextObj); file.write(APPEND); } else { if(countInBatch == 0) { file.write(MARK); } countInBatch++; save(nextObj); if(countInBatch == BATCHSIZE) { file.write(APPENDS); countInBatch = 0; } } } if (countInBatch > 0) file.write(APPENDS); } private void save_dict(PyObject object) { if (protocol > 0) file.write(EMPTY_DICT); else { file.write(MARK); file.write(DICT); } put(putMemo(get_id(object), object)); batch_setitems(object.invoke("iteritems")); } private void batch_setitems(PyObject object) { if (protocol == 0) { // SETITEMS isn't available; do one at a time. for (PyObject p : object.asIterable()) { if (!(p instanceof PyTuple) || p.__len__() != 2) { throw Py.TypeError("dict items iterator must return 2-tuples"); } save(p.__getitem__(0)); save(p.__getitem__(1)); file.write(SETITEM); } } else { // proto > 0: write in batches of BATCHSIZE. PyObject obj; PyObject[] slice = new PyObject[BATCHSIZE]; int n; do { // Get next group of (no more than) BATCHSIZE elements. for (n = 0; n < BATCHSIZE; n++) { obj = object.__iternext__(); if (obj == null) { break; } slice[n] = obj; } if (n > 1) { // Pump out MARK, slice[0:n], APPENDS. file.write(MARK); for (int i = 0; i < n; i++) { obj = slice[i]; save(obj.__getitem__(0)); save(obj.__getitem__(1)); } file.write(SETITEMS); } else if (n == 1) { obj = slice[0]; save(obj.__getitem__(0)); save(obj.__getitem__(1)); file.write(SETITEM); } } while (n == BATCHSIZE); } } final private void save_inst(PyInstance object) { if (object instanceof PyJavaInstance) throw new PyException(PicklingError, "Unable to pickle java objects."); PyClass cls = object.instclass; PySequence args = null; PyObject getinitargs = object.__findattr__("__getinitargs__"); if (getinitargs != null) { args = (PySequence)getinitargs.__call__(); // XXX Assert it's a sequence keep_alive(args); } file.write(MARK); if (protocol > 0) save(cls); if (args != null) { int len = args.__len__(); for (int i = 0; i < len; i++) save(args.__finditem__(i)); } int mid = putMemo(get_id(object), object); if (protocol > 0) { file.write(OBJ); put(mid); } else { file.write(INST); file.write(cls.__findattr__("__module__").toString()); file.write("\n"); file.write(cls.__name__); file.write("\n"); put(mid); } PyObject stuff = null; PyObject getstate = object.__findattr__("__getstate__"); if (getstate == null) { stuff = object.__dict__; } else { stuff = getstate.__call__(); keep_alive(stuff); } save(stuff); file.write(BUILD); } final private void save_global(PyObject object) { save_global(object, null); } final private void save_global(PyObject object, PyObject name) { if (name == null) name = object.__findattr__("__name__"); PyObject module = object.__findattr__("__module__"); if (module == null || module == Py.None) module = whichmodule(object, name); if(protocol >= 2) { PyTuple extKey = new PyTuple(module, name); PyObject extCode = extension_registry.get(extKey); if(extCode != Py.None) { int code = ((PyInteger)extCode).getValue(); if(code <= 0xFF) { file.write(EXT1); file.write((char)code); } else if(code <= 0xFFFF) { file.write(EXT2); file.write((char)(code & 0xFF)); file.write((char)(code >> 8)); } else { file.write(EXT4); writeInt4(code); } return; } } file.write(GLOBAL); file.write(module.toString()); file.write("\n"); file.write(name.toString()); file.write("\n"); put(putMemo(get_id(object), object)); } final private int getMemoPosition(int id, Object o) { return memo.findPosition(id, o); } final private int putMemo(int id, PyObject object) { int memo_len = memo.size() + 1; memo.put(id, memo_len, object); return memo_len; } /** * Keeps a reference to the object x in the memo. * * Because we remember objects by their id, we have * to assure that possibly temporary objects are kept * alive by referencing them. * We store a reference at the id of the memo, which should * normally not be used unless someone tries to deepcopy * the memo itself... */ final private void keep_alive(PyObject obj) { int id = System.identityHashCode(memo); PyList list = (PyList) memo.findValue(id, memo); if (list == null) { list = new PyList(); memo.put(id, -1, list); } list.append(obj); } } private static Hashtable classmap = new Hashtable(); final private static PyObject whichmodule(PyObject cls, PyObject clsname) { PyObject name = (PyObject)classmap.get(cls); if (name != null) return name; name = new PyString("__main__"); // For use with JPython1.0.x //PyObject modules = sys.modules; // For use with JPython1.1.x //PyObject modules = Py.getSystemState().modules; PyObject sys = imp.importName("sys", true); PyObject modules = sys.__findattr__("modules"); PyObject keylist = modules.invoke("keys"); int len = keylist.__len__(); for (int i = 0; i < len; i++) { PyObject key = keylist.__finditem__(i); PyObject value = modules.__finditem__(key); if (!key.equals("__main__") && value.__findattr__(clsname.toString().intern()) == cls) { name = key; break; } } classmap.put(cls, name); //System.out.println(name); return name; } /* * A very specialized and simplified version of PyStringMap. It can * only use integers as keys and stores both an integer and an object * as value. It is very private! */ static private class PickleMemo { //Table of primes to cycle through private final int[] primes = { 13, 61, 251, 1021, 4093, 5987, 9551, 15683, 19609, 31397, 65521, 131071, 262139, 524287, 1048573, 2097143, 4194301, 8388593, 16777213, 33554393, 67108859, 134217689, 268435399, 536870909, 1073741789,}; private transient int[] keys; private transient int[] position; private transient Object[] values; private int size; private transient int filled; private transient int prime; public PickleMemo(int capacity) { prime = 0; keys = null; values = null; resize(capacity); } public PickleMemo() { this(4); } public synchronized int size() { return size; } private int findIndex(int key, Object value) { int[] table = keys; int maxindex = table.length; int index = (key & 0x7fffffff) % maxindex; // Fairly aribtrary choice for stepsize... int stepsize = maxindex / 5; // Cycle through possible positions for the key; //int collisions = 0; while (true) { int tkey = table[index]; if (tkey == key && value == values[index]) { return index; } if (values[index] == null) return -1; index = (index+stepsize) % maxindex; } } public int findPosition(int key, Object value) { int idx = findIndex(key, value); if (idx < 0) return -1; return position[idx]; } public Object findValue(int key, Object value) { int idx = findIndex(key, value); if (idx < 0) return null; return values[idx]; } private final void insertkey(int key, int pos, Object value) { int[] table = keys; int maxindex = table.length; int index = (key & 0x7fffffff) % maxindex; // Fairly aribtrary choice for stepsize... int stepsize = maxindex / 5; // Cycle through possible positions for the key; while (true) { int tkey = table[index]; if (values[index] == null) { table[index] = key; position[index] = pos; values[index] = value; filled++; size++; break; } else if (tkey == key && values[index] == value) { position[index] = pos; break; } index = (index+stepsize) % maxindex; } } private synchronized final void resize(int capacity) { int p = prime; for(; p<primes.length; p++) { if (primes[p] >= capacity) break; } if (primes[p] < capacity) { throw Py.ValueError("can't make hashtable of size: " + capacity); } capacity = primes[p]; prime = p; int[] oldKeys = keys; int[] oldPositions = position; Object[] oldValues = values; keys = new int[capacity]; position = new int[capacity]; values = new Object[capacity]; size = 0; filled = 0; if (oldValues != null) { int n = oldValues.length; for(int i=0; i<n; i++) { Object value = oldValues[i]; if (value == null) continue; insertkey(oldKeys[i], oldPositions[i], value); } } } public void put(int key, int pos, Object value) { if (2*filled > keys.length) resize(keys.length+1); insertkey(key, pos, value); } } /** * The Unpickler object. Unpickler instances are create by the factory * methods Unpickler. * @see cPickle#Unpickler(PyObject) */ static public class Unpickler { private IOFile file; public Hashtable memo = new Hashtable(); /** * For the benefit of persistency modules written using pickle, * it supports the notion of a reference to an object outside * the pickled data stream. * Such objects are referenced by a name, which is an arbitrary * string of printable ASCII characters. * The resolution of such names is not defined by the pickle module * -- the persistent object module will have to add a method * persistent_load(). */ public PyObject persistent_load = null; private PyObject mark = new PyString("spam"); private int stackTop; private PyObject[] stack; Unpickler(PyObject file) { this.file = createIOFile(file); } /** * Unpickle and return an instance of the object represented by * the file. */ public PyObject load() { stackTop = 0; stack = new PyObject[10]; while (true) { String s = file.read(1); // System.out.println("load:" + s); // for (int i = 0; i < stackTop; i++) // System.out.println(" " + stack[i]); if (s.length() < 1) load_eof(); char key = s.charAt(0); switch (key) { case PERSID: load_persid(); break; case BINPERSID: load_binpersid(); break; case NONE: load_none(); break; case INT: load_int(); break; case BININT: load_binint(); break; case BININT1: load_binint1(); break; case BININT2: load_binint2(); break; case LONG: load_long(); break; case FLOAT: load_float(); break; case BINFLOAT: load_binfloat(); break; case STRING: load_string(); break; case BINSTRING: load_binstring(); break; case SHORT_BINSTRING: load_short_binstring(); break; case UNICODE: load_unicode(); break; case BINUNICODE: load_binunicode(); break; case TUPLE: load_tuple(); break; case EMPTY_TUPLE: load_empty_tuple(); break; case EMPTY_LIST: load_empty_list(); break; case EMPTY_DICT: load_empty_dictionary(); break; case LIST: load_list(); break; case DICT: load_dict(); break; case INST: load_inst(); break; case OBJ: load_obj(); break; case GLOBAL: load_global(); break; case REDUCE: load_reduce(); break; case POP: load_pop(); break; case POP_MARK: load_pop_mark(); break; case DUP: load_dup(); break; case GET: load_get(); break; case BINGET: load_binget(); break; case LONG_BINGET: load_long_binget(); break; case PUT: load_put(); break; case BINPUT: load_binput(); break; case LONG_BINPUT: load_long_binput(); break; case APPEND: load_append(); break; case APPENDS: load_appends(); break; case SETITEM: load_setitem(); break; case SETITEMS: load_setitems(); break; case BUILD: load_build(); break; case MARK: load_mark(); break; case PROTO: load_proto(); break; case NEWOBJ: load_newobj(); break; case EXT1: load_ext(1); break; case EXT2: load_ext(2); break; case EXT4: load_ext(4); break; case TUPLE1: load_small_tuple(1); break; case TUPLE2: load_small_tuple(2); break; case TUPLE3: load_small_tuple(3); break; case NEWTRUE: load_boolean(true); break; case NEWFALSE: load_boolean(false); break; case LONG1: load_bin_long(1); break; case LONG4: load_bin_long(4); break; case STOP: return load_stop(); } } } final private int marker() { for (int k = stackTop-1; k >= 0; k--) if (stack[k] == mark) return stackTop-k-1; throw new PyException(UnpicklingError, "Inputstream corrupt, marker not found"); } final private void load_eof() { throw new PyException(Py.EOFError); } private void load_proto() { int proto = file.read(1).charAt(0); if (proto < 0 || proto > 2) throw Py.ValueError("unsupported pickle protocol: " + proto); } final private void load_persid() { String pid = file.readlineNoNl(); push(persistent_load.__call__(new PyString(pid))); } final private void load_binpersid() { PyObject pid = pop(); push(persistent_load.__call__(pid)); } final private void load_none() { push(Py.None); } final private void load_int() { String line = file.readlineNoNl(); PyObject value; // The following could be abstracted into a common string // -> int/long method. if (line.equals("01")) { value = Py.True; } else if (line.equals("00")) { value = Py.False; } else { try { value = Py.newInteger(Integer.parseInt(line)); } catch(NumberFormatException e) { try { value = Py.newLong(line); } catch(NumberFormatException e2) { throw Py.ValueError("could not convert string to int"); } } } push(value); } private void load_boolean(boolean value) { push(value ? Py.True : Py.False); } final private void load_binint() { int x = read_binint(); push(new PyInteger(x)); } private int read_binint() { String s = file.read(4); return s.charAt(0) | (s.charAt(1)<<8) | (s.charAt(2)<<16) | (s.charAt(3)<<24); } final private void load_binint1() { int val = file.read(1).charAt(0); push(new PyInteger(val)); } final private void load_binint2() { int val = read_binint2(); push(new PyInteger(val)); } private int read_binint2() { String s = file.read(2); return (s.charAt(1)) << 8 | (s.charAt(0)); } final private void load_long() { String line = file.readlineNoNl(); push(new PyLong(line.substring(0, line.length()-1))); } private void load_bin_long(int length) { int longLength = read_binint(length); String s = file.read(longLength); byte[] bytes = new byte[s.length()]; - for(int i = 0; i < s.length(); i++) { + // Write to the byte array in reverse order: pickle orders + // by little endian whereas BigInteger orders by big + // endian + int n = s.length() - 1; + for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); if(c >= 128) { - bytes[i] = (byte)(c - 256); + bytes[n--] = (byte)(c - 256); } else { - bytes[i] = (byte)c; + bytes[n--] = (byte)c; } } BigInteger bigint = new BigInteger(bytes); push(new PyLong(bigint)); } private int read_binint(int length) { if (length == 1) return file.read(1).charAt(0); else if (length == 2) return read_binint2(); else return read_binint(); } final private void load_float() { String line = file.readlineNoNl(); push(new PyFloat(Double.valueOf(line).doubleValue())); } final private void load_binfloat() { String s = file.read(8); long bits = s.charAt(7) | ((long)s.charAt(6) << 8) | ((long)s.charAt(5) << 16) | ((long)s.charAt(4) << 24) | ((long)s.charAt(3) << 32) | ((long)s.charAt(2) << 40) | ((long)s.charAt(1) << 48) | ((long)s.charAt(0) << 56); push(new PyFloat(Double.longBitsToDouble(bits))); } final private void load_string() { String line = file.readlineNoNl(); String value; char quote = line.charAt(0); if (quote != '"' && quote != '\'') throw Py.ValueError("insecure string pickle"); int nslash = 0; int i; char ch = '\0'; int n = line.length(); for (i = 1; i < n; i++) { ch = line.charAt(i); if (ch == quote && nslash % 2 == 0) break; if (ch == '\\') nslash++; else nslash = 0; } if (ch != quote) throw Py.ValueError("insecure string pickle"); for (i++ ; i < line.length(); i++) { if (line.charAt(i) > ' ') throw Py.ValueError("insecure string pickle " + i); } value = PyString.decode_UnicodeEscape(line, 1, n-1, "strict", false); push(new PyString(value)); } final private void load_binstring() { int len = read_binint(); push(new PyString(file.read(len))); } final private void load_short_binstring() { int len = file.read(1).charAt(0); push(new PyString(file.read(len))); } final private void load_unicode() { String line = file.readlineNoNl(); String value = codecs.PyUnicode_DecodeRawUnicodeEscape(line, "strict"); push(new PyUnicode(value)); } final private void load_binunicode() { int len = read_binint(); String line = file.read(len); push(new PyUnicode(codecs.PyUnicode_DecodeUTF8(line, "strict"))); } final private void load_tuple() { PyObject[] arr = new PyObject[marker()]; pop(arr); pop(); push(new PyTuple(arr)); } final private void load_empty_tuple() { push(new PyTuple(Py.EmptyObjects)); } private void load_small_tuple(int length) { PyObject[] data = new PyObject[length]; for(int i=length-1; i >= 0; i--) { data [i] = pop(); } push(new PyTuple(data)); } final private void load_empty_list() { push(new PyList(Py.EmptyObjects)); } final private void load_empty_dictionary() { push(new PyDictionary()); } final private void load_list() { PyObject[] arr = new PyObject[marker()]; pop(arr); pop(); push(new PyList(arr)); } final private void load_dict() { int k = marker(); PyDictionary d = new PyDictionary(); for (int i = 0; i < k; i += 2) { PyObject value = pop(); PyObject key = pop(); d.__setitem__(key, value); } pop(); push(d); } final private void load_inst() { PyObject[] args = new PyObject[marker()]; pop(args); pop(); String module = file.readlineNoNl(); String name = file.readlineNoNl(); PyObject klass = find_class(module, name); PyObject value = null; if (args.length == 0 && klass instanceof PyClass && klass.__findattr__("__getinitargs__") == null) { value = new PyInstance((PyClass)klass); } else { value = klass.__call__(args); } push(value); } final private void load_obj() { PyObject[] args = new PyObject[marker()-1]; pop(args); PyObject klass = pop(); pop(); PyObject value = null; if (args.length == 0 && klass instanceof PyClass && klass.__findattr__("__getinitargs__") == null) { value = new PyInstance((PyClass)klass); } else { value = klass.__call__(args); } push(value); } final private void load_global() { String module = file.readlineNoNl(); String name = file.readlineNoNl(); PyObject klass = find_class(module, name); push(klass); } final private PyObject find_class(String module, String name) { PyObject fc = dict.__finditem__("find_global"); if (fc != null) { if (fc == Py.None) throw new PyException(UnpicklingError, "Global and instance pickles are not supported."); return fc.__call__(new PyString(module), new PyString(name)); } PyObject modules = Py.getSystemState().modules; PyObject mod = modules.__finditem__(module.intern()); if (mod == null) { mod = importModule(module); } PyObject global = mod.__findattr__(name.intern()); if (global == null) { throw new PyException(Py.SystemError, "Failed to import class " + name + " from module " + module); } return global; } private void load_ext(int length) { int code = read_binint(length); // TODO: support _extension_cache PyObject key = inverted_registry.get(Py.newInteger(code)); if (key == null) { throw new PyException(Py.ValueError, "unregistered extension code " + code); } String module = key.__finditem__(0).toString(); String name = key.__finditem__(1).toString(); push(find_class(module, name)); } final private void load_reduce() { PyObject arg_tup = pop(); PyObject callable = pop(); PyObject value = null; if (arg_tup == Py.None) { // XXX __basicnew__ ? value = callable.__findattr__("__basicnew__").__call__(); } else { value = callable.__call__(make_array(arg_tup)); } push(value); } private void load_newobj() { PyObject arg_tup = pop(); PyObject cls = pop(); PyObject[] args = new PyObject[arg_tup.__len__() + 1]; args [0] = cls; for(int i=1; i<args.length; i++) { args [i] = arg_tup.__finditem__(i-1); } push(cls.__getattr__("__new__").__call__(args)); } final private PyObject[] make_array(PyObject seq) { int n = seq.__len__(); PyObject[] objs= new PyObject[n]; for(int i=0; i<n; i++) objs[i] = seq.__finditem__(i); return objs; } final private void load_pop() { pop(); } final private void load_pop_mark() { pop(marker()); } final private void load_dup() { push(peek()); } final private void load_get() { String py_str = file.readlineNoNl(); PyObject value = (PyObject)memo.get(py_str); if (value == null) throw new PyException(BadPickleGet, py_str); push(value); } final private void load_binget() { String py_key = String.valueOf((int)file.read(1).charAt(0)); PyObject value = (PyObject)memo.get(py_key); if (value == null) throw new PyException(BadPickleGet, py_key); push(value); } final private void load_long_binget() { int i = read_binint(); String py_key = String.valueOf(i); PyObject value = (PyObject)memo.get(py_key); if (value == null) throw new PyException(BadPickleGet, py_key); push(value); } final private void load_put() { memo.put(file.readlineNoNl(), peek()); } final private void load_binput() { int i = file.read(1).charAt(0); memo.put(String.valueOf(i), peek()); } final private void load_long_binput() { int i = read_binint(); memo.put(String.valueOf(i), peek()); } final private void load_append() { PyObject value = pop(); PyObject obj = peek(); if(obj instanceof PyList) { ((PyList)obj).append(value); } else { PyObject appender = obj.__getattr__("append"); appender.__call__(value); } } final private void load_appends() { int mark = marker(); PyObject obj = peek(mark + 1); if(obj instanceof PyList) { for(int i = mark - 1; i >= 0; i--) { ((PyList)obj).append(peek(i)); } } else { PyObject appender = obj.__getattr__("append"); for(int i = mark - 1; i >= 0; i--) { appender.__call__(peek(i)); } } pop(mark + 1); } final private void load_setitem() { PyObject value = pop(); PyObject key = pop(); PyDictionary dict = (PyDictionary)peek(); dict.__setitem__(key, value); } final private void load_setitems() { int mark = marker(); PyDictionary dict = (PyDictionary)peek(mark+1); for (int i = 0; i < mark; i += 2) { PyObject key = peek(i+1); PyObject value = peek(i); dict.__setitem__(key, value); } pop(mark+1); } private void load_build() { PyObject value = pop(); PyObject inst = peek(); PyObject setstate = inst.__findattr__("__setstate__"); if(setstate == null) { PyObject slotstate = null; // A default __setstate__. First see whether state // embeds a slot state dict too (a proto 2 addition). if (value instanceof PyTuple && value.__len__() == 2) { PyObject temp = value; value = temp.__getitem__(0); slotstate = temp.__getitem__(1); } PyObject dict; if(inst instanceof PyInstance) { dict = ((PyInstance)inst).__dict__; } else { dict = inst.getDict(); } dict.__findattr__("update").__call__(value); // Also set instance attributes from the slotstate // dict (if any). if (slotstate != null) { if (!(slotstate instanceof PyDictionary)) { throw new PyException(UnpicklingError, "slot state is not a dictionary"); } for (PyObject item : ((PyDictionary)slotstate).iteritems().asIterable()) { inst.__setattr__(PyObject.asName(item.__getitem__(0)), item.__getitem__(1)); } } } else { setstate.__call__(value); } } final private void load_mark() { push(mark); } final private PyObject load_stop() { return pop(); } final private PyObject peek() { return stack[stackTop-1]; } final private PyObject peek(int count) { return stack[stackTop-count-1]; } final private PyObject pop() { PyObject val = stack[--stackTop]; stack[stackTop] = null; return val; } final private void pop(int count) { for (int i = 0; i < count; i++) stack[--stackTop] = null; } final private void pop(PyObject[] arr) { int len = arr.length; System.arraycopy(stack, stackTop - len, arr, 0, len); stackTop -= len; } final private void push(PyObject val) { if (stackTop >= stack.length) { PyObject[] newStack = new PyObject[(stackTop+1) * 2]; System.arraycopy(stack, 0, newStack, 0, stack.length); stack = newStack; } stack[stackTop++] = val; } } private static PyObject importModule(String name) { PyObject fromlist = new PyTuple(Py.newString("__doc__")); return __builtin__.__import__(name, null, null, fromlist); } private static PyObject getJavaFunc(String name) { return Py.newJavaFunc(cPickle.class, name); } private static PyObject buildClass(String classname, PyObject superclass, String classCodeName, String doc) { PyObject[] sclass = Py.EmptyObjects; if (superclass != null) sclass = new PyObject[] { superclass }; PyObject cls = Py.makeClass( classname, sclass, Py.newJavaCode(cPickle.class, classCodeName), new PyString(doc)); return cls; } }

diff --git a/src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISStorageListener.java b/src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISStorageListener.java index 3d5cb1c71..5ed201189 100644 --- a/src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISStorageListener.java +++ b/src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISStorageListener.java @@ -1,279 +1,287 @@ /* * Copyright (C) 2013 eccentric_nz * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ package me.eccentric_nz.TARDIS.advanced; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Locale; import me.eccentric_nz.TARDIS.TARDIS; import me.eccentric_nz.TARDIS.database.QueryFactory; import me.eccentric_nz.TARDIS.database.ResultSetDiskStorage; import me.eccentric_nz.TARDIS.enumeration.DISK_CIRCUIT; import me.eccentric_nz.TARDIS.enumeration.STORAGE; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; /** * * @author eccentric_nz */ public class TARDISStorageListener implements Listener { private final TARDIS plugin; List<String> titles = new ArrayList<String>(); private final List<Material> onlythese = new ArrayList<Material>(); public TARDISStorageListener(TARDIS plugin) { this.plugin = plugin; for (STORAGE s : STORAGE.values()) { this.titles.add(s.getTitle()); } for (DISK_CIRCUIT dc : DISK_CIRCUIT.values()) { if (!onlythese.contains(dc.getMaterial())) { onlythese.add(dc.getMaterial()); } } } @EventHandler(priority = EventPriority.NORMAL) public void onDiskStorageClose(InventoryCloseEvent event) { Inventory inv = event.getInventory(); String title = inv.getTitle(); if (titles.contains(title)) { // which inventory screen is it? String[] split = title.split(" "); String tmp = split[0].toUpperCase(Locale.ENGLISH); if (split.length > 2) { tmp = tmp + "_" + split[2]; } STORAGE store = STORAGE.valueOf(tmp); saveCurrentStorage(inv, store.getTable(), (Player) event.getPlayer()); } else if (!title.equals("§4TARDIS Console")) { + /** + * Fix incorrect Bukkit behaviour + * + * @see https://bukkit.atlassian.net/browse/BUKKIT-2788 + * @see https://github.com/Bukkit/CraftBukkit/pull/1130 + */ + int isze = (inv.getType().equals(InventoryType.ANVIL)) ? 2 : inv.getSize(); // scan the inventory for area disks and spit them out - for (int i = 0; i < inv.getSize(); i++) { + for (int i = 0; i < isze; i++) { ItemStack stack = inv.getItem(i); if (stack != null && stack.getType().equals(Material.RECORD_3) && stack.hasItemMeta()) { ItemMeta ims = stack.getItemMeta(); if (ims.hasDisplayName() && ims.getDisplayName().equals("Area Storage Disk")) { Player p = (Player) event.getPlayer(); Location loc = p.getLocation(); loc.getWorld().dropItemNaturally(loc, stack); inv.setItem(i, new ItemStack(Material.AIR)); p.sendMessage(plugin.pluginName + "You cannot store Area Storage Disks here!"); } } } } } @EventHandler(priority = EventPriority.MONITOR) public void onDiskStorageInteract(InventoryClickEvent event) { Inventory inv = event.getInventory(); String title = inv.getTitle(); if (!titles.contains(title) || event.isCancelled()) { return; } int slot = event.getRawSlot(); if (slot < 27 || event.isShiftClick()) { event.setCancelled(true); } final Player player = (Player) event.getWhoClicked(); String playerNameStr = player.getName(); // get the storage record HashMap<String, Object> where = new HashMap<String, Object>(); where.put("owner", playerNameStr); ResultSetDiskStorage rs = new ResultSetDiskStorage(plugin, where); if (rs.resultSet()) { // which inventory screen is it? String[] split = title.split(" "); String tmp = split[0].toUpperCase(Locale.ENGLISH); if (split.length > 2) { tmp = tmp + "_" + split[2]; } STORAGE store = STORAGE.valueOf(tmp); if (slot < 6 || slot == 18 || slot == 26) { saveCurrentStorage(inv, store.getTable(), player); } switch (slot) { case 0: // switch to saves loadInventory(rs.getSavesOne(), player, STORAGE.SAVE_1); break; case 1: // switch to areas loadInventory(rs.getAreas(), player, STORAGE.AREA); break; case 2: // switch to players loadInventory(rs.getPlayers(), player, STORAGE.PLAYER); break; case 3: // switch to biomes loadInventory(rs.getBiomesOne(), player, STORAGE.BIOME_1); break; case 4: // switch to presets loadInventory(rs.getPresetsOne(), player, STORAGE.PRESET_1); break; case 5: // switch to circuits loadInventory(rs.getCircuits(), player, STORAGE.CIRCUIT); break; } switch (store) { case BIOME_1: switch (slot) { case 26: // switch to biome 2 loadInventory(rs.getBiomesTwo(), player, STORAGE.BIOME_2); break; default: break; } break; case BIOME_2: switch (slot) { case 18: // switch to biome 1 loadInventory(rs.getBiomesOne(), player, STORAGE.BIOME_1); break; default: break; } break; case PRESET_1: switch (slot) { case 26: // switch to preset 2 loadInventory(rs.getPresetsTwo(), player, STORAGE.PRESET_2); break; default: break; } break; case PRESET_2: switch (slot) { case 18: // switch to preset 1 loadInventory(rs.getPresetsOne(), player, STORAGE.PRESET_1); break; default: break; } break; case SAVE_1: switch (slot) { case 26: // switch to save 2 loadInventory(rs.getSavesTwo(), player, STORAGE.SAVE_2); break; default: break; } break; case SAVE_2: switch (slot) { case 18: // switch to save 1 loadInventory(rs.getSavesOne(), player, STORAGE.SAVE_1); break; default: break; } break; default: // no extra pages break; } } } @EventHandler(ignoreCancelled = true) public void onPlayerDropAreaDisk(PlayerDropItemEvent event) { ItemStack stack = event.getItemDrop().getItemStack(); if (stack != null && stack.getType().equals(Material.RECORD_3) && stack.hasItemMeta()) { ItemMeta ims = stack.getItemMeta(); if (ims.hasDisplayName() && ims.getDisplayName().equals("Area Storage Disk")) { event.setCancelled(true); Player p = event.getPlayer(); p.sendMessage(plugin.pluginName + "You cannot drop Area Storage Disks!"); } } } private void saveCurrentStorage(Inventory inv, String column, Player p) { // loop through inventory contents and remove any items that are not disks or circuits for (int i = 27; i < 54; i++) { ItemStack is = inv.getItem(i); if (is != null) { if (!onlythese.contains(is.getType())) { p.getLocation().getWorld().dropItemNaturally(p.getLocation(), is); inv.setItem(i, new ItemStack(Material.AIR)); } } } String serialized = TARDISSerializeInventory.itemStacksToString(inv.getContents()); HashMap<String, Object> set = new HashMap<String, Object>(); set.put(column, serialized); HashMap<String, Object> where = new HashMap<String, Object>(); where.put("owner", p.getName()); new QueryFactory(plugin).doUpdate("storage", set, where); } private void loadInventory(final String serialized, final Player p, final STORAGE s) { plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { @Override public void run() { ItemStack[] stack = null; try { if (!serialized.isEmpty()) { if (s.equals(STORAGE.AREA)) { stack = TARDISSerializeInventory.itemStacksFromString(new TARDISAreaDisks(plugin).checkDisksForNewAreas(p)); } else { stack = TARDISSerializeInventory.itemStacksFromString(serialized); } } else { if (s.equals(STORAGE.AREA)) { stack = new TARDISAreaDisks(plugin).makeDisks(p); } else { stack = TARDISSerializeInventory.itemStacksFromString(s.getEmpty()); } } } catch (IOException ex) { plugin.debug("Could not get inventory from database! " + ex); } // close inventory p.closeInventory(); // open new inventory Inventory inv = plugin.getServer().createInventory(p, 54, s.getTitle()); inv.setContents(stack); p.openInventory(inv); } }, 1L); } }

diff --git a/org.mongodb.meclipse/src/org/mongodb/meclipse/editors/MeclipseEditor.java b/org.mongodb.meclipse/src/org/mongodb/meclipse/editors/MeclipseEditor.java index 8cafb05..7226fa0 100644 --- a/org.mongodb.meclipse/src/org/mongodb/meclipse/editors/MeclipseEditor.java +++ b/org.mongodb.meclipse/src/org/mongodb/meclipse/editors/MeclipseEditor.java @@ -1,271 +1,277 @@ package org.mongodb.meclipse.editors; import java.util.Iterator; import java.util.Map; import net.miginfocom.swt.MigLayout; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.GC; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.ExpandBar; import org.eclipse.swt.widgets.ExpandItem; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.MultiPageEditorPart; import org.mongodb.meclipse.MeclipsePlugin; import org.mongodb.meclipse.views.objects.Collection; import org.mongodb.meclipse.views.objects.Collection.CollectionType; import com.mongodb.DBObject; import com.mongodb.util.JSON; import com.mongodb.util.JSONParseException; /** * @author Flavio [FlaPer87] Percoco Premoli */ public class MeclipseEditor extends MultiPageEditorPart implements IResourceChangeListener { public static final String ID = "org.mongodb.meclipse.editors.meclipseEditor"; private Button search; private Button more; private Button all; private Text query; private Text skipV; private Text limitV; private Collection col; private ExpandBar bar; private static final int maxElements = 20; private Iterator<DBObject> cursor; private Listener runQuery = new Listener() { @Override public void handleEvent( Event arg0 ) { int skip = 0; int limit = 0; try { skip = Integer.valueOf(skipV.getText() ); } catch (NumberFormatException e) { //TODO just ignore it? } try{ limit = Integer.valueOf(limitV.getText()); } catch (NumberFormatException e) { //TODO just ignore it? } for (ExpandItem item : bar.getItems()) { item.dispose(); } bar.setData(null); bar.setLayoutData( new GridData(SWT.FILL, SWT.FILL, true, true ) ); try { cursor = col.getCollection().find((DBObject)JSON.parse( query.getText() )).limit(limit).skip(skip).iterator(); loadEntries(false); } catch (JSONParseException e) { //TODO display Error message System.out.println(e); } } }; public MeclipseEditor() { } @Override public void doSave( IProgressMonitor monitor ) { } @Override public void doSaveAs() { } @Override public void init( IEditorSite site, IEditorInput input ) throws PartInitException { setSite( site ); setInput( input ); this.col = ( (CollectionEditorInput) input ).getObject(); setPartName( col.getName() ); } @Override public boolean isDirty() { return false; // our editor currently does not support editing } @Override public boolean isSaveAsAllowed() { return false; } @Override protected void createPages() { final Composite composite = new Composite( getContainer(), SWT.FILL ); ImageRegistry reg = MeclipsePlugin.getDefault().getImageRegistry(); - composite.setLayout( new MigLayout( "wrap 9", "[][][][40px!][][40px!][][][]", "[30px!][100%-30px!]") ); + composite.setLayout( new MigLayout( "wrap 9", "[][][][40px!][][40px!][][][]", "[30px!][]") ); Label find = new Label( composite, SWT.FILL ); find.setLayoutData( "w 30!" ); find.setText( "Find:" ); query = new Text( composite, SWT.FILL ); query.setLayoutData( "w 100: 500: 600" ); query.setText( "{}" ); Label skip = new Label( composite, SWT.FILL ); skip.setText( "Skip:" ); skipV = new Text( composite, SWT.FILL ); skipV.setText( "0" ); skipV.setLayoutData( "w 40px!" ); skipV.addListener(SWT.DefaultSelection, runQuery); Label limit = new Label( composite, SWT.FILL ); limit.setText( "Limit:" ); limitV = new Text( composite, SWT.FILL ); limitV.setText( "10" ); limitV.setLayoutData( "w 40px!" ); limitV.addListener(SWT.DefaultSelection, runQuery); search = new Button( composite, SWT.PUSH ); search.setToolTipText( "Go!" ); search.setImage( reg.get( MeclipsePlugin.FIND_IMG_ID ) ); search.addListener( SWT.Selection, runQuery); more = new Button( composite, SWT.PUSH ); more.setToolTipText( "Get next 20 results" ); more.setImage( reg.get( MeclipsePlugin.GET_NEXT_IMG_ID ) ); more.setEnabled( false ); more.addListener( SWT.Selection, new Listener() { @Override public void handleEvent( Event arg0 ) { loadEntries(false); } }); all = new Button(composite, SWT.PUSH); all.setToolTipText("Get all results"); all.setImage(reg.get(MeclipsePlugin.GET_ALL_IMG_ID)); all.setEnabled(false); all.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event arg0) { loadEntries(true); } }); bar = new ExpandBar( composite, SWT.V_SCROLL ); - bar.setLayoutData( "span, w 100% !" ); -// bar.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + bar.setLayoutData( "span, w 100%-20px !,h 100%-50px !" ); cursor = col.getCollection().find().limit(maxElements); loadEntries(false); int index = addPage( composite ); setPageText( index, "Properties" ); } @Override public void setFocus() { } @Override public void resourceChanged( IResourceChangeEvent arg0 ) { // TODO Auto-generated method stub } public void createExpander( final ExpandBar bar, Map<String, Object> o, CollectionType collType ) { System.out.println(o); // First item final Composite composite = new Composite( bar, SWT.FILL ); GridLayout layout = new GridLayout(); layout.numColumns = 2; layout.marginLeft = layout.marginTop = layout.marginRight = layout.marginBottom = 10; composite.setLayout( layout ); final ExpandItem expandItem = new ExpandItem( bar, SWT.NONE, 0 ); + GC gc = new GC(bar); + int h = gc.textExtent( "T" ,SWT.DRAW_DELIMITER).y; + int c = 2; + gc.dispose(); for ( Object key : o.keySet() ) { + c++; if ( key == "_id" || key == "_ns" ) continue; Label keyLabel = new Label( composite, SWT.NONE ); keyLabel.setText( key.toString() ); Label valueLabel = new Label( composite, SWT.WRAP ); Object value = o.get( key ); valueLabel.setText( String.valueOf( value ) ); } + System.out.println(c); Object value; switch ( collType ) { case SYSINDEX: value = o.get( "ns" ).toString() + "." + o.get( "name" ).toString(); break; default: value = o.get( "_id" ); break; } expandItem.setText( String.valueOf( value ) ); - expandItem.setHeight( 500 ); + expandItem.setHeight( h * c ); expandItem.setControl( composite ); } @SuppressWarnings("unchecked") public void loadEntries(boolean ignoreLimit) { if (cursor != null) { int count = 0; while(cursor.hasNext()) { createExpander(bar,(Map<String, Object>) cursor.next().toMap(), col.getType()); if (count++ == maxElements && !ignoreLimit) { break; } } more.setEnabled(cursor.hasNext()); all.setEnabled(cursor.hasNext()); } } }

diff --git a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/diagram/TutorialToolBehaviorProvider.java b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/diagram/TutorialToolBehaviorProvider.java index ed803f70..0f0d0f0b 100644 --- a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/diagram/TutorialToolBehaviorProvider.java +++ b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/diagram/TutorialToolBehaviorProvider.java @@ -1,248 +1,248 @@ /******************************************************************************* * <copyright> * * Copyright (c) 2005, 2010 SAP AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * SAP AG - initial API, implementation and documentation * * </copyright> * *******************************************************************************/ package org.eclipse.graphiti.examples.tutorial.diagram; import java.util.ArrayList; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.graphiti.dt.IDiagramTypeProvider; import org.eclipse.graphiti.examples.tutorial.TutorialImageProvider; import org.eclipse.graphiti.examples.tutorial.features.TutorialCollapseDummyFeature; import org.eclipse.graphiti.examples.tutorial.features.TutorialRenameEClassFeature; import org.eclipse.graphiti.features.ICreateConnectionFeature; import org.eclipse.graphiti.features.ICreateFeature; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.context.ICustomContext; import org.eclipse.graphiti.features.context.IDoubleClickContext; import org.eclipse.graphiti.features.context.IPictogramElementContext; import org.eclipse.graphiti.features.context.impl.CreateConnectionContext; import org.eclipse.graphiti.features.context.impl.CustomContext; import org.eclipse.graphiti.features.custom.ICustomFeature; import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm; import org.eclipse.graphiti.mm.pictograms.Anchor; import org.eclipse.graphiti.mm.pictograms.AnchorContainer; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.palette.IPaletteCompartmentEntry; import org.eclipse.graphiti.palette.impl.ConnectionCreationToolEntry; import org.eclipse.graphiti.palette.impl.ObjectCreationToolEntry; import org.eclipse.graphiti.palette.impl.PaletteCompartmentEntry; import org.eclipse.graphiti.palette.impl.StackEntry; import org.eclipse.graphiti.platform.IPlatformImageConstants; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.tb.ContextButtonEntry; import org.eclipse.graphiti.tb.ContextEntryHelper; import org.eclipse.graphiti.tb.ContextMenuEntry; import org.eclipse.graphiti.tb.DefaultToolBehaviorProvider; import org.eclipse.graphiti.tb.IContextButtonEntry; import org.eclipse.graphiti.tb.IContextButtonPadData; import org.eclipse.graphiti.tb.IContextMenuEntry; import org.eclipse.graphiti.tb.IDecorator; import org.eclipse.graphiti.tb.ImageDecorator; public class TutorialToolBehaviorProvider extends DefaultToolBehaviorProvider { public TutorialToolBehaviorProvider(IDiagramTypeProvider dtp) { super(dtp); } @Override public IContextButtonPadData getContextButtonPad(IPictogramElementContext context) { IContextButtonPadData data = super.getContextButtonPad(context); PictogramElement pe = context.getPictogramElement(); // 1. set the generic context buttons // note, that we do not add 'remove' (just as an example) setGenericContextButtons(data, pe, CONTEXT_BUTTON_DELETE | CONTEXT_BUTTON_UPDATE); // 2. set the collapse button // simply use a dummy custom feature (senseless example) CustomContext cc = new CustomContext(new PictogramElement[] { pe }); ICustomFeature[] cf = getFeatureProvider().getCustomFeatures(cc); for (int i = 0; i < cf.length; i++) { ICustomFeature iCustomFeature = cf[i]; if (iCustomFeature instanceof TutorialCollapseDummyFeature) { IContextButtonEntry collapseButton = ContextEntryHelper.createCollapseContextButton(true, iCustomFeature, cc); data.setCollapseContextButton(collapseButton); break; } } // 3. add one domain specific context-button, which offers all // available connection-features as drag&drop features... // 3.a. create new CreateConnectionContext CreateConnectionContext ccc = new CreateConnectionContext(); ccc.setSourcePictogramElement(pe); Anchor anchor = null; if (pe instanceof Anchor) { anchor = (Anchor) pe; } else if (pe instanceof AnchorContainer) { // assume, that our shapes always have chopbox anchors anchor = Graphiti.getPeService().getChopboxAnchor((AnchorContainer) pe); } ccc.setSourceAnchor(anchor); // 3.b. create context button and add all applicable features ContextButtonEntry button = new ContextButtonEntry(null, context); button.setText("Create connection"); //$NON-NLS-1$ button.setIconId(TutorialImageProvider.IMG_EREFERENCE); ICreateConnectionFeature[] features = getFeatureProvider().getCreateConnectionFeatures(); for (ICreateConnectionFeature feature : features) { if (feature.isAvailable(ccc) && feature.canStartConnection(ccc)) button.addDragAndDropFeature(feature); } // 3.c. add context button, if it contains at least one feature if (button.getDragAndDropFeatures().size() > 0) { data.getDomainSpecificContextButtons().add(button); } return data; } @Override public IContextMenuEntry[] getContextMenu(ICustomContext context) { // create a sub-menu for all custom features ContextMenuEntry subMenu = new ContextMenuEntry(null, context); subMenu.setText("Cu&stom"); //$NON-NLS-1$ subMenu.setDescription("Custom features submenu"); //$NON-NLS-1$ // display sub-menu hierarchical or flat subMenu.setSubmenu(true); // create a menu-entry in the sub-menu for each custom feature ICustomFeature[] customFeatures = getFeatureProvider().getCustomFeatures(context); for (int i = 0; i < customFeatures.length; i++) { ICustomFeature customFeature = customFeatures[i]; if (customFeature.isAvailable(context)) { ContextMenuEntry menuEntry = new ContextMenuEntry(customFeature, context); subMenu.add(menuEntry); } } IContextMenuEntry ret[] = new IContextMenuEntry[] { subMenu }; return ret; } @Override public IPaletteCompartmentEntry[] getPalette() { List<IPaletteCompartmentEntry> ret = new ArrayList<IPaletteCompartmentEntry>(); // add compartments from super class IPaletteCompartmentEntry[] superCompartments = super.getPalette(); for (int i = 0; i < superCompartments.length; i++) ret.add(superCompartments[i]); // add new compartment at the end of the existing compartments PaletteCompartmentEntry compartmentEntry = new PaletteCompartmentEntry("Stacked", null); //$NON-NLS-1$ ret.add(compartmentEntry); // add new stack entry to new compartment StackEntry stackEntry = new StackEntry("EObject", "EObject", null); //$NON-NLS-1$ //$NON-NLS-2$ compartmentEntry.addToolEntry(stackEntry); // add all create-features to the new stack-entry IFeatureProvider featureProvider = getFeatureProvider(); ICreateFeature[] createFeatures = featureProvider.getCreateFeatures(); for (ICreateFeature cf : createFeatures) { ObjectCreationToolEntry objectCreationToolEntry = new ObjectCreationToolEntry(cf.getCreateName(), cf.getCreateDescription(), cf.getCreateImageId(), cf.getCreateLargeImageId(), cf); stackEntry.addCreationToolEntry(objectCreationToolEntry); } // add all create-connection-features to the new stack-entry ICreateConnectionFeature[] createConnectionFeatures = featureProvider.getCreateConnectionFeatures(); for (ICreateConnectionFeature cf : createConnectionFeatures) { ConnectionCreationToolEntry connectionCreationToolEntry = new ConnectionCreationToolEntry(cf.getCreateName(), cf.getCreateDescription(), cf.getCreateImageId(), cf.getCreateLargeImageId()); connectionCreationToolEntry.addCreateConnectionFeature(cf); stackEntry.addCreationToolEntry(connectionCreationToolEntry); } return ret.toArray(new IPaletteCompartmentEntry[ret.size()]); } @Override public ICustomFeature getDoubleClickFeature(IDoubleClickContext context) { ICustomFeature customFeature = new TutorialRenameEClassFeature(getFeatureProvider()); // canExecute() tests especially if the context contains a EClass if (customFeature.canExecute(context)) { return customFeature; } return super.getDoubleClickFeature(context); } @Override public IDecorator[] getDecorators(PictogramElement pe) { IFeatureProvider featureProvider = getFeatureProvider(); Object bo = featureProvider.getBusinessObjectForPictogramElement(pe); if (bo instanceof EClass) { EClass eClass = (EClass) bo; String name = eClass.getName(); if (name != null && name.length() > 0 && !(name.charAt(0) >= 'A' && name.charAt(0) <= 'Z')) { IDecorator imageRenderingDecorator = new ImageDecorator(IPlatformImageConstants.IMG_ECLIPSE_WARNING_TSK); imageRenderingDecorator.setMessage("Name should start with upper case letter"); //$NON-NLS-1$ return new IDecorator[] { imageRenderingDecorator }; } } return super.getDecorators(pe); } @Override public GraphicsAlgorithm[] getClickArea(PictogramElement pe) { IFeatureProvider featureProvider = getFeatureProvider(); Object bo = featureProvider.getBusinessObjectForPictogramElement(pe); if (bo instanceof EClass) { GraphicsAlgorithm invisible = pe.getGraphicsAlgorithm(); GraphicsAlgorithm rectangle = invisible.getGraphicsAlgorithmChildren().get(0); return new GraphicsAlgorithm[] { rectangle }; } return super.getClickArea(pe); } @Override public GraphicsAlgorithm getSelectionBorder(PictogramElement pe) { if (pe instanceof ContainerShape) { GraphicsAlgorithm invisible = pe.getGraphicsAlgorithm(); if (!invisible.getLineVisible()) { EList<GraphicsAlgorithm> graphicsAlgorithmChildren = invisible.getGraphicsAlgorithmChildren(); if (!graphicsAlgorithmChildren.isEmpty()) { return graphicsAlgorithmChildren.get(0); } } } return super.getSelectionBorder(pe); } @Override public String getToolTip(GraphicsAlgorithm ga) { PictogramElement pe = ga.getPictogramElement(); Object bo = getFeatureProvider().getBusinessObjectForPictogramElement(pe); if (bo instanceof EClass) { String name = ((EClass) bo).getName(); - if (name != null && !name.isEmpty()) { + if (name != null && !(name.length() == 0)) { return name; } } return super.getToolTip(ga); } } diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java index f386f1b2..2b8323f4 100644 --- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java +++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java @@ -1,1495 +1,1495 @@ /******************************************************************************* * <copyright> * * Copyright (c) 2005, 2011 SAP AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * SAP AG - initial API, implementation and documentation * mwenz - Bug 348662 - Setting tooptip to null in tool behavior provider doesn't clear up * tooltip if the associated figure has a previous tooltip * * </copyright> * *******************************************************************************/ package org.eclipse.graphiti.ui.internal.parts; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.ImageFigure; import org.eclipse.draw2d.Label; import org.eclipse.draw2d.PolylineConnection; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.RotatableDecoration; import org.eclipse.draw2d.Shape; import org.eclipse.draw2d.XYLayout; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PointList; import org.eclipse.draw2d.geometry.PrecisionPoint; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.graphiti.datatypes.IDimension; import org.eclipse.graphiti.datatypes.ILocation; import org.eclipse.graphiti.datatypes.IRectangle; import org.eclipse.graphiti.dt.IDiagramTypeProvider; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.IReason; import org.eclipse.graphiti.features.IUpdateFeature; import org.eclipse.graphiti.features.context.IUpdateContext; import org.eclipse.graphiti.features.context.impl.UpdateContext; import org.eclipse.graphiti.features.impl.Reason; import org.eclipse.graphiti.internal.datatypes.impl.LocationImpl; import org.eclipse.graphiti.internal.pref.GFPreferences; import org.eclipse.graphiti.internal.services.GraphitiInternal; import org.eclipse.graphiti.internal.util.T; import org.eclipse.graphiti.mm.algorithms.AbstractText; import org.eclipse.graphiti.mm.algorithms.Ellipse; import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm; import org.eclipse.graphiti.mm.algorithms.Image; import org.eclipse.graphiti.mm.algorithms.MultiText; import org.eclipse.graphiti.mm.algorithms.PlatformGraphicsAlgorithm; import org.eclipse.graphiti.mm.algorithms.Polygon; import org.eclipse.graphiti.mm.algorithms.Polyline; import org.eclipse.graphiti.mm.algorithms.Rectangle; import org.eclipse.graphiti.mm.algorithms.RoundedRectangle; import org.eclipse.graphiti.mm.algorithms.Text; import org.eclipse.graphiti.mm.algorithms.styles.LineStyle; import org.eclipse.graphiti.mm.algorithms.styles.Orientation; import org.eclipse.graphiti.mm.pictograms.Anchor; import org.eclipse.graphiti.mm.pictograms.BoxRelativeAnchor; import org.eclipse.graphiti.mm.pictograms.Connection; import org.eclipse.graphiti.mm.pictograms.ConnectionDecorator; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.FixPointAnchor; import org.eclipse.graphiti.mm.pictograms.FreeFormConnection; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.platform.ga.IGraphicsAlgorithmRenderer; import org.eclipse.graphiti.platform.ga.IGraphicsAlgorithmRendererFactory; import org.eclipse.graphiti.platform.ga.IRendererContext; import org.eclipse.graphiti.platform.ga.IVisualState; import org.eclipse.graphiti.platform.ga.RendererContext; import org.eclipse.graphiti.platform.ga.VisualState; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.tb.DefaultToolBehaviorProvider; import org.eclipse.graphiti.tb.IDecorator; import org.eclipse.graphiti.tb.IImageDecorator; import org.eclipse.graphiti.tb.IToolBehaviorProvider; import org.eclipse.graphiti.ui.internal.config.IConfigurationProvider; import org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal; import org.eclipse.graphiti.ui.internal.figures.DecoratorImageFigure; import org.eclipse.graphiti.ui.internal.figures.GFAbstractShape; import org.eclipse.graphiti.ui.internal.figures.GFEllipse; import org.eclipse.graphiti.ui.internal.figures.GFEllipseDecoration; import org.eclipse.graphiti.ui.internal.figures.GFImageFigure; import org.eclipse.graphiti.ui.internal.figures.GFMultilineText; import org.eclipse.graphiti.ui.internal.figures.GFPolygon; import org.eclipse.graphiti.ui.internal.figures.GFPolygonDecoration; import org.eclipse.graphiti.ui.internal.figures.GFPolyline; import org.eclipse.graphiti.ui.internal.figures.GFPolylineConnection; import org.eclipse.graphiti.ui.internal.figures.GFPolylineDecoration; import org.eclipse.graphiti.ui.internal.figures.GFRectangleFigure; import org.eclipse.graphiti.ui.internal.figures.GFRoundedRectangle; import org.eclipse.graphiti.ui.internal.figures.GFText; import org.eclipse.graphiti.ui.internal.services.GraphitiUiInternal; import org.eclipse.graphiti.ui.internal.util.DataTypeTransformation; import org.eclipse.graphiti.ui.services.GraphitiUi; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.model.IWorkbenchAdapter2; import org.eclipse.ui.views.properties.IPropertySource; /** * A class, which contains helper-methods, which are necessary to implement the * interface IAnchorContainerEditPart. It is not possible to make this an * EditPart itself, because of different inheritance-hierarchies used in the * sub-classes. * * @noinstantiate This class is not intended to be instantiated by clients. * @noextend This class is not intended to be subclassed by clients. */ public class PictogramElementDelegate implements IPictogramElementDelegate { private boolean forceRefresh = false; private boolean valid = true; private IConfigurationProvider configurationProvider; private final Hashtable<GraphicsAlgorithm, IFigure> elementFigureHash = new Hashtable<GraphicsAlgorithm, IFigure>(); private final HashSet<Font> fontList = new HashSet<Font>(); private PictogramElement pictogramElement; private final HashMap<IFigure, List<IFigure>> decoratorMap = new HashMap<IFigure, List<IFigure>>(); // edit part which holds the instance of this delegate private EditPart containerEditPart; /** * The {@link IVisualState} of this pictogram element delegate. */ private IVisualState visualState; /** * Creates a new PictogramElementDelegate. * * @param configurationProvider * the configuration provider * @param pictogramElement * the pictogram element * @param containerEditPart * the container edit part */ public PictogramElementDelegate(IConfigurationProvider configurationProvider, PictogramElement pictogramElement, EditPart containerEditPart) { setConfigurationProvider(configurationProvider); setPictogramElement(pictogramElement); setContainerEditPart(containerEditPart); } /* * (non-Javadoc) * * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate * #activate () */ @Override public void activate() { // register listener for changes in the bo model -> will be done // globally in the DiagramEditorInternal } /* * (non-Javadoc) * * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate# * createFigure() */ @Override public IFigure createFigure() { PictogramElement pe = getPictogramElement(); IFigure ret = createFigureForPictogramElement(pe); if (getEditor().isMultipleRefreshSupressionActive()) { return ret; } else { refreshFigureForPictogramElement(pe); return ret; } } /* * (non-Javadoc) * * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate# * deactivate() */ @Override public void deactivate() { disposeFonts(); } /* * (non-Javadoc) * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class key) { Object ret = null; if (key == IGFAdapter.class || key == IWorkbenchAdapter.class || key == IWorkbenchAdapter2.class) { ret = new GFAdapter(); } else if (key == IPropertySource.class) { IToolBehaviorProvider tbp = getConfigurationProvider().getDiagramTypeProvider() .getCurrentToolBehaviorProvider(); ret = tbp.getAdapter(key); } return ret; } /** * Gets the configuration provider. * * @return Returns the configurationProvider. */ @Override public IConfigurationProvider getConfigurationProvider() { return configurationProvider; } /* * (non-Javadoc) * * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate# * getFigureForGraphicsAlgorithm(org.eclipse.graphiti.mm.pictograms. * GraphicsAlgorithm) */ @Override public IFigure getFigureForGraphicsAlgorithm(GraphicsAlgorithm graphicsAlgorithm) { IFigure ret = null; if (graphicsAlgorithm == null) { return ret; } Object element = elementFigureHash.get(graphicsAlgorithm); if (element instanceof IFigure) { ret = (IFigure) element; } return ret; } /* * (non-Javadoc) * * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate# * getPictogramElement() */ @Override public PictogramElement getPictogramElement() { return pictogramElement; } /** * refresh edit parts for child pictogram elements. * * @param ep * the ep */ @Override public void refreshEditPartsForModelChildrenAndSourceConnections(EditPart ep) { if (ep instanceof IPictogramElementEditPart) { IPictogramElementEditPart peep = (IPictogramElementEditPart) ep; List<PictogramElement> peList = new ArrayList<PictogramElement>(); peList.addAll(peep.getModelChildren()); peList.addAll(peep.getModelSourceConnections()); // peList.addAll(peep.getModelTargetConnections()); if (ep.getParent() != null) { EditPartViewer viewer = ep.getViewer(); if (viewer != null) { Map<?, ?> editPartRegistry = viewer.getEditPartRegistry(); if (editPartRegistry != null) { for (PictogramElement childPe : peList) { Object object = editPartRegistry.get(childPe); if (object instanceof EditPart) { EditPart editPart = (EditPart) object; try { editPart.refresh(); } catch (NullPointerException e) { String message = "PictogramElementDelegate.refreshEditPartsForModelChildrenAndSourceConnections():\n editPart.refresh() threw NullPointerException\n editPart: " //$NON-NLS-1$ + editPart; T.racer().error(message, e); }// try }// if }// for }// if }// if }// if }// if } /* * (non-Javadoc) * * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate# * refreshFigureForEditPart(org.eclipse.gef.EditPart) */ @Override public void refreshFigureForEditPart() { // DR: Avoid multiple refresh of the same edit part if (!isForceRefresh() && getEditor().isMultipleRefreshSupressionActive()) { if (!getEditor().getRefreshPerformanceCache().shouldRefresh(getContainerEditPart())) { return; } } PictogramElement pe = getPictogramElement(); if (!GraphitiInternal.getEmfService().isObjectAlive(pe)) { return; } if (pe instanceof org.eclipse.graphiti.mm.pictograms.Shape) { if (isRefreshPossible(pe)) { refreshFigureForPictogramElement(pe); } else { EditPart parentEp = getContainerEditPart().getParent(); if (parentEp instanceof IShapeEditPart) { elementFigureHash.clear(); IShapeEditPart parent = (IShapeEditPart) parentEp; parent.deleteChildAndRefresh(getContainerEditPart()); setValid(false); // invalidate current delegate } } } else if (pe instanceof Connection) { Connection connection = (Connection) pe; if (!isConnectionRefreshPossible(connection)) { // if refresh is not possible -> reset figure-tree IFigure figure = getFigureForGraphicsAlgorithm(connection.getGraphicsAlgorithm()); elementFigureHash.clear(); // clean passive decorators if (figure instanceof GFPolylineConnection) { GFPolylineConnection c = (GFPolylineConnection) figure; c.removeAllDecorations(); } addGraphicsAlgorithmForFigure(figure, connection.getGraphicsAlgorithm()); // create passive decorators createFiguresForPassiveDecorators(connection); } refreshFigureForPictogramElement(pe); } else if (pe instanceof Anchor) { refreshFigureForPictogramElement(pe); } } /** * Gets the edit part which holds the instance of this delegate. * * @return the container edit part */ protected EditPart getContainerEditPart() { return containerEditPart; } /** * Sets the edit part which holds the instance of this delegate. * * @param containerEditPart * the new container edit part */ protected void setContainerEditPart(EditPart containerEditPart) { this.containerEditPart = containerEditPart; } /** * Check if update needed. * * @param pe * the pe * @return the i reason */ IReason checkIfUpdateNeeded(PictogramElement pe) { IReason ret = Reason.createFalseReason(); IFeatureProvider featureProvider = getConfigurationProvider().getFeatureProvider(); IUpdateContext updateCtx = new UpdateContext(pe); IUpdateFeature updateFeature = featureProvider.getUpdateFeature(updateCtx); if (updateFeature != null) { ret = updateFeature.updateNeeded(updateCtx); } if (getPreferences().isRecursiveCheckForUpdateActive()) { // check children as well if (!ret.toBoolean()) { Collection<PictogramElement> peChildren = Graphiti.getPeService().getPictogramElementChildren(pe); for (PictogramElement peChild : peChildren) { ret = checkIfUpdateNeeded(peChild); if (ret.toBoolean()) { break; } } } } if (T.racer().info()) { T.racer().info("returns " + ret.toString()); //$NON-NLS-1$ } return ret; } /** * Refresh figure for graphics algorithm. * * @param graphicsAlgorithm * the graphics algorithm * @param pe * The pictogram-element to which the graphics-algorithm (or the * parent-ga) belongs * @param updateNeeded * the update needed */ void refreshFigureForGraphicsAlgorithm(final GraphicsAlgorithm graphicsAlgorithm, final PictogramElement pe, IReason updateNeeded) { if (graphicsAlgorithm == null || pe == null) { return; } final IFigure figure = getFigureForGraphicsAlgorithm(graphicsAlgorithm); if (figure == null) { return; } if (!isForceRefresh() && getEditor().isMultipleRefreshSupressionActive()) { if (!getEditor().getRefreshPerformanceCache().shouldRefresh(graphicsAlgorithm)) { return; } } // figure.getChildren().removeAll(figure.getChildren()); //? // refresh common figure data figure.setOpaque(true); figure.setVisible(pe.isVisible()); // check whether the edit part is a connection edit part and the edit // part is selected // if yes, refresh of colors and shape style is not necessary boolean selectedConnection = false; if (getContainerEditPart() instanceof ConnectionEditPart) { int selectedState = getContainerEditPart().getSelected(); if (selectedState == EditPart.SELECTED_PRIMARY || selectedState == EditPart.SELECTED) { selectedConnection = true; } } // refresh figure colors if (selectedConnection) { Color bg = DataTypeTransformation.toSwtColor(getConfigurationProvider(), Graphiti.getGaService() .getBackgroundColor(graphicsAlgorithm, true)); figure.setBackgroundColor(bg); } else { refreshFigureColors(figure, graphicsAlgorithm); } // refresh specific figure-data if (graphicsAlgorithm instanceof Ellipse && (figure instanceof org.eclipse.draw2d.Ellipse || figure instanceof GFEllipse || figure instanceof GFEllipseDecoration)) { Shape f = (Shape) figure; refreshShapeData(f, graphicsAlgorithm); } else if (graphicsAlgorithm instanceof Polygon && (figure instanceof org.eclipse.draw2d.Polygon || figure instanceof GFPolygon || figure instanceof GFPolygonDecoration)) { Polygon polygon = (Polygon) graphicsAlgorithm; ILocation polygonLocation = new LocationImpl(polygon.getX(), polygon.getY()); PointList pointList = toAbsoluteDraw2dPoints(polygon.getPoints(), polygonLocation); if (figure instanceof GFPolygonDecoration) { GFPolygonDecoration p = (GFPolygonDecoration) figure; p.setSpecificBezierDistances(getBezierDistances(polygon.getPoints())); p.setDecoratorTemplate(pointList); } else if (figure instanceof GFPolygon) { GFPolygon p = (GFPolygon) figure; p.setSpecificBezierDistances(getBezierDistances(polygon.getPoints())); p.setPoints(pointList); } if (!selectedConnection) { refreshShapeData((org.eclipse.draw2d.Shape) figure, graphicsAlgorithm); } } else if (graphicsAlgorithm instanceof Polyline && (figure instanceof org.eclipse.draw2d.Polyline || figure instanceof GFPolyline || figure instanceof GFPolylineDecoration)) { // if figure is a PolylineConnection then just a refreshShapeData is // necessary Polyline polyline = (Polyline) graphicsAlgorithm; ILocation polylineLocation = new LocationImpl(polyline.getX(), polyline.getY()); PointList pointList = toAbsoluteDraw2dPoints(polyline.getPoints(), polylineLocation); if (figure instanceof GFPolylineConnection) { if (!isDefaultBendPointRenderingActive() && (pe instanceof FreeFormConnection)) { FreeFormConnection ffc = (FreeFormConnection) pe; GFPolylineConnection p = (GFPolylineConnection) figure; int[] bendpointBezierDistances = getBezierDistances(ffc.getBendpoints()); // add default bendpoints for start and end int[] allPointsBezierDistances = new int[bendpointBezierDistances.length + 4]; allPointsBezierDistances[0] = 0; allPointsBezierDistances[1] = 0; for (int i = 0; i < bendpointBezierDistances.length; i++) { allPointsBezierDistances[i + 2] = bendpointBezierDistances[i]; } allPointsBezierDistances[allPointsBezierDistances.length - 2] = 0; allPointsBezierDistances[allPointsBezierDistances.length - 1] = 0; p.setSpecificBezierDistances(allPointsBezierDistances); } } else if (figure instanceof GFPolylineDecoration) { GFPolylineDecoration p = (GFPolylineDecoration) figure; p.setSpecificBezierDistances(getBezierDistances(polyline.getPoints())); p.setDecoratorTemplate(pointList); } else if (figure instanceof GFPolyline) { GFPolyline p = (GFPolyline) figure; p.setSpecificBezierDistances(getBezierDistances(polyline.getPoints())); p.setPoints(pointList); } if (!selectedConnection) { refreshShapeData((org.eclipse.draw2d.Shape) figure, graphicsAlgorithm); } } else if (graphicsAlgorithm instanceof Rectangle && figure instanceof GFRectangleFigure) { GFRectangleFigure f = (GFRectangleFigure) figure; refreshShapeData(f, graphicsAlgorithm); } else if (graphicsAlgorithm instanceof RoundedRectangle) { if (figure instanceof GFRoundedRectangle) { GFRoundedRectangle f = (GFRoundedRectangle) figure; refreshShapeData(f, graphicsAlgorithm); RoundedRectangle rr = (RoundedRectangle) graphicsAlgorithm; Dimension dimension = new Dimension(rr.getCornerWidth(), rr.getCornerHeight()); f.setCornerDimensions(dimension); } } else if (graphicsAlgorithm instanceof MultiText && figure instanceof GFMultilineText) { MultiText text = (MultiText) graphicsAlgorithm; GFMultilineText label = (GFMultilineText) figure; label.setText(text.getValue()); refreshFlowTextAlignment(label, text); refreshFont(text, label); label.setOpaque(Graphiti.getGaService().isFilled(text, true)); label.setRequestFocusEnabled(false); label.invalidateTree(); } else if (graphicsAlgorithm instanceof Text && figure instanceof GFText) { Text text = (Text) graphicsAlgorithm; GFText label = (GFText) figure; label.setText(text.getValue()); refreshTextOrientation(label, text); refreshFont(text, label); label.setOpaque(Graphiti.getGaService().isFilled(text, true)); label.setRequestFocusEnabled(false); } else if (graphicsAlgorithm instanceof Image && figure instanceof ImageFigure) { ImageFigure imageFigure = (ImageFigure) figure; Image pictogramImage = (Image) graphicsAlgorithm; org.eclipse.swt.graphics.Image image = GraphitiUi.getImageService().getImageForId(pictogramImage.getId()); imageFigure.setImage(image); imageFigure.setAlignment(PositionConstants.CENTER); imageFigure.setOpaque(false); } // set location and size of figure setFigureConstraint(figure, graphicsAlgorithm, pe); // refresh child GAs Collection<GraphicsAlgorithm> graphicsAlgorithmChildren = graphicsAlgorithm.getGraphicsAlgorithmChildren(); for (Iterator<GraphicsAlgorithm> iter = graphicsAlgorithmChildren.iterator(); iter.hasNext();) { GraphicsAlgorithm childGA = iter.next(); refreshFigureForGraphicsAlgorithm(childGA, pe, Reason.createFalseReason()); } IDiagramTypeProvider diagramTypeProvider = getConfigurationProvider().getDiagramTypeProvider(); IToolBehaviorProvider toolBehaviorProvider = diagramTypeProvider.getCurrentToolBehaviorProvider(); // decorators addDecorators(graphicsAlgorithm, pe, figure, toolBehaviorProvider); GraphicsAlgorithm selectionGraphicsAlgorithm = toolBehaviorProvider.getSelectionBorder(pe); IFigure selectionFigure = getFigureForGraphicsAlgorithm(selectionGraphicsAlgorithm); if (selectionFigure == null) { // Retreat to graphiti behavior. selectionFigure = figure; } // Create a tooltip label Label tooltipLabel = null; // First check the need for an update needed tooltip Label indicateUpdateNeedeTooltipLabel = null; if (selectionFigure != null) { // Indicate needed updates on selectionFigure (using figure would // cause problems with invisible rectangles) indicateUpdateNeedeTooltipLabel = indicateNeededUpdates(selectionFigure, updateNeeded); } // Use the update needed tooltip in case it exists... if (indicateUpdateNeedeTooltipLabel != null) { // Use update needed tooltip in any case (tool provided tooltip // would be probably invalid) tooltipLabel = indicateUpdateNeedeTooltipLabel; } else { // ... if not get the tool provided tooltip (for performance reasons // only called in case no update needed tooltip exists) String toolTip = toolBehaviorProvider.getToolTip(graphicsAlgorithm); - if (toolTip != null && !toolTip.isEmpty()) { + if (toolTip != null && !(toolTip.length() == 0)) { // null or empty string means no tooltip wanted tooltipLabel = new Label(toolTip); } } // Set the tooltip in any case, especially also when it's null to clean // up a previously set tooltip (see Bugzilla 348662) figure.setToolTip(tooltipLabel); } private void refreshFont(AbstractText text, Figure label) { if (text == null || label == null) { return; } // if valid font-information exists in the pictogram-model, then // create/change swt-font of label org.eclipse.graphiti.mm.algorithms.styles.Font font = Graphiti.getGaService().getFont(text, true); if (font != null && font.getName() != null) { Font currentSwtFont = label.getFont(); if (currentSwtFont == null || currentSwtFont.isDisposed()) { Font newSwtFont = DataTypeTransformation.toSwtFont(font); fontList.add(newSwtFont); label.setFont(newSwtFont); } else { Font newSwtFont = DataTypeTransformation.syncToSwtFont(font, currentSwtFont); if (newSwtFont != currentSwtFont) { fontList.add(newSwtFont); label.setFont(newSwtFont); boolean wasInList = fontList.remove(currentSwtFont); if (wasInList) { currentSwtFont.dispose(); } } } } } private void addGraphicsAlgorithmForFigure(IFigure figure, GraphicsAlgorithm graphicsAlgorithm) { if (figure != null && graphicsAlgorithm != null) { elementFigureHash.put(graphicsAlgorithm, figure); } } private ILocation calculatePolylineLocation(Polyline polyline) { Collection<org.eclipse.graphiti.mm.algorithms.styles.Point> points = polyline.getPoints(); int minX = points.isEmpty() ? 0 : ((org.eclipse.graphiti.mm.algorithms.styles.Point) points.toArray()[0]) .getX(); int minY = points.isEmpty() ? 0 : ((org.eclipse.graphiti.mm.algorithms.styles.Point) points.toArray()[0]) .getY(); for (Iterator<org.eclipse.graphiti.mm.algorithms.styles.Point> iter = points.iterator(); iter.hasNext();) { org.eclipse.graphiti.mm.algorithms.styles.Point point = iter.next(); int x = point.getX(); int y = point.getY(); minX = Math.min(minX, x); minY = Math.min(minY, y); } int locX = polyline.getX(); int locY = polyline.getY(); return new LocationImpl(minX + locX, minY + locY); } /** * @param graphicsAlgorithm * @return TRUE, if a figure exists for the ga and for all child-ga's */ private boolean checkGA(GraphicsAlgorithm graphicsAlgorithm) { if (graphicsAlgorithm != null && GraphitiInternal.getEmfService().isObjectAlive(graphicsAlgorithm)) { IFigure ret = getFigureForGraphicsAlgorithm(graphicsAlgorithm); if (ret == null) { return false; } Collection<GraphicsAlgorithm> children = graphicsAlgorithm.getGraphicsAlgorithmChildren(); for (Iterator<GraphicsAlgorithm> iter = children.iterator(); iter.hasNext();) { GraphicsAlgorithm childGraphicsAlgorithm = iter.next(); if (!checkGA(childGraphicsAlgorithm)) { return false; } } } return true; } /** * returns TRUE, if a figure exists for each ga */ private boolean checkGAs(org.eclipse.graphiti.mm.pictograms.Shape shape) { if (!GraphitiInternal.getEmfService().isObjectAlive(shape)) return false; GraphicsAlgorithm graphicsAlgorithm = shape.getGraphicsAlgorithm(); if (!checkGA(graphicsAlgorithm)) { return false; } if (shape instanceof ContainerShape) { ContainerShape containerShape = (ContainerShape) shape; List<org.eclipse.graphiti.mm.pictograms.Shape> children = containerShape.getChildren(); for (org.eclipse.graphiti.mm.pictograms.Shape childShape : children) { if (!childShape.isActive()) { if (!checkGAs(childShape)) { return false; } } } } return true; } private IFigure createFigureForGraphicsAlgorithm(PictogramElement pe, GraphicsAlgorithm graphicsAlgorithm) { return createFigureForGraphicsAlgorithm(pe, graphicsAlgorithm, false); } /** * @param graphicsAlgorithm * @return */ private IFigure createFigureForGraphicsAlgorithm(PictogramElement pe, GraphicsAlgorithm graphicsAlgorithm, boolean specialSelectionHandlingForOuterGaFigures) { IFigure ret = null; if (graphicsAlgorithm != null) { if (pe instanceof Connection) { // special for connections ret = new GFPolylineConnection(this, graphicsAlgorithm); } else if (graphicsAlgorithm instanceof Ellipse) { if (pe instanceof ConnectionDecorator && !pe.isActive()) { ret = new GFEllipseDecoration(this, graphicsAlgorithm); } else { ret = new GFEllipse(this, graphicsAlgorithm); } } else if (graphicsAlgorithm instanceof Polygon) { // if graphics-algorithm belongs to an inactive decorator-shape // use special polygon if (pe instanceof ConnectionDecorator && !pe.isActive()) { ret = new GFPolygonDecoration(this, graphicsAlgorithm); } else { ret = new GFPolygon(this, graphicsAlgorithm); } } else if (graphicsAlgorithm instanceof Polyline) { // if graphics-algorithm belongs to an inactive decorator-shape // use special polygon if (pe instanceof ConnectionDecorator && !pe.isActive()) { ret = new GFPolylineDecoration(this, graphicsAlgorithm); } else { ret = new GFPolyline(this, graphicsAlgorithm); } } else if (graphicsAlgorithm instanceof Rectangle) { ret = new GFRectangleFigure(this, graphicsAlgorithm); } else if (graphicsAlgorithm instanceof RoundedRectangle) { ret = new GFRoundedRectangle(this, graphicsAlgorithm); } else if (graphicsAlgorithm instanceof MultiText) { ret = new GFMultilineText(); } else if (graphicsAlgorithm instanceof Text) { ret = new GFText(this, graphicsAlgorithm); } else if (graphicsAlgorithm instanceof PlatformGraphicsAlgorithm) { PlatformGraphicsAlgorithm pga = (PlatformGraphicsAlgorithm) graphicsAlgorithm; IGraphicsAlgorithmRendererFactory factory = getGraphicsAlgorithmRendererFactory(); if (factory != null) { IRendererContext rendererContext = new RendererContext(pga, getConfigurationProvider() .getDiagramTypeProvider()); IGraphicsAlgorithmRenderer pr = factory.createGraphicsAlgorithmRenderer(rendererContext); if (pr instanceof IFigure) { ret = (IFigure) pr; } } } else if (graphicsAlgorithm instanceof Image) { ret = new GFImageFigure(graphicsAlgorithm); } if (ret != null) { if (graphicsAlgorithm.getGraphicsAlgorithmChildren().size() > 0) { ret.setLayoutManager(new XYLayout()); } addGraphicsAlgorithmForFigure(ret, graphicsAlgorithm); List<GraphicsAlgorithm> graphicsAlgorithmChildren = graphicsAlgorithm.getGraphicsAlgorithmChildren(); for (GraphicsAlgorithm childGa : graphicsAlgorithmChildren) { ret.add(createFigureForGraphicsAlgorithm(null, childGa)); } } } if (specialSelectionHandlingForOuterGaFigures) { if (ret instanceof GFAbstractShape) { GFAbstractShape gfAbstractShape = (GFAbstractShape) ret; IToolBehaviorProvider currentToolBehaviorProvider = getConfigurationProvider().getDiagramTypeProvider() .getCurrentToolBehaviorProvider(); gfAbstractShape.setSelectionBorder(currentToolBehaviorProvider .getSelectionBorder(getPictogramElement())); gfAbstractShape.setClickArea(currentToolBehaviorProvider.getClickArea(getPictogramElement())); } } return ret; } private IFigure createFigureForPictogramElement(final PictogramElement pe) { GraphicsAlgorithm graphicsAlgorithm = pe.getGraphicsAlgorithm(); IFigure ret = createFigureForGraphicsAlgorithm(pe, graphicsAlgorithm, pe.isActive()); if (ret == null) { return ret; } // _directEditPerformer = new // DirectEditPerformer(getConfigurationProvider(), this, _labels, // attributes); if (pe instanceof ContainerShape) { ret.setLayoutManager(new XYLayout()); ContainerShape containerShape = (ContainerShape) pe; List<org.eclipse.graphiti.mm.pictograms.Shape> containersChildren = containerShape.getChildren(); for (org.eclipse.graphiti.mm.pictograms.Shape shape : containersChildren) { if (!shape.isActive()) { IFigure f = createFigureForPictogramElement(shape); ret.add(f); } } } else if (pe instanceof Connection) { createFiguresForPassiveDecorators((Connection) pe); } return ret; } private void createFiguresForPassiveDecorators(Connection connection) { IFigure figure = getFigureForGraphicsAlgorithm(connection.getGraphicsAlgorithm()); if (figure instanceof GFPolylineConnection) { GFPolylineConnection polylineConnection = (GFPolylineConnection) figure; Collection<ConnectionDecorator> c = connection.getConnectionDecorators(); for (ConnectionDecorator connectionDecorator : c) { if (!connectionDecorator.isActive()) { GraphicsAlgorithm graphicsAlgorithm = connectionDecorator.getGraphicsAlgorithm(); IFigure newFigure = createFigureForGraphicsAlgorithm(connectionDecorator, graphicsAlgorithm); RotatableDecoration rotatableDecoration = null; if (newFigure instanceof RotatableDecoration) { rotatableDecoration = (RotatableDecoration) newFigure; } if (connectionDecorator.isLocationRelative()) { double relativeLocation = connectionDecorator.getLocation(); // TODO: change metamodel to get rid of special handling // for backward compability if (relativeLocation != 1) { polylineConnection.addDecoration(rotatableDecoration, true, relativeLocation, 0, 0); } else { polylineConnection.addDecoration(rotatableDecoration, false, 0.0, 0, 0); } } } } } } private IFigure decorateFigure(final IFigure figure, final IDecorator decorator) { String messageText = decorator.getMessage(); IFigure decoratorFigure = null; org.eclipse.draw2d.geometry.Rectangle boundsForDecoratorFigure = new org.eclipse.draw2d.geometry.Rectangle(0, 0, 16, 16); if (decorator instanceof IImageDecorator) { IImageDecorator imageDecorator = (IImageDecorator) decorator; org.eclipse.swt.graphics.Image imageForId = GraphitiUi.getImageService().getImageForId( imageDecorator.getImageId()); ImageFigure imageFigure = new DecoratorImageFigure(imageForId); decoratorFigure = imageFigure; org.eclipse.swt.graphics.Rectangle imageBounds = imageFigure.getImage().getBounds(); boundsForDecoratorFigure.setSize(imageBounds.width, imageBounds.height); } if (decoratorFigure != null) { if (decorator instanceof ILocation) { ILocation location = (ILocation) decorator; boundsForDecoratorFigure.setLocation(location.getX(), location.getY()); } decoratorFigure.setVisible(true); if (messageText != null && messageText.length() > 0) { decoratorFigure.setToolTip(new Label(messageText)); } if (figure.getLayoutManager() == null) { figure.setLayoutManager(new XYLayout()); } figure.add(decoratorFigure); figure.setConstraint(decoratorFigure, boundsForDecoratorFigure); } return decoratorFigure; } /* * must be called from the edit-part if this edit-part is de-activated */ private void disposeFonts() { for (Iterator<Font> iter = fontList.iterator(); iter.hasNext();) { Font font = iter.next(); font.dispose(); } } /** * @param figure * @param updateNeeded */ private Label indicateNeededUpdates(IFigure figure, IReason updateNeeded) { Label ret = null; if (figure != null && updateNeeded != null && updateNeeded.toBoolean()) { // The figure needs an update, we indicate that with a red border // and a tooltip showing the reason for the update figure.setForegroundColor(ColorConstants.red); if (figure instanceof Shape) { Shape draw2dShape = (Shape) figure; draw2dShape.setLineWidth(2); draw2dShape.setLineStyle(Graphics.LINE_DOT); String updateNeededText = updateNeeded.getText(); if (updateNeededText != null && updateNeededText.length() > 0) { Label toolTipFigure = new Label(); toolTipFigure.setText(updateNeededText); org.eclipse.swt.graphics.Image image = PlatformUI.getWorkbench().getSharedImages() .getImage(ISharedImages.IMG_OBJS_WARN_TSK); toolTipFigure.setIcon(image); ret = toolTipFigure; } } } return ret; } /** * returns TRUE if structure of connection-model (connection,passive * decorators and ga's) are in sync with the current figure-tree */ private boolean isConnectionRefreshPossible(Connection connection) { if (!GraphitiInternal.getEmfService().isObjectAlive(connection)) { return false; } // compare pictogram-model with figure-tree -> structural changes? List<GraphicsAlgorithm> gaList = new ArrayList<GraphicsAlgorithm>(); Collection<ConnectionDecorator> c = connection.getConnectionDecorators(); for (ConnectionDecorator connectionDecorator : c) { if (!connectionDecorator.isActive()) { GraphicsAlgorithm ga = connectionDecorator.getGraphicsAlgorithm(); if (ga != null) { gaList.add(ga); } } } if (connection.getGraphicsAlgorithm() != null) { gaList.add(connection.getGraphicsAlgorithm()); } // do all ga's have a figure? for (GraphicsAlgorithm graphicsAlgorithm : gaList) { IFigure figure = getFigureForGraphicsAlgorithm(graphicsAlgorithm); if (figure == null) { return false; } } // are there any registered GA, which are not in use? for (GraphicsAlgorithm graphicsAlgorithm : elementFigureHash.keySet()) { if (!gaList.contains(graphicsAlgorithm)) { return false; } } return true; } /** * returns TRUE if structure of pictogram-model (shapes & ga's) are in sync * with the current figure-tree */ private boolean isRefreshPossible(PictogramElement pe) { // compare pictogram-model with figure-tree -> structural changes? if (pe instanceof org.eclipse.graphiti.mm.pictograms.Shape) { boolean ret = checkGAs((org.eclipse.graphiti.mm.pictograms.Shape) pe); if (ret == false) { return ret; } // invalid ga's in hashtable? for (GraphicsAlgorithm graphicsAlgorithm : elementFigureHash.keySet()) { if (!GraphitiInternal.getEmfService().isObjectAlive(graphicsAlgorithm)) { return false; } } } return true; } /** * @param figure * @param graphicsAlgorithm */ private void refreshFigureColors(IFigure figure, GraphicsAlgorithm graphicsAlgorithm) { Color fg = DataTypeTransformation.toSwtColor(getConfigurationProvider(), Graphiti.getGaService() .getForegroundColor(graphicsAlgorithm, true)); Color bg = DataTypeTransformation.toSwtColor(getConfigurationProvider(), Graphiti.getGaService() .getBackgroundColor(graphicsAlgorithm, true)); figure.setBackgroundColor(bg); figure.setForegroundColor(fg); } // private void refreshFigureColors(IFigure figure, GraphicsAlgorithm // graphicsAlgorithm, int redShift) { // if (redShift == 0) { // refreshFigureColors(figure, graphicsAlgorithm); // } else { // Color fg = // toSwtColor(Graphiti.getGaService()Internal.getForegroundColor(graphicsAlgorithm, // true), redShift); // Color bg = // toSwtColor(Graphiti.getGaService()Internal.getBackgroundColor(graphicsAlgorithm, // true), redShift); // figure.setBackgroundColor(bg); // figure.setForegroundColor(fg); // } // } /** * @param figure */ private void refreshFigureForPictogramElement(PictogramElement pe) { if (pe != null) { if (!isForceRefresh() && getEditor().isMultipleRefreshSupressionActive()) { if (!getEditor().getRefreshPerformanceCache().shouldRefresh(pe)) { return; } } if (pe instanceof ContainerShape) { ContainerShape containerShape = (ContainerShape) pe; List<org.eclipse.graphiti.mm.pictograms.Shape> children = containerShape.getChildren(); for (org.eclipse.graphiti.mm.pictograms.Shape shape : children) { if (!shape.isActive()) { refreshFigureForPictogramElement(shape); } } } else if (pe instanceof Connection) { Connection connection = (Connection) pe; Collection<ConnectionDecorator> c = connection.getConnectionDecorators(); for (ConnectionDecorator decorator : c) { if (!decorator.isActive()) { refreshFigureForPictogramElement(decorator); } } } GraphicsAlgorithm ga = pe.getGraphicsAlgorithm(); if (ga != null) { IReason updateNeeded = checkIfUpdateNeeded(pe); refreshFigureForGraphicsAlgorithm(ga, pe, updateNeeded); } } } /** * @param shape * @param graphicsAlgorithm */ private void refreshShapeData(org.eclipse.draw2d.Shape shape, GraphicsAlgorithm graphicsAlgorithm) { if (shape == null || graphicsAlgorithm == null) { return; } // line width int lineWidth = Graphiti.getGaService().getLineWidth(graphicsAlgorithm, true); shape.setLineWidth(lineWidth); // line style LineStyle lineStyle = Graphiti.getGaService().getLineStyle(graphicsAlgorithm, true); int draw2dLineStyle = Graphics.LINE_SOLID; if (lineStyle == LineStyle.DASH) { draw2dLineStyle = Graphics.LINE_DASH; } else if (lineStyle == LineStyle.DASHDOT) { draw2dLineStyle = Graphics.LINE_DASHDOT; } else if (lineStyle == LineStyle.DASHDOTDOT) { draw2dLineStyle = Graphics.LINE_DASHDOTDOT; } else if (lineStyle == LineStyle.DOT) { draw2dLineStyle = Graphics.LINE_DOT; } else if (lineStyle == LineStyle.SOLID) { draw2dLineStyle = Graphics.LINE_SOLID; } shape.setLineStyle(draw2dLineStyle); // fill? final boolean filled = Graphiti.getGaService().isFilled(graphicsAlgorithm, true); shape.setFill(filled); // outline? final boolean lineVisible = Graphiti.getGaService().isLineVisible(graphicsAlgorithm, true); shape.setOutline(lineVisible); } private void refreshTextOrientation(GFText label, Text text) { int draw2dOrientation = PositionConstants.LEFT; Orientation orientation = Graphiti.getGaService().getHorizontalAlignment(text, true); if (orientation != null) { if (orientation == Orientation.ALIGNMENT_BOTTOM) { draw2dOrientation = PositionConstants.BOTTOM; } else if (orientation == Orientation.ALIGNMENT_CENTER) { draw2dOrientation = PositionConstants.CENTER; } else if (orientation == Orientation.ALIGNMENT_LEFT) { draw2dOrientation = PositionConstants.LEFT; } else if (orientation == Orientation.ALIGNMENT_RIGHT) { draw2dOrientation = PositionConstants.RIGHT; } else if (orientation == Orientation.ALIGNMENT_TOP) { draw2dOrientation = PositionConstants.TOP; } } label.setLabelAlignment(draw2dOrientation); } private void refreshFlowTextAlignment(GFMultilineText label, MultiText text) { int draw2dOrientation = PositionConstants.LEFT; Orientation orientation = Graphiti.getGaService().getHorizontalAlignment(text, true); if (orientation != null) { if (orientation == Orientation.ALIGNMENT_RIGHT) { draw2dOrientation = PositionConstants.RIGHT; } else if (orientation == Orientation.ALIGNMENT_CENTER) { draw2dOrientation = PositionConstants.CENTER; } } label.setHorizontalAligment(draw2dOrientation); draw2dOrientation = PositionConstants.TOP; orientation = Graphiti.getGaService().getVerticalAlignment(text, true); if (orientation != null) { if (orientation == Orientation.ALIGNMENT_BOTTOM) { draw2dOrientation = PositionConstants.BOTTOM; } else if (orientation == Orientation.ALIGNMENT_CENTER) { draw2dOrientation = PositionConstants.MIDDLE; } } label.setVerticalAligment(draw2dOrientation); } // private void // registerBusinessChangeListenersForPictogramElement(PictogramElement pe) { // if (businessChangeListeners != null) { // return; // throw new IllegalStateException("Listeners already // // registered"); // } // EventRegistry eventRegistry = getEventRegistry(); // if (eventRegistry != null) { // IFeatureProvider featureProvider = // getConfigurationProvider().getDiagramTypeProvider().getFeatureProvider(); // if (featureProvider != null) { // Object[] businessObjects = // featureProvider.getAllBusinessObjectsForPictogramElement(pe); // // int boCount = businessObjects.length; // businessChangeListeners = new BusinessChangeListener[boCount]; // for (int i = 0; i < boCount; i++) { // Object bo = businessObjects[i]; // if (bo instanceof EObject) { // EObject rbo = (EObject) bo; // EventFilter filter = new CompositionHierarchyFilter(rbo); // businessChangeListeners[i] = new BusinessChangeListener(); // eventRegistry.registerUpdateListener(businessChangeListeners[i], filter); // // register a partition change listener as well // if (bo instanceof Partitionable) { // Partitionable partitionlable = (Partitionable) bo; // ModelPartition partition = partitionlable.get___Partition(); // eventRegistry.registerUpdateListener(businessChangeListeners[i], new // AndFilter(new EventTypeFilter( // PartitionChangeEvent.class), new PartitionFilter(partition))); // } // } // } // } // } // } /** * @param configurationProvider * The configurationProvider to set. */ private void setConfigurationProvider(IConfigurationProvider configurationProvider) { this.configurationProvider = configurationProvider; } private void setFigureConstraint(IFigure figure, GraphicsAlgorithm graphicsAlgorithm, PictogramElement pe) { // PolylineConnection's and RotatableDecoration's will be handled by the // gef-framework if ((figure instanceof PolylineConnection) || figure instanceof GFPolylineConnection || (figure instanceof RotatableDecoration) || figure.getParent() == null) { return; } IDimension gaSize = Graphiti.getGaService().calculateSize(graphicsAlgorithm); if (gaSize == null) { return; } Dimension dimension = new Dimension(gaSize.getWidth(), gaSize.getHeight()); ILocation gaLocation = null; if (!(graphicsAlgorithm instanceof Polyline)) { gaLocation = new LocationImpl(graphicsAlgorithm.getX(), graphicsAlgorithm.getY()); } else { gaLocation = calculatePolylineLocation((Polyline) graphicsAlgorithm); } if (gaLocation == null) { gaLocation = new LocationImpl(0, 0); } Point point = null; if (pe instanceof ConnectionDecorator && pe.isActive()) { // get relative point on connection-figure ConnectionDecorator connectionDecorator = (ConnectionDecorator) pe; Connection connection = connectionDecorator.getConnection(); Point pointAt = null; double decoratorLocation = connectionDecorator.getLocation(); if (connectionDecorator.isLocationRelative()) { pointAt = GraphitiUiInternal.getGefService().getConnectionPointAt(connection, decoratorLocation); } else { // location is absolute pointAt = GraphitiUiInternal.getGefService() .getAbsolutePointOnConnection(connection, decoratorLocation); } if (pointAt == null) { return; } point = new Point(pointAt.x + gaLocation.getX(), pointAt.y + gaLocation.getY()); // all decorator-shapes get the the dimension of the text which they // contain // TODO fix this hack; later the features are responsibles for // providing the correct size if (figure instanceof Label && connectionDecorator.getGraphicsAlgorithm() instanceof Text) { Label label = (Label) figure; if (label.getText() != null && label.getText().length() > 0) { // if text was not set, getTextBounds() does not work // correct dimension = label.getTextBounds().getSize(); // WORKAROUND: // We had the problem, that the text-width was sometimes too // small // (depending on the zoom-level, text or installation?!) // As an easy fix, we add one pixel per character dimension.width += label.getText().length(); } } } else if (pe instanceof BoxRelativeAnchor) { BoxRelativeAnchor bra = (BoxRelativeAnchor) pe; IRectangle gaBoundsForAnchor = Graphiti.getLayoutService().getGaBoundsForAnchor(bra); double newX = gaBoundsForAnchor.getX() + (gaBoundsForAnchor.getWidth() * bra.getRelativeWidth()) + gaLocation.getX(); double newY = gaBoundsForAnchor.getY() + (gaBoundsForAnchor.getHeight() * bra.getRelativeHeight()) + gaLocation.getY(); point = new PrecisionPoint(newX, newY); } else if (pe instanceof FixPointAnchor && pe.equals(graphicsAlgorithm.getPictogramElement())) { FixPointAnchor fpa = (FixPointAnchor) pe; IRectangle gaBoundsForAnchor = Graphiti.getLayoutService().getGaBoundsForAnchor(fpa); org.eclipse.graphiti.mm.algorithms.styles.Point fpaLocation = fpa.getLocation(); if (fpaLocation == null) { return; } point = new Point(gaBoundsForAnchor.getX() + fpaLocation.getX() + gaLocation.getX(), gaBoundsForAnchor.getY() + fpaLocation.getY() + gaLocation.getY()); } else { point = new Point(gaLocation.getX(), gaLocation.getY()); } if (point != null) { IFigure parent = figure.getParent(); if (parent != null) { parent.setConstraint(figure, new org.eclipse.draw2d.geometry.Rectangle(point, dimension)); } } } /** * @param pictogramElement * The pictogramElement to set. */ private void setPictogramElement(PictogramElement pictogramElement) { this.pictogramElement = pictogramElement; } private PointList toAbsoluteDraw2dPoints(Collection<org.eclipse.graphiti.mm.algorithms.styles.Point> points, ILocation location) { int deltaX = 0; int deltaY = 0; if (location != null) { deltaX = location.getX(); deltaY = location.getY(); } PointList pointList = new PointList(); for (org.eclipse.graphiti.mm.algorithms.styles.Point dtp : points) { pointList.addPoint(dtp.getX() + deltaX, dtp.getY() + deltaY); } return pointList; } /** * Returns the bezier-distances (distance-before and distance-after), which * are calculated from the radius of the given points. * * @param points * The points, for which to return the bezier-distances. * * @return The bezier-distances (distance-before and distance-after), which * are calculated from the radius of the given points. */ private int[] getBezierDistances(Collection<org.eclipse.graphiti.mm.algorithms.styles.Point> points) { if (getPreferences().getPolylineRounding() == 0 || getPreferences().getPolylineRounding() == 2) { int i = 0; int bezierDistances[] = new int[points.size() * 2]; for (org.eclipse.graphiti.mm.algorithms.styles.Point dtp : points) { if (getPreferences().getPolylineRounding() == 0) { // rounding // on bezierDistances[i++] = dtp.getBefore(); // bezierDistancesBefore bezierDistances[i++] = dtp.getAfter(); // bezierDistancesAfter } else if (getPreferences().getPolylineRounding() == 2) { // rounding // always bezierDistances[i++] = 15; // bezierDistancesBefore bezierDistances[i++] = 15; // bezierDistancesAfter } } return bezierDistances; } return null; // rounding off } private IGraphicsAlgorithmRendererFactory getGraphicsAlgorithmRendererFactory() { return getConfigurationProvider().getDiagramTypeProvider().getGraphicsAlgorithmRendererFactory(); } /* * (non-Javadoc) * * @see * org.eclipse.graphiti.features.IFeatureProviderHolder#getFeatureProvider() */ @Override public IFeatureProvider getFeatureProvider() { IConfigurationProvider cp = getConfigurationProvider(); IFeatureProvider ret = null; if (cp != null) { ret = cp.getFeatureProvider(); } if (T.racer().info()) { T.racer().info("PictogramElementDelegate", "getFeatureProvider", "returns " + ret.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } return ret; } @Override public void setForceRefresh(boolean forceRefresh) { this.forceRefresh = forceRefresh; } protected boolean isForceRefresh() { return forceRefresh; } private DiagramEditorInternal getEditor() { return getConfigurationProvider().getDiagramEditor(); } protected void addDecorators(final GraphicsAlgorithm graphicsAlgorithm, final PictogramElement pe, final IFigure figure, IToolBehaviorProvider toolBehaviorProvider) { if (pe.isActive() && !(pe instanceof Anchor) && !(pe instanceof Connection) && graphicsAlgorithm.equals(pe.getGraphicsAlgorithm())) { List<IFigure> decFigureList = decoratorMap.get(figure); if (decFigureList != null) { for (IFigure decFigure : decFigureList) { IFigure parent = decFigure.getParent(); if (parent != null && figure.equals(parent)) { figure.remove(decFigure); } } decFigureList.clear(); decoratorMap.remove(figure); } IDecorator[] decorators = toolBehaviorProvider.getDecorators(pe); if (decorators.length > 0) { List<IFigure> decList = new ArrayList<IFigure>(); decoratorMap.put(figure, decList); for (int i = 0; i < decorators.length; i++) { IDecorator decorator = decorators[i]; IFigure decorateFigure = decorateFigure(figure, decorator); decList.add(decorateFigure); } } } } @Override public boolean isValid() { return valid; } protected void setValid(boolean valid) { this.valid = valid; } /** * Returns the visual state of this shape. * * @return The visual state of this shape. */ @Override public IVisualState getVisualState() { if (visualState == null) { visualState = new VisualState(); } return visualState; } private boolean isDefaultBendPointRenderingActive() { boolean defaultBendPointRenderingActive = true; IToolBehaviorProvider ctbp = getConfigurationProvider().getDiagramTypeProvider() .getCurrentToolBehaviorProvider(); if (ctbp instanceof DefaultToolBehaviorProvider) { defaultBendPointRenderingActive = ((DefaultToolBehaviorProvider) ctbp).isDefaultBendPointRenderingActive(); } return defaultBendPointRenderingActive; } @Override public List<IFigure> getMainFiguresFromChildEditparts() { List<IFigure> ret = new ArrayList<IFigure>(); List<EditPart> children = GraphitiUiInternal.getGefService().getEditPartChildren(getContainerEditPart()); for (EditPart ep : children) { if (ep instanceof ShapeEditPart || ep instanceof AnchorEditPart) { GraphicalEditPart gep = (GraphicalEditPart) ep; ret.add(gep.getFigure()); } } return ret; } protected GFPreferences getPreferences() { return GFPreferences.getInstance(); } } diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java index 34b62d4a..80feff76 100644 --- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java +++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java @@ -1,734 +1,734 @@ /******************************************************************************* * <copyright> * * Copyright (c) 2005, 2011 SAP AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * SAP AG - initial API, implementation and documentation * mwenz - Bug 340627 - Features should be able to indicate cancellation * mwenz - Bug 356218 - Added hasDoneChanges updates to update diagram feature * and called features via editor command stack to check it * * </copyright> * *******************************************************************************/ package org.eclipse.graphiti.features.impl; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; import org.eclipse.core.runtime.Assert; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.graphiti.dt.IDiagramTypeProvider; import org.eclipse.graphiti.features.IAddBendpointFeature; import org.eclipse.graphiti.features.IAddFeature; import org.eclipse.graphiti.features.ICreateConnectionFeature; import org.eclipse.graphiti.features.ICreateFeature; import org.eclipse.graphiti.features.IDeleteFeature; import org.eclipse.graphiti.features.IDirectEditingFeature; import org.eclipse.graphiti.features.IDirectEditingInfo; import org.eclipse.graphiti.features.IFeature; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.ILayoutFeature; import org.eclipse.graphiti.features.IMoveAnchorFeature; import org.eclipse.graphiti.features.IMoveBendpointFeature; import org.eclipse.graphiti.features.IMoveConnectionDecoratorFeature; import org.eclipse.graphiti.features.IMoveShapeFeature; import org.eclipse.graphiti.features.IPrintFeature; import org.eclipse.graphiti.features.IReason; import org.eclipse.graphiti.features.IReconnectionFeature; import org.eclipse.graphiti.features.IRemoveBendpointFeature; import org.eclipse.graphiti.features.IRemoveFeature; import org.eclipse.graphiti.features.IResizeShapeFeature; import org.eclipse.graphiti.features.ISaveImageFeature; import org.eclipse.graphiti.features.IUpdateFeature; import org.eclipse.graphiti.features.context.IAddBendpointContext; import org.eclipse.graphiti.features.context.IAddContext; import org.eclipse.graphiti.features.context.ICustomContext; import org.eclipse.graphiti.features.context.IDeleteContext; import org.eclipse.graphiti.features.context.IDirectEditingContext; import org.eclipse.graphiti.features.context.ILayoutContext; import org.eclipse.graphiti.features.context.IMoveAnchorContext; import org.eclipse.graphiti.features.context.IMoveBendpointContext; import org.eclipse.graphiti.features.context.IMoveConnectionDecoratorContext; import org.eclipse.graphiti.features.context.IMoveShapeContext; import org.eclipse.graphiti.features.context.IPictogramElementContext; import org.eclipse.graphiti.features.context.IReconnectionContext; import org.eclipse.graphiti.features.context.IRemoveBendpointContext; import org.eclipse.graphiti.features.context.IRemoveContext; import org.eclipse.graphiti.features.context.IResizeShapeContext; import org.eclipse.graphiti.features.context.IUpdateContext; import org.eclipse.graphiti.features.custom.ICustomFeature; import org.eclipse.graphiti.internal.ExternalPictogramLink; import org.eclipse.graphiti.internal.services.GraphitiInternal; import org.eclipse.graphiti.internal.util.T; import org.eclipse.graphiti.mm.Property; import org.eclipse.graphiti.mm.pictograms.Diagram; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.mm.pictograms.PictogramLink; import org.eclipse.graphiti.mm.pictograms.PictogramsFactory; import org.eclipse.graphiti.platform.IDiagramEditor; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.services.ILinkService; /** * The Class AbstractFeatureProvider. */ public abstract class AbstractFeatureProvider implements IFeatureProvider { private static final ICustomFeature[] ZERO_CUSTOM_FEATURES = new ICustomFeature[0]; /** * The Constant EMPTY_REF_OBJECTS. */ protected static final EObject[] NO_OBJECTS = new EObject[0]; /** * The Constant EMPTY_PICTOGRAM_ELEMENTS. */ protected static final PictogramElement[] EMPTY_PICTOGRAM_ELEMENTS = new PictogramElement[0]; private IDiagramTypeProvider dtp; private IDirectEditingInfo directEditingInfo = new DefaultDirectEditingInfo(); private IIndependenceSolver independenceSolver = null; /** * Creates a new {@link AbstractFeatureProvider}. * * @param diagramTypeProvider * the diagram type provider */ public AbstractFeatureProvider(IDiagramTypeProvider diagramTypeProvider) { super(); this.dtp = diagramTypeProvider; } @Override public IAddFeature getAddFeature(IAddContext context) { return null; } @Override public ICreateConnectionFeature[] getCreateConnectionFeatures() { return new ICreateConnectionFeature[0]; } @Override public ICreateFeature[] getCreateFeatures() { return new ICreateFeature[0]; } @Override public ICustomFeature[] getCustomFeatures(ICustomContext context) { return ZERO_CUSTOM_FEATURES; } @Override public IDeleteFeature getDeleteFeature(IDeleteContext context) { return null; } @Override public IDiagramTypeProvider getDiagramTypeProvider() { return this.dtp; } @Override public IMoveAnchorFeature getMoveAnchorFeature(IMoveAnchorContext context) { return null; } @Override public IRemoveFeature getRemoveFeature(IRemoveContext context) { return null; } @Override public IUpdateFeature getUpdateFeature(IUpdateContext context) { return null; } @Override public ILayoutFeature getLayoutFeature(ILayoutContext context) { return null; } @Override public IMoveShapeFeature getMoveShapeFeature(IMoveShapeContext context) { return null; } @Override public IMoveConnectionDecoratorFeature getMoveConnectionDecoratorFeature(IMoveConnectionDecoratorContext context) { return null; } @Override public IMoveBendpointFeature getMoveBendpointFeature(IMoveBendpointContext context) { return null; } @Override public IResizeShapeFeature getResizeShapeFeature(IResizeShapeContext context) { return null; } @Override public IAddBendpointFeature getAddBendpointFeature(IAddBendpointContext context) { return null; } @Override public IRemoveBendpointFeature getRemoveBendpointFeature(IRemoveBendpointContext context) { return null; } @Override public IDirectEditingFeature getDirectEditingFeature(IDirectEditingContext context) { return null; } @Override public IReason canUpdate(IUpdateContext context) { final String SIGNATURE = "canUpdate(IUpdateContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } IReason ret = Reason.createFalseReason(); IUpdateFeature updateFeature = getUpdateFeature(context); if (updateFeature != null) { boolean b = updateFeature.canUpdate(context); ret = new Reason(b); } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override public IReason canLayout(ILayoutContext context) { final String SIGNATURE = "canLayout(ILayoutContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } IReason ret = Reason.createFalseReason(); ILayoutFeature layoutFeature = getLayoutFeature(context); if (layoutFeature != null) { boolean b = layoutFeature.canLayout(context); ret = new Reason(b); } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override public IReason updateIfPossible(IUpdateContext context) { final String SIGNATURE = "updateIfPossible(IUpdateContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } boolean b = false; IUpdateFeature updateFeature = getUpdateFeature(context); if (updateFeature != null) { IDiagramEditor diagramEditor = getDiagramTypeProvider().getDiagramEditor(); try { diagramEditor.executeFeature(updateFeature, context); } catch (Exception e) { // Wrap in RuintimeException (handled by all callers) if (e instanceof RuntimeException) { throw (RuntimeException) e; } else { throw new RuntimeException(e); } } } IReason reason = new Reason(b); if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, reason); } return reason; } @Override public IReason layoutIfPossible(ILayoutContext context) { final String SIGNATURE = "layoutIfPossible(ILayoutContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } boolean b = false; ILayoutFeature layoutSemanticsFeature = getLayoutFeature(context); if (layoutSemanticsFeature != null) { IDiagramEditor diagramEditor = getDiagramTypeProvider().getDiagramEditor(); try { diagramEditor.executeFeature(layoutSemanticsFeature, context); b = true; } catch (Exception e) { // Wrap in RuntimeException (handled by all callers) if (e instanceof RuntimeException) { throw (RuntimeException) e; } else { throw new RuntimeException(e); } } } IReason res = new Reason(b); if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, res); } return res; } @Override public IReason updateNeeded(IUpdateContext context) { final String SIGNATURE = "updateNeeded(IUpdateContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } IReason ret = Reason.createFalseReason(); PictogramElement pe = context.getPictogramElement(); if (pe != null && GraphitiInternal.getEmfService().isObjectAlive(pe)) { IUpdateFeature updateFeature = getUpdateFeature(context); if (updateFeature != null) { ret = updateFeature.updateNeeded(context); } } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override public IReason updateIfPossibleAndNeeded(IUpdateContext context) { final String SIGNATURE = "updateIfPossibleAndNeeded(IUpdateContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } IReason ret = canUpdate(context); if (ret.toBoolean()) { ret = updateNeeded(context); if (ret.toBoolean()) { ret = updateIfPossible(context); } } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override public PictogramElement addIfPossible(IAddContext context) { final String SIGNATURE = "addIfPossible(IAddContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } PictogramElement ret = null; if (canAdd(context).toBoolean()) { IAddFeature feature = getAddFeature(context); IDiagramEditor diagramEditor = getDiagramTypeProvider().getDiagramEditor(); try { diagramEditor.executeFeature(feature, context); } catch (Exception e) { // Wrap in RuintimeException (handled by all callers) if (e instanceof RuntimeException) { throw (RuntimeException) e; } else { throw new RuntimeException(e); } } } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override public IReason canAdd(IAddContext context) { final String SIGNATURE = "canAdd(IAddContext)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { context }); } IReason ret = Reason.createFalseReason(); IAddFeature feature = getAddFeature(context); if (feature != null) { boolean b = feature.canAdd(context); ret = new Reason(b); } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override final public IDirectEditingInfo getDirectEditingInfo() { return this.directEditingInfo; } @Override public IReconnectionFeature getReconnectionFeature(IReconnectionContext context) { return new DefaultReconnectionFeature(this); } @Override public IPrintFeature getPrintFeature() { return new DefaultPrintFeature(this); } @Override public ISaveImageFeature getSaveImageFeature() { return new DefaultSaveImageFeature(this); } @Override public IFeature[] getDragAndDropFeatures(IPictogramElementContext context) { return new IFeature[0]; } private class StringTransformer { private final static String marker = "__independentN"; //$NON-NLS-1$ String[] decode(String value) { if (!value.startsWith(marker)) { return new String[] { value }; } else { value = value.substring(marker.length(), value.length()); return value.split(marker); } } String encode(String[] segments) { if (segments.length == 1) { return segments[0]; } StringBuffer sb = new StringBuffer(); for (String string : segments) { sb.append(marker); sb.append(string); } return sb.toString(); } } StringTransformer st = new StringTransformer(); @Override public Object[] getAllBusinessObjectsForPictogramElement(PictogramElement pictogramElement) { final String SIGNATURE = "getAllBusinessObjectsForPictogramElement(PictogramElement)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { pictogramElement }); } Object[] ret = new Object[0]; List<Object> retList = new ArrayList<Object>(); if (getIndependenceSolver() != null) { Property property = Graphiti.getPeService().getProperty(pictogramElement, ExternalPictogramLink.KEY_INDEPENDENT_PROPERTY); if (property != null && property.getValue() != null) { String value = property.getValue(); String[] values = getValues(value); for (String v : values) { retList.add(getIndependenceSolver().getBusinessObjectForKey(v)); } } } EObject[] allBusinessObjectsForLinkedPictogramElement = getLinkService().getAllBusinessObjectsForLinkedPictogramElement( pictogramElement); for (EObject eObject : allBusinessObjectsForLinkedPictogramElement) { retList.add(eObject); } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return retList.toArray(ret); } private String[] getValues(String value) { - if (value.isEmpty()) { + if (value.length() == 0) { return new String[0]; } else { return st.decode(value); } } @Override public Object getBusinessObjectForPictogramElement(PictogramElement pictogramElement) { final String SIGNATURE = "getBusinessObjectForPictogramElement(PictogramElement)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { pictogramElement }); } Object ret = null; if (getIndependenceSolver() != null) { Property property = Graphiti.getPeService().getProperty(pictogramElement, ExternalPictogramLink.KEY_INDEPENDENT_PROPERTY); if (property != null && property.getValue() != null) { String[] values = getValues(property.getValue()); if (values.length > 0) ret = getIndependenceSolver().getBusinessObjectForKey(values[0]); if (ret != null) { if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } } } ret = getLinkService().getBusinessObjectForLinkedPictogramElement(pictogramElement); if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, ret); } return ret; } @Override public PictogramElement[] getAllPictogramElementsForBusinessObject(Object businessObject) { final String SIGNATURE = "getAllPictogramElementsForBusinessObject(Object)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { businessObject }); } List<PictogramElement> retList = new ArrayList<PictogramElement>(); IIndependenceSolver solver = getIndependenceSolver(); if (solver != null) { String keyForBusinessObject = solver.getKeyForBusinessObject(businessObject); if (keyForBusinessObject != null) { Collection<PictogramElement> allContainedPictogramElements = Graphiti.getPeService().getAllContainedPictogramElements( getDiagramTypeProvider().getDiagram()); for (PictogramElement pe : allContainedPictogramElements) { Property property = Graphiti.getPeService().getProperty(pe, ExternalPictogramLink.KEY_INDEPENDENT_PROPERTY); if (property != null && Arrays.asList(getValues(property.getValue())).contains(keyForBusinessObject)) { retList.add(pe); } } } } if (businessObject instanceof EObject) { Diagram diagram = getDiagramTypeProvider().getDiagram(); if (diagram != null) { Collection<PictogramLink> pictogramLinks = diagram.getPictogramLinks(); for (PictogramLink pictogramLink : pictogramLinks) { List<EObject> businessObjects = pictogramLink.getBusinessObjects(); for (EObject obj : businessObjects) { if (getDiagramTypeProvider().getCurrentToolBehaviorProvider().equalsBusinessObjects(businessObject, obj)) { PictogramElement pe = pictogramLink.getPictogramElement(); if (pe != null) { retList.add(pe); } break; } } } } } PictogramElement[] res = retList.toArray(new PictogramElement[0]); if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, res); } return res; } /** * Provides the first pictogram element which represents the given business * object. * * @param businessObject * the business object * @return the pictogram element for business object */ @Override public PictogramElement getPictogramElementForBusinessObject(Object businessObject) { final String SIGNATURE = "getPictogramElementForBusinessObject(Object)"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { businessObject }); } PictogramElement result = null; if (businessObject instanceof EObject) { Diagram diagram = getDiagramTypeProvider().getDiagram(); if (diagram != null) { Collection<PictogramLink> pictogramLinks = diagram.getPictogramLinks(); for (PictogramLink pictogramLink : pictogramLinks) { List<EObject> businessObjects = pictogramLink.getBusinessObjects(); for (EObject obj : businessObjects) { if (getDiagramTypeProvider().getCurrentToolBehaviorProvider().equalsBusinessObjects(businessObject, obj)) { PictogramElement pe = pictogramLink.getPictogramElement(); if (pe != null) { result = pe; } break; } } if (result != null) { break; } } } } else { IIndependenceSolver solver = getIndependenceSolver(); if (solver != null) { String keyForBusinessObject = solver.getKeyForBusinessObject(businessObject); if (keyForBusinessObject != null) { Collection<PictogramElement> allContainedPictogramElements = Graphiti.getPeService().getAllContainedPictogramElements( getDiagramTypeProvider().getDiagram()); for (PictogramElement pe : allContainedPictogramElements) { Property property = Graphiti.getPeService().getProperty(pe, ExternalPictogramLink.KEY_INDEPENDENT_PROPERTY); if (property != null && Arrays.asList(getValues(property.getValue())).contains(keyForBusinessObject)) { result = pe; break; } } } } } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE, result); } return result; } /** * Check does there have pictogram element linked to this business object. * * @param businessObject * the business object * @return true when at least one pictogram element is linked, otherwise * return false. */ @Override public boolean hasPictogramElementForBusinessObject(Object businessObject) { return getPictogramElementForBusinessObject(businessObject) != null; } @Override public void link(PictogramElement pictogramElement, Object businessObject) { link(pictogramElement, new Object[] { businessObject }); } @Override public void link(PictogramElement pictogramElement, Object[] businessObjects) { final String SIGNATURE = "link(PictogramElement, Object[])"; //$NON-NLS-1$ boolean info = T.racer().info(); if (info) { T.racer().entering(AbstractFeatureProvider.class, SIGNATURE, new Object[] { pictogramElement, businessObjects }); } IIndependenceSolver is = getIndependenceSolver(); if (is == null) { PictogramLink link = createOrGetPictogramLink(pictogramElement); if (link != null) { // remove currently linked BOs and add new BOs link.getBusinessObjects().clear(); if (businessObjects != null) { for (int i = 0; i < businessObjects.length; i++) { EObject bo = (EObject) businessObjects[i]; Resource resource = bo.eResource(); Assert.isNotNull(resource, " Business object " + bo + " is not contained in a resource"); //$NON-NLS-1$ //$NON-NLS-2$ ResourceSet resourceSet = resource.getResourceSet(); Assert.isNotNull(resourceSet, " Resource " + resource + " is not contained in a resource set"); //$NON-NLS-1$ //$NON-NLS-2$ TransactionalEditingDomain editingDomain = getDiagramTypeProvider().getDiagramEditor().getEditingDomain(); ResourceSet editorResourceSet = editingDomain.getResourceSet(); if (!resourceSet.equals(editorResourceSet)) { URI boUri = EcoreUtil.getURI(bo); bo = editorResourceSet.getEObject(boUri, true); } if (bo != null) { link.getBusinessObjects().add(bo); } } } } } else { List<String> values = new ArrayList<String>(); for (Object bo : businessObjects) { String propertyValue = is.getKeyForBusinessObject(bo); if (propertyValue != null) values.add(propertyValue); } String encodedValues = st.encode(values.toArray(new String[] {})); Graphiti.getPeService().setPropertyValue(pictogramElement, ExternalPictogramLink.KEY_INDEPENDENT_PROPERTY, encodedValues); } if (info) { T.racer().exiting(AbstractFeatureProvider.class, SIGNATURE); } } private PictogramLink createPictogramLink(PictogramElement pe) { PictogramLink ret = null; Diagram diagram = getDiagramTypeProvider().getDiagram(); if (diagram != null) { // create new link ret = PictogramsFactory.eINSTANCE.createPictogramLink(); ret.setPictogramElement(pe); // add new link to diagram diagram.getPictogramLinks().add(ret); } return ret; } private PictogramLink createOrGetPictogramLink(PictogramElement pe) { PictogramLink link = pe.getLink(); if (link == null) { link = createPictogramLink(pe); } return link; } /** * Gets the independence solver. * * @return the independence solver */ protected final IIndependenceSolver getIndependenceSolver() { return this.independenceSolver; } /** * Sets the independence solver. * * @param independenceSolver * the new independence solver */ protected final void setIndependenceSolver(IIndependenceSolver independenceSolver) { this.independenceSolver = independenceSolver; } @Override public void dispose() { } protected ILinkService getLinkService() { return Graphiti.getLinkService(); } } diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java index 2f27f3c8..d252e56e 100644 --- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java +++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java @@ -1,142 +1,142 @@ /******************************************************************************* * <copyright> * * Copyright (c) 2005, 2011 SAP AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * SAP AG - initial API, implementation and documentation * * </copyright> * *******************************************************************************/ package org.eclipse.graphiti.internal.services.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.graphiti.mm.algorithms.AbstractText; import org.eclipse.graphiti.mm.algorithms.styles.Font; import org.eclipse.graphiti.mm.algorithms.styles.Style; import org.eclipse.graphiti.mm.pictograms.Diagram; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.services.IMigrationService; public class MigrationServiceImpl implements IMigrationService { @Override public void migrate070To080(Diagram d) { // Traverse model and collect fonts Map<Font, ArrayList<EObject>> fontToUser = new HashMap<Font, ArrayList<EObject>>(); Resource eResource = d.eResource(); TreeIterator<EObject> allContents = eResource.getAllContents(); while (allContents.hasNext()) { EObject eObject = allContents.next(); if (eObject instanceof AbstractText) { AbstractText t = (AbstractText) eObject; Font font = t.getFont(); addFontUser(fontToUser, eObject, font); } else if (eObject instanceof Style) { Style s = (Style) eObject; Font font = s.getFont(); addFontUser(fontToUser, eObject, font); } } // Manage collected fonts and set the new font on the respective // elements. Includes possibly a write. // The caller has to use a write transaction. for (Font font : fontToUser.keySet()) { Font newFont = Graphiti.getGaService().manageFont(d, font.getName(), font.getSize(), font.isItalic(), font.isBold()); ArrayList<EObject> fontUsers = fontToUser.get(font); for (EObject fontUser : fontUsers) { if (fontUser instanceof AbstractText) { ((AbstractText) fontUser).setFont(newFont); } else { ((Style) fontUser).setFont(newFont); } } } } @Override public void migrate080To090(Diagram d) { // Traverse model and and set unfilled texts to filled Resource eResource = d.eResource(); TreeIterator<EObject> allContents = eResource.getAllContents(); while (allContents.hasNext()) { EObject eObject = allContents.next(); if (eObject instanceof AbstractText) { AbstractText t = (AbstractText) eObject; if (t.getFilled()) { t.setFilled(Boolean.FALSE); } } } } @Override public boolean shouldMigrate080To090(Diagram d) { String version = d.getVersion(); - if (version == null || version.isEmpty()) { + if (version == null || version.length() == 0) { Resource eResource = d.eResource(); TreeIterator<EObject> allContents = eResource.getAllContents(); while (allContents.hasNext()) { EObject eObject = allContents.next(); if (eObject instanceof AbstractText) { return true; } } } return false; } private void addFontUser(Map<Font, ArrayList<EObject>> fontToUser, EObject fontUser, Font font) { if (font != null) { if (fontToUser.get(font) == null) { fontToUser.put(font, new ArrayList<EObject>()); } fontToUser.get(font).add(fontUser); } } @Override public boolean shouldMigrate070To080(Diagram d) { // Traverse model and collect fonts HashSet<Font> fonts = new HashSet<Font>(); Resource eResource = d.eResource(); TreeIterator<EObject> allContents = eResource.getAllContents(); while (allContents.hasNext()) { EObject next = allContents.next(); if (next instanceof AbstractText) { AbstractText t = (AbstractText) next; Font font = t.getFont(); if (font != null) fonts.add(font); } else if (next instanceof Style) { Style s = (Style) next; Font font = s.getFont(); if (font != null) fonts.add(font); } } for (Font font : fonts) { if (!d.getFonts().contains(font)) return true; } return false; } }

diff --git a/src/com/tnes/ROMFile.java b/src/com/tnes/ROMFile.java index f8a1471..467c49f 100644 --- a/src/com/tnes/ROMFile.java +++ b/src/com/tnes/ROMFile.java @@ -1,113 +1,116 @@ package com.tnes; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; public class ROMFile extends File { private static final long serialVersionUID = 1L; private Debugger debugger = Debugger.getInstance(); private int prgPageCount = 0, chrPageCount = 0; private int romControl1 = 0, romControl2 = 0; private int mapper = 0; private List<List<Short>> prgROMPages = new ArrayList<List<Short>>(); private List<List<Short>> chrROMPages = new ArrayList<List<Short>>(); private int mirroring = 0; public ROMFile(String pathname) { super(pathname); try { - FileReader reader = new FileReader(this); - char[] fileType = new char[4]; - reader.read(fileType, 0, 4); - prgPageCount = reader.read(); - chrPageCount = reader.read(); - romControl1 = reader.read(); - romControl2 = reader.read(); + FileInputStream stream = new FileInputStream(this); + byte[] fileType = new byte[4]; + stream.read(fileType, 0, 4); + prgPageCount = stream.read(); + chrPageCount = stream.read(); + romControl1 = stream.read(); + romControl2 = stream.read(); mapper = (romControl1 >> 4) | romControl2; mirroring |= (romControl1 & 0x08) >> 2; mirroring = (mirroring == 0) ? (romControl1 & 0x01) : mirroring; // Load PRG-ROM and CHR-Pages into object variables prgROMPages = new ArrayList<List<Short>>(prgPageCount); chrROMPages = new ArrayList<List<Short>>(chrPageCount); // Read in data for PRG-ROM pages for (int i = 0; i < prgPageCount; i++) { prgROMPages.add(i, new ArrayList<Short>(Constants.PRG_ROM_PAGE_SIZE)); for (int j = 0; j < Constants.PRG_ROM_PAGE_SIZE; j++) { - prgROMPages.get(i).add(j, (short) reader.read()); + prgROMPages.get(i).add(j, (short) stream.read()); + + if (prgROMPages.get(i).get(j) > 0xFF) + debugger.debugPrint("\nChar Value over 0xFF: " + prgROMPages.get(i).get(j)); } } // Read in data for PRG-ROM pages for (int i = 0; i < chrPageCount; i++) { chrROMPages.add(i, new ArrayList<Short>(Constants.CHR_ROM_PAGE_SIZE)); for (int j = 0; j < Constants.CHR_ROM_PAGE_SIZE; j++) { - chrROMPages.get(i).add(j, (short) reader.read()); + chrROMPages.get(i).add(j, (short) stream.read()); } } - reader.close(); + stream.close(); } catch (FileNotFoundException e) { debugger.debugPrint("Error opening ROM file: " + pathname); debugger.debugPrint(e.getMessage()); debugger.readCommands(); } catch (IOException ioe) { debugger.debugPrint("Error reading ROM file: " + pathname); debugger.debugPrint(ioe.getMessage()); debugger.readCommands(); } debugger.debugPrint(String.format("\nPRG-ROM Pages: %d", prgPageCount)); debugger.debugPrint(String.format("\nCHR-ROM Pages: %d", chrPageCount)); debugger.debugPrint(String.format("\nROM Control Byte #1: %s", Debugger.intToHex(romControl1))); debugger.debugPrint(String.format("\nROM Control Byte #2: %s", Debugger.intToHex(romControl2))); debugger.debugPrint(String.format("\nMapper: %d", mapper)); if (mirroring == 2) { debugger.debugPrint("\nMirroring: Four Screen"); } else { debugger.debugPrint(String.format("\nMirroring: %s", mirroring == 0 ? "Horizontal" : "Vertical")); } } public int getPrgPageCount() { return prgPageCount; } public int getChrPageCount() { return chrPageCount; } public int getMapper() { return mapper; } public int getROMControl1() { return romControl1; } public int getROMControl2() { return romControl2; } public List<List<Short>> getPrgROMPages() { return prgROMPages; } public List<List<Short>> getChrROMPages() { return chrROMPages; } public int getMirroring() { return mirroring; } }

diff --git a/phone/com/android/internal/policy/impl/KeyguardViewMediator.java b/phone/com/android/internal/policy/impl/KeyguardViewMediator.java index 17586be..6b9db60 100644 --- a/phone/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/phone/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -1,1030 +1,1014 @@ /* * Copyright (C) 2007 The Android Open Source Project * * 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 com.android.internal.policy.impl; import com.android.internal.telephony.IccCard; import com.android.internal.widget.LockPatternUtils; import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; import android.os.LocalPowerManager; import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; import android.os.SystemClock; import android.os.SystemProperties; import android.telephony.TelephonyManager; import android.util.Config; import android.util.EventLog; import android.util.Log; import android.view.KeyEvent; import android.view.WindowManagerImpl; import android.view.WindowManagerPolicy; /** * Mediates requests related to the keyguard. This includes queries about the * state of the keyguard, power management events that effect whether the keyguard * should be shown or reset, callbacks to the phone window manager to notify * it of when the keyguard is showing, and events from the keyguard view itself * stating that the keyguard was succesfully unlocked. * * Note that the keyguard view is shown when the screen is off (as appropriate) * so that once the screen comes on, it will be ready immediately. * * Example queries about the keyguard: * - is {movement, key} one that should wake the keygaurd? * - is the keyguard showing? * - are input events restricted due to the state of the keyguard? * * Callbacks to the phone window manager: * - the keyguard is showing * * Example external events that translate to keyguard view changes: * - screen turned off -> reset the keyguard, and show it so it will be ready * next time the screen turns on * - keyboard is slid open -> if the keyguard is not secure, hide it * * Events from the keyguard view: * - user succesfully unlocked keyguard -> hide keyguard view, and no longer * restrict input events. * * Note: in addition to normal power managment events that effect the state of * whether the keyguard should be showing, external apps and services may request * that the keyguard be disabled via {@link #setKeyguardEnabled(boolean)}. When * false, this will override all other conditions for turning on the keyguard. * * Threading and synchronization: * This class is created by the initialization routine of the {@link WindowManagerPolicy}, * and runs on its thread. The keyguard UI is created from that thread in the * constructor of this class. The apis may be called from other threads, including the * {@link com.android.server.KeyInputQueue}'s and {@link android.view.WindowManager}'s. * Therefore, methods on this class are synchronized, and any action that is pointed * directly to the keyguard UI is posted to a {@link Handler} to ensure it is taken on the UI * thread of the keyguard. */ public class KeyguardViewMediator implements KeyguardViewCallback, KeyguardUpdateMonitor.SimStateCallback { private final static boolean DEBUG = false && Config.LOGD; private final static boolean DBG_WAKE = DEBUG || true; private final static String TAG = "KeyguardViewMediator"; private static final String DELAYED_KEYGUARD_ACTION = "com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD"; // used for handler messages private static final int TIMEOUT = 1; private static final int SHOW = 2; private static final int HIDE = 3; private static final int RESET = 4; private static final int VERIFY_UNLOCK = 5; private static final int NOTIFY_SCREEN_OFF = 6; private static final int NOTIFY_SCREEN_ON = 7; private static final int WAKE_WHEN_READY = 8; private static final int KEYGUARD_DONE = 9; private static final int KEYGUARD_DONE_DRAWING = 10; private static final int KEYGUARD_DONE_AUTHENTICATING = 11; private static final int SET_HIDDEN = 12; /** * The default amount of time we stay awake (used for all key input) */ protected static final int AWAKE_INTERVAL_DEFAULT_MS = 5000; /** * The default amount of time we stay awake (used for all key input) when * the keyboard is open */ protected static final int AWAKE_INTERVAL_DEFAULT_KEYBOARD_OPEN_MS = 10000; /** * How long to wait after the screen turns off due to timeout before * turning on the keyguard (i.e, the user has this much time to turn * the screen back on without having to face the keyguard). */ private static final int KEYGUARD_DELAY_MS = 5000; /** * How long we'll wait for the {@link KeyguardViewCallback#keyguardDoneDrawing()} * callback before unblocking a call to {@link #setKeyguardEnabled(boolean)} * that is reenabling the keyguard. */ private static final int KEYGUARD_DONE_DRAWING_TIMEOUT_MS = 2000; private Context mContext; private AlarmManager mAlarmManager; private boolean mSystemReady; /** Low level access to the power manager for enableUserActivity. Having this * requires that we run in the system process. */ LocalPowerManager mRealPowerManager; /** High level access to the power manager for WakeLocks */ private PowerManager mPM; /** * Used to keep the device awake while the keyguard is showing, i.e for * calls to {@link #pokeWakelock()} */ private PowerManager.WakeLock mWakeLock; /** * Used to keep the device awake while to ensure the keyguard finishes opening before * we sleep. */ private PowerManager.WakeLock mShowKeyguardWakeLock; /** * Does not turn on screen, held while a call to {@link KeyguardViewManager#wakeWhenReadyTq(int)} * is called to make sure the device doesn't sleep before it has a chance to poke * the wake lock. * @see #wakeWhenReadyLocked(int) */ private PowerManager.WakeLock mWakeAndHandOff; private KeyguardViewManager mKeyguardViewManager; // these are protected by synchronized (this) /** - * This is set to false if the keyguard is disabled via setKeyguardEnabled(false). + * External apps (like the phone app) can tell us to disable the keygaurd. */ private boolean mExternallyEnabled = true; /** * Remember if an external call to {@link #setKeyguardEnabled} with value * false caused us to hide the keyguard, so that we need to reshow it once * the keygaurd is reenabled with another call with value true. */ private boolean mNeedToReshowWhenReenabled = false; // cached value of whether we are showing (need to know this to quickly // answer whether the input should be restricted) private boolean mShowing = false; // true if the keyguard is hidden by another window private boolean mHidden = false; /** * Helps remember whether the screen has turned on since the last time * it turned off due to timeout. see {@link #onScreenTurnedOff(int)} */ private int mDelayedShowingSequence; private int mWakelockSequence; private PhoneWindowManager mCallback; /** * If the user has disabled the keyguard, then requests to exit, this is * how we'll ultimately let them know whether it was successful. We use this * var being non-null as an indicator that there is an in progress request. */ private WindowManagerPolicy.OnKeyguardExitResult mExitSecureCallback; // the properties of the keyguard private KeyguardViewProperties mKeyguardViewProperties; private KeyguardUpdateMonitor mUpdateMonitor; private boolean mKeyboardOpen = false; private boolean mScreenOn = false; /** * we send this intent when the keyguard is dismissed. */ private Intent mUserPresentIntent; /** * {@link #setKeyguardEnabled} waits on this condition when it reenables * the keyguard. */ private boolean mWaitingUntilKeyguardVisible = false; public KeyguardViewMediator(Context context, PhoneWindowManager callback, LocalPowerManager powerManager) { mContext = context; mRealPowerManager = powerManager; mPM = (PowerManager) context.getSystemService(Context.POWER_SERVICE); mWakeLock = mPM.newWakeLock( PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "keyguard"); mWakeLock.setReferenceCounted(false); mShowKeyguardWakeLock = mPM.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "show keyguard"); mShowKeyguardWakeLock.setReferenceCounted(false); mWakeAndHandOff = mPM.newWakeLock( PowerManager.PARTIAL_WAKE_LOCK, "keyguardWakeAndHandOff"); mWakeAndHandOff.setReferenceCounted(false); IntentFilter filter = new IntentFilter(); filter.addAction(DELAYED_KEYGUARD_ACTION); filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED); context.registerReceiver(mBroadCastReceiver, filter); mAlarmManager = (AlarmManager) context .getSystemService(Context.ALARM_SERVICE); mCallback = callback; mUpdateMonitor = new KeyguardUpdateMonitor(context); mUpdateMonitor.registerSimStateCallback(this); mKeyguardViewProperties = new LockPatternKeyguardViewProperties( new LockPatternUtils(mContext.getContentResolver()), mUpdateMonitor); mKeyguardViewManager = new KeyguardViewManager( context, WindowManagerImpl.getDefault(), this, mKeyguardViewProperties, mUpdateMonitor); mUserPresentIntent = new Intent(Intent.ACTION_USER_PRESENT); } /** * Let us know that the system is ready after startup. */ public void onSystemReady() { synchronized (this) { if (DEBUG) Log.d(TAG, "onSystemReady"); mSystemReady = true; doKeyguard(); } } /** * Called to let us know the screen was turned off. * @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER} or * {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}. */ public void onScreenTurnedOff(int why) { synchronized (this) { mScreenOn = false; if (DEBUG) Log.d(TAG, "onScreenTurnedOff(" + why + ")"); if (mExitSecureCallback != null) { if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled"); mExitSecureCallback.onKeyguardExitResult(false); mExitSecureCallback = null; if (!mExternallyEnabled) { hideLocked(); } } else if (mShowing) { notifyScreenOffLocked(); resetStateLocked(); } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) { // if the screen turned off because of timeout, set an alarm // to enable it a little bit later (i.e, give the user a chance // to turn the screen back on within a certain window without // having to unlock the screen) long when = SystemClock.elapsedRealtime() + KEYGUARD_DELAY_MS; Intent intent = new Intent(DELAYED_KEYGUARD_ACTION); intent.putExtra("seq", mDelayedShowingSequence); PendingIntent sender = PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, when, sender); if (DEBUG) Log.d(TAG, "setting alarm to turn off keyguard, seq = " + mDelayedShowingSequence); } else { doKeyguard(); } } } /** * Let's us know the screen was turned on. */ public void onScreenTurnedOn() { synchronized (this) { mScreenOn = true; mDelayedShowingSequence++; if (DEBUG) Log.d(TAG, "onScreenTurnedOn, seq = " + mDelayedShowingSequence); notifyScreenOnLocked(); } } /** * Same semantics as {@link WindowManagerPolicy#enableKeyguard}; provide * a way for external stuff to override normal keyguard behavior. For instance * the phone app disables the keyguard when it receives incoming calls. */ public void setKeyguardEnabled(boolean enabled) { synchronized (this) { if (DEBUG) Log.d(TAG, "setKeyguardEnabled(" + enabled + ")"); mExternallyEnabled = enabled; if (!enabled && mShowing) { if (mExitSecureCallback != null) { if (DEBUG) Log.d(TAG, "in process of verifyUnlock request, ignoring"); // we're in the process of handling a request to verify the user // can get past the keyguard. ignore extraneous requests to disable / reenable return; } // hiding keyguard that is showing, remember to reshow later if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, " + "disabling status bar expansion"); mNeedToReshowWhenReenabled = true; hideLocked(); } else if (enabled && mNeedToReshowWhenReenabled) { // reenabled after previously hidden, reshow if (DEBUG) Log.d(TAG, "previously hidden, reshowing, reenabling " + "status bar expansion"); mNeedToReshowWhenReenabled = false; if (mExitSecureCallback != null) { if (DEBUG) Log.d(TAG, "onKeyguardExitResult(false), resetting"); mExitSecureCallback.onKeyguardExitResult(false); mExitSecureCallback = null; resetStateLocked(); } else { showLocked(); // block until we know the keygaurd is done drawing (and post a message // to unblock us after a timeout so we don't risk blocking too long // and causing an ANR). mWaitingUntilKeyguardVisible = true; mHandler.sendEmptyMessageDelayed(KEYGUARD_DONE_DRAWING, KEYGUARD_DONE_DRAWING_TIMEOUT_MS); if (DEBUG) Log.d(TAG, "waiting until mWaitingUntilKeyguardVisible is false"); while (mWaitingUntilKeyguardVisible) { try { wait(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } } if (DEBUG) Log.d(TAG, "done waiting for mWaitingUntilKeyguardVisible"); } } } } /** * @see android.app.KeyguardManager#exitKeyguardSecurely */ public void verifyUnlock(WindowManagerPolicy.OnKeyguardExitResult callback) { synchronized (this) { if (DEBUG) Log.d(TAG, "verifyUnlock"); if (!mUpdateMonitor.isDeviceProvisioned()) { // don't allow this api when the device isn't provisioned if (DEBUG) Log.d(TAG, "ignoring because device isn't provisioned"); callback.onKeyguardExitResult(false); + } else if (mExternallyEnabled) { + // this only applies when the user has externally disabled the + // keyguard. this is unexpected and means the user is not + // using the api properly. + Log.w(TAG, "verifyUnlock called when not externally disabled"); + callback.onKeyguardExitResult(false); } else if (mExitSecureCallback != null) { // already in progress with someone else callback.onKeyguardExitResult(false); - } else if (mExternallyEnabled) { - if (mHidden) { - if (isSecure()) { - // if the current activity is in front of the keyguard, then - // pretend like we succeeded and we will hit the lock screen - // when the activity is launched. - // HACK ALERT - this is assuming that the callback will be used - // to start a new activity (current usage by Phone app). - callback.onKeyguardExitResult(true); - } else { - // call through to verifyUnlockLocked() so we can bypass - // the insecure keyguard screen. - mExitSecureCallback = callback; - verifyUnlockLocked(); - } - } else { - // this only applies when the user has externally disabled the keyguard - // and no other activities are in front of the keyguard. - // this is unexpected and means the user is not using the api properly. - Log.w(TAG, "verifyUnlock called when not externally disabled"); - callback.onKeyguardExitResult(false); - } } else { mExitSecureCallback = callback; verifyUnlockLocked(); } } } /** * Is the keyguard currently showing? */ public boolean isShowing() { return mShowing; } /** * Is the keyguard currently showing and not being force hidden? */ public boolean isShowingAndNotHidden() { return mShowing && !mHidden; } /** * Notify us when the keyguard is hidden by another window */ public void setHidden(boolean isHidden) { if (DEBUG) Log.d(TAG, "setHidden " + isHidden); mHandler.removeMessages(SET_HIDDEN); Message msg = mHandler.obtainMessage(SET_HIDDEN, (isHidden ? 1 : 0), 0); mHandler.sendMessage(msg); } /** * Handles SET_HIDDEN message sent by setHidden() */ private void handleSetHidden(boolean isHidden) { synchronized (KeyguardViewMediator.this) { if (mHidden != isHidden) { mHidden = isHidden; adjustUserActivityLocked(); } } } /** * Given the state of the keyguard, is the input restricted? * Input is restricted when the keyguard is showing, or when the keyguard * was suppressed by an app that disabled the keyguard or we haven't been provisioned yet. */ public boolean isInputRestricted() { return mShowing || mNeedToReshowWhenReenabled || !mUpdateMonitor.isDeviceProvisioned(); } /** * Returns true if the change is resulting in the keyguard beign dismissed, * meaning the screen can turn on immediately. Otherwise returns false. */ public boolean doLidChangeTq(boolean isLidOpen) { mKeyboardOpen = isLidOpen; if (mUpdateMonitor.isKeyguardBypassEnabled() && mKeyboardOpen && !mKeyguardViewProperties.isSecure() && mKeyguardViewManager.isShowing()) { if (DEBUG) Log.d(TAG, "bypassing keyguard on sliding open of keyboard with non-secure keyguard"); mHandler.sendEmptyMessage(KEYGUARD_DONE_AUTHENTICATING); return true; } return false; } /** * Enable the keyguard if the settings are appropriate. */ private void doKeyguard() { synchronized (this) { // if another app is disabling us, don't show if (!mExternallyEnabled) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled"); // note: we *should* set mNeedToReshowWhenReenabled=true here, but that makes // for an occasional ugly flicker in this situation: // 1) receive a call with the screen on (no keyguard) or make a call // 2) screen times out // 3) user hits key to turn screen back on // instead, we reenable the keyguard when we know the screen is off and the call // ends (see the broadcast receiver below) // TODO: clean this up when we have better support at the window manager level // for apps that wish to be on top of the keyguard return; } // if the keyguard is already showing, don't bother if (mKeyguardViewManager.isShowing()) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing"); return; } // if the setup wizard hasn't run yet, don't show final boolean requireSim = !SystemProperties.getBoolean("keyguard.no_require_sim", false); final boolean provisioned = mUpdateMonitor.isDeviceProvisioned(); final IccCard.State state = mUpdateMonitor.getSimState(); final boolean lockedOrMissing = state.isPinLocked() || ((state == IccCard.State.ABSENT) && requireSim); if (!lockedOrMissing && !provisioned) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because device isn't provisioned" + " and the sim is not locked or missing"); return; } if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(); } } /** * Send message to keyguard telling it to reset its state. * @see #handleReset() */ private void resetStateLocked() { if (DEBUG) Log.d(TAG, "resetStateLocked"); Message msg = mHandler.obtainMessage(RESET); mHandler.sendMessage(msg); } /** * Send message to keyguard telling it to verify unlock * @see #handleVerifyUnlock() */ private void verifyUnlockLocked() { if (DEBUG) Log.d(TAG, "verifyUnlockLocked"); mHandler.sendEmptyMessage(VERIFY_UNLOCK); } /** * Send a message to keyguard telling it the screen just turned on. * @see #onScreenTurnedOff(int) * @see #handleNotifyScreenOff */ private void notifyScreenOffLocked() { if (DEBUG) Log.d(TAG, "notifyScreenOffLocked"); mHandler.sendEmptyMessage(NOTIFY_SCREEN_OFF); } /** * Send a message to keyguard telling it the screen just turned on. * @see #onScreenTurnedOn() * @see #handleNotifyScreenOn */ private void notifyScreenOnLocked() { if (DEBUG) Log.d(TAG, "notifyScreenOnLocked"); mHandler.sendEmptyMessage(NOTIFY_SCREEN_ON); } /** * Send message to keyguard telling it about a wake key so it can adjust * its state accordingly and then poke the wake lock when it is ready. * @param keyCode The wake key. * @see #handleWakeWhenReady * @see #onWakeKeyWhenKeyguardShowingTq(int) */ private void wakeWhenReadyLocked(int keyCode) { if (DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")"); /** * acquire the handoff lock that will keep the cpu running. this will * be released once the keyguard has set itself up and poked the other wakelock * in {@link #handleWakeWhenReady(int)} */ mWakeAndHandOff.acquire(); Message msg = mHandler.obtainMessage(WAKE_WHEN_READY, keyCode, 0); mHandler.sendMessage(msg); } /** * Send message to keyguard telling it to show itself * @see #handleShow() */ private void showLocked() { if (DEBUG) Log.d(TAG, "showLocked"); // ensure we stay awake until we are finished displaying the keyguard mShowKeyguardWakeLock.acquire(); Message msg = mHandler.obtainMessage(SHOW); mHandler.sendMessage(msg); } /** * Send message to keyguard telling it to hide itself * @see #handleHide() */ private void hideLocked() { if (DEBUG) Log.d(TAG, "hideLocked"); Message msg = mHandler.obtainMessage(HIDE); mHandler.sendMessage(msg); } /** {@inheritDoc} */ public void onSimStateChanged(IccCard.State simState) { if (DEBUG) Log.d(TAG, "onSimStateChanged: " + simState); switch (simState) { case ABSENT: // only force lock screen in case of missing sim if user hasn't // gone through setup wizard if (!mUpdateMonitor.isDeviceProvisioned()) { if (!isShowing()) { if (DEBUG) Log.d(TAG, "INTENT_VALUE_ICC_ABSENT and keygaurd isn't showing, we need " + "to show the keyguard since the device isn't provisioned yet."); doKeyguard(); } else { resetStateLocked(); } } break; case PIN_REQUIRED: case PUK_REQUIRED: if (!isShowing()) { if (DEBUG) Log.d(TAG, "INTENT_VALUE_ICC_LOCKED and keygaurd isn't showing, we need " + "to show the keyguard so the user can enter their sim pin"); doKeyguard(); } else { resetStateLocked(); } break; case READY: if (isShowing()) { resetStateLocked(); } break; } } public boolean isSecure() { return mKeyguardViewProperties.isSecure(); } private BroadcastReceiver mBroadCastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); if (action.equals(DELAYED_KEYGUARD_ACTION)) { int sequence = intent.getIntExtra("seq", 0); if (false) Log.d(TAG, "received DELAYED_KEYGUARD_ACTION with seq = " + sequence + ", mDelayedShowingSequence = " + mDelayedShowingSequence); if (mDelayedShowingSequence == sequence) { doKeyguard(); } } else if (TelephonyManager.ACTION_PHONE_STATE_CHANGED.equals(action) && TelephonyManager.EXTRA_STATE_IDLE.equals(intent.getStringExtra( TelephonyManager.EXTRA_STATE)) // call ending && !mScreenOn // screen off && mExternallyEnabled) { // not disabled by any app // note: this is a way to gracefully reenable the keyguard when the call // ends and the screen is off without always reenabling the keyguard // each time the screen turns off while in call (and having an occasional ugly // flicker while turning back on the screen and disabling the keyguard again). if (DEBUG) Log.d(TAG, "screen is off and call ended, let's make sure the " + "keyguard is showing"); doKeyguard(); } } }; /** * When a key is received when the screen is off and the keyguard is showing, * we need to decide whether to actually turn on the screen, and if so, tell * the keyguard to prepare itself and poke the wake lock when it is ready. * * The 'Tq' suffix is per the documentation in {@link WindowManagerPolicy}. * Be sure not to take any action that takes a long time; any significant * action should be posted to a handler. * * @param keyCode The keycode of the key that woke the device * @return Whether we poked the wake lock (and turned the screen on) */ public boolean onWakeKeyWhenKeyguardShowingTq(int keyCode) { if (DEBUG) Log.d(TAG, "onWakeKeyWhenKeyguardShowing(" + keyCode + ")"); if (isWakeKeyWhenKeyguardShowing(keyCode)) { // give the keyguard view manager a chance to adjust the state of the // keyguard based on the key that woke the device before poking // the wake lock wakeWhenReadyLocked(keyCode); return true; } else { return false; } } private boolean isWakeKeyWhenKeyguardShowing(int keyCode) { switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: case KeyEvent.KEYCODE_MUTE: case KeyEvent.KEYCODE_HEADSETHOOK: case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: case KeyEvent.KEYCODE_MEDIA_STOP: case KeyEvent.KEYCODE_MEDIA_NEXT: case KeyEvent.KEYCODE_MEDIA_PREVIOUS: case KeyEvent.KEYCODE_MEDIA_REWIND: case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: case KeyEvent.KEYCODE_CAMERA: return false; } return true; } /** * Callbacks from {@link KeyguardViewManager}. */ /** {@inheritDoc} */ public void pokeWakelock() { pokeWakelock(mKeyboardOpen ? AWAKE_INTERVAL_DEFAULT_KEYBOARD_OPEN_MS : AWAKE_INTERVAL_DEFAULT_MS); } /** {@inheritDoc} */ public void pokeWakelock(int holdMs) { synchronized (this) { if (DBG_WAKE) Log.d(TAG, "pokeWakelock(" + holdMs + ")"); mWakeLock.acquire(); mHandler.removeMessages(TIMEOUT); mWakelockSequence++; Message msg = mHandler.obtainMessage(TIMEOUT, mWakelockSequence, 0); mHandler.sendMessageDelayed(msg, holdMs); } } /** * {@inheritDoc} * * @see #handleKeyguardDone */ public void keyguardDone(boolean authenticated) { keyguardDone(authenticated, true); } public void keyguardDone(boolean authenticated, boolean wakeup) { synchronized (this) { EventLog.writeEvent(70000, 2); if (DEBUG) Log.d(TAG, "keyguardDone(" + authenticated + ")"); Message msg = mHandler.obtainMessage(KEYGUARD_DONE); msg.arg1 = wakeup ? 1 : 0; mHandler.sendMessage(msg); if (authenticated) { mUpdateMonitor.clearFailedAttempts(); } if (mExitSecureCallback != null) { mExitSecureCallback.onKeyguardExitResult(authenticated); mExitSecureCallback = null; if (authenticated) { // after succesfully exiting securely, no need to reshow // the keyguard when they've released the lock mExternallyEnabled = true; mNeedToReshowWhenReenabled = false; } } } } /** * {@inheritDoc} * * @see #handleKeyguardDoneDrawing */ public void keyguardDoneDrawing() { mHandler.sendEmptyMessage(KEYGUARD_DONE_DRAWING); } /** * This handler will be associated with the policy thread, which will also * be the UI thread of the keyguard. Since the apis of the policy, and therefore * this class, can be called by other threads, any action that directly * interacts with the keyguard ui should be posted to this handler, rather * than called directly. */ private Handler mHandler = new Handler() { @Override public void handleMessage(Message msg) { switch (msg.what) { case TIMEOUT: handleTimeout(msg.arg1); return ; case SHOW: handleShow(); return ; case HIDE: handleHide(); return ; case RESET: handleReset(); return ; case VERIFY_UNLOCK: handleVerifyUnlock(); return; case NOTIFY_SCREEN_OFF: handleNotifyScreenOff(); return; case NOTIFY_SCREEN_ON: handleNotifyScreenOn(); return; case WAKE_WHEN_READY: handleWakeWhenReady(msg.arg1); return; case KEYGUARD_DONE: handleKeyguardDone(msg.arg1 != 0); return; case KEYGUARD_DONE_DRAWING: handleKeyguardDoneDrawing(); return; case KEYGUARD_DONE_AUTHENTICATING: keyguardDone(true); return; case SET_HIDDEN: handleSetHidden(msg.arg1 != 0); break; } } }; /** * @see #keyguardDone * @see #KEYGUARD_DONE */ private void handleKeyguardDone(boolean wakeup) { if (DEBUG) Log.d(TAG, "handleKeyguardDone"); handleHide(); if (wakeup) { mPM.userActivity(SystemClock.uptimeMillis(), true); } mWakeLock.release(); mContext.sendBroadcast(mUserPresentIntent); } /** * @see #keyguardDoneDrawing * @see #KEYGUARD_DONE_DRAWING */ private void handleKeyguardDoneDrawing() { synchronized(this) { if (false) Log.d(TAG, "handleKeyguardDoneDrawing"); if (mWaitingUntilKeyguardVisible) { if (DEBUG) Log.d(TAG, "handleKeyguardDoneDrawing: notifying mWaitingUntilKeyguardVisible"); mWaitingUntilKeyguardVisible = false; notifyAll(); // there will usually be two of these sent, one as a timeout, and one // as a result of the callback, so remove any remaining messages from // the queue mHandler.removeMessages(KEYGUARD_DONE_DRAWING); } } } /** * Handles the message sent by {@link #pokeWakelock} * @param seq used to determine if anything has changed since the message * was sent. * @see #TIMEOUT */ private void handleTimeout(int seq) { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleTimeout"); if (seq == mWakelockSequence) { mWakeLock.release(); } } } /** * Handle message sent by {@link #showLocked}. * @see #SHOW */ private void handleShow() { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleShow"); if (!mSystemReady) return; mKeyguardViewManager.show(); mShowing = true; adjustUserActivityLocked(); try { ActivityManagerNative.getDefault().closeSystemDialogs("lock"); } catch (RemoteException e) { } mShowKeyguardWakeLock.release(); } } /** * Handle message sent by {@link #hideLocked()} * @see #HIDE */ private void handleHide() { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleHide"); if (mWakeAndHandOff.isHeld()) { Log.w(TAG, "attempt to hide the keyguard while waking, ignored"); return; } mKeyguardViewManager.hide(); mShowing = false; adjustUserActivityLocked(); } } private void adjustUserActivityLocked() { // disable user activity if we are shown and not hidden if (DEBUG) Log.d(TAG, "adjustUserActivityLocked mShowing: " + mShowing + " mHidden: " + mHidden); boolean enabled = !mShowing || mHidden; mRealPowerManager.enableUserActivity(enabled); if (!enabled && mScreenOn) { // reinstate our short screen timeout policy pokeWakelock(); } } /** * Handle message sent by {@link #wakeWhenReadyLocked(int)} * @param keyCode The key that woke the device. * @see #WAKE_WHEN_READY */ private void handleWakeWhenReady(int keyCode) { synchronized (KeyguardViewMediator.this) { if (DBG_WAKE) Log.d(TAG, "handleWakeWhenReady(" + keyCode + ")"); // this should result in a call to 'poke wakelock' which will set a timeout // on releasing the wakelock if (!mKeyguardViewManager.wakeWhenReadyTq(keyCode)) { // poke wakelock ourselves if keyguard is no longer active Log.w(TAG, "mKeyguardViewManager.wakeWhenReadyTq did not poke wake lock, so poke it ourselves"); pokeWakelock(); } /** * Now that the keyguard is ready and has poked the wake lock, we can * release the handoff wakelock */ mWakeAndHandOff.release(); if (!mWakeLock.isHeld()) { Log.w(TAG, "mWakeLock not held in mKeyguardViewManager.wakeWhenReadyTq"); } } } /** * Handle message sent by {@link #resetStateLocked()} * @see #RESET */ private void handleReset() { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleReset"); mKeyguardViewManager.reset(); } } /** * Handle message sent by {@link #verifyUnlock} * @see #RESET */ private void handleVerifyUnlock() { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleVerifyUnlock"); mKeyguardViewManager.verifyUnlock(); mShowing = true; } } /** * Handle message sent by {@link #notifyScreenOffLocked()} * @see #NOTIFY_SCREEN_OFF */ private void handleNotifyScreenOff() { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleNotifyScreenOff"); mKeyguardViewManager.onScreenTurnedOff(); } } /** * Handle message sent by {@link #notifyScreenOnLocked()} * @see #NOTIFY_SCREEN_ON */ private void handleNotifyScreenOn() { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleNotifyScreenOn"); mKeyguardViewManager.onScreenTurnedOn(); } } }

diff --git a/kornell-gwt/src/main/java/kornell/gui/client/presentation/terms/generic/GenericTermsView.java b/kornell-gwt/src/main/java/kornell/gui/client/presentation/terms/generic/GenericTermsView.java index 03499e08..0ab3bb31 100644 --- a/kornell-gwt/src/main/java/kornell/gui/client/presentation/terms/generic/GenericTermsView.java +++ b/kornell-gwt/src/main/java/kornell/gui/client/presentation/terms/generic/GenericTermsView.java @@ -1,158 +1,158 @@ package kornell.gui.client.presentation.terms.generic; import java.util.ArrayList; import java.util.Map.Entry; import java.util.Set; import kornell.api.client.Callback; import kornell.api.client.KornellClient; import kornell.core.shared.data.Institution; import kornell.core.shared.data.Person; import kornell.core.shared.data.Registration; import kornell.core.shared.to.RegistrationsTO; import kornell.core.shared.to.UserInfoTO; import kornell.gui.client.KornellConstants; import kornell.gui.client.event.CourseBarEvent; import kornell.gui.client.event.InstitutionEvent; import kornell.gui.client.event.LogoutEvent; import kornell.gui.client.personnel.Dean; import kornell.gui.client.presentation.course.CoursePlace; import kornell.gui.client.presentation.terms.TermsView; import kornell.gui.client.presentation.vitrine.VitrinePlace; import kornell.gui.client.presentation.welcome.generic.GenericMenuLeftView; import com.github.gwtbootstrap.client.ui.Image; import com.github.gwtbootstrap.client.ui.Paragraph; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceController; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import com.google.web.bindery.event.shared.EventBus; public class GenericTermsView extends Composite implements TermsView { interface MyUiBinder extends UiBinder<Widget, GenericTermsView> { } private static MyUiBinder uiBinder = GWT.create(MyUiBinder.class); @UiField Paragraph titleUser; @UiField Paragraph txtTitle; @UiField Paragraph txtTerms; @UiField Button btnAgree; @UiField Button btnDontAgree; @UiField Image institutionLogo; Registration registration; Institution institution; UserInfoTO user; private KornellClient client; private PlaceController placeCtrl; private Place defaultPlace; private String barLogoFileName = "logo300x80.png"; private KornellConstants constants = GWT.create(KornellConstants.class); private GenericMenuLeftView menuLeftView; private final EventBus bus; public GenericTermsView(EventBus bus, KornellClient client, PlaceController placeCtrl, Place defaultPlace) { this.bus = bus; this.client = client; this.placeCtrl = placeCtrl; this.defaultPlace = defaultPlace; initWidget(uiBinder.createAndBindUi(this)); initData(); // TODO i18n txtTitle.setText("Termos de Uso".toUpperCase()); txtTerms.setText("[Carregando, aguarde...]"); btnAgree.setText("Concordo".toUpperCase()); btnDontAgree.setText("Não Concordo".toUpperCase()); } private void initData() { client.getCurrentUser(new Callback<UserInfoTO>() { @Override protected void ok(UserInfoTO userTO) { user = userTO; paint(); } }); //TODO: Improve client API (eg. client.registrations().getUnsigned(); client.registrations().getUnsigned(new Callback<RegistrationsTO>() { @Override protected void ok(RegistrationsTO to) { Set<Entry<Registration, Institution>> entrySet = to .getRegistrationsWithInstitutions().entrySet(); ArrayList<Entry<Registration, Institution>> regs = new ArrayList<Entry<Registration, Institution>>( entrySet); //TODO: Handle multiple unsigned terms if(regs.size() > 0) { Entry<Registration, Institution> e = regs.get(0); registration = e.getKey(); institution = e.getValue(); InstitutionEvent institutionEvent = new InstitutionEvent(); institutionEvent.setInstitution(institution); bus.fireEvent(institutionEvent); paint(); }else { GWT.log("OPS! Should not be here if nothing to sign"); goStudy(); } } }); } private void paint() { Person p = user.getPerson(); titleUser.setText(p.getFullName()); if(institution != null){ txtTerms.getElement().setInnerHTML(institution.getTerms()); institutionLogo.setUrl(institution.getAssetsURL() + barLogoFileName); } } // TODO: Uncomment @UiHandler("btnAgree") void handleClickAll(ClickEvent e) { - client.institution(institution.getUUID()).acceptTerms(new Callback<Void>(){ - @Override - protected void ok() { + //client.institution(institution.getUUID()).acceptTerms(new Callback<Void>(){ + //@Override + //protected void ok() { goStudy(); - } - }); + //} + //}); } @UiHandler("btnDontAgree") void handleClickInProgress(ClickEvent e) { bus.fireEvent(new LogoutEvent()); } @Override public void setPresenter(Presenter presenter) { } private void goStudy() { placeCtrl.goTo(new CoursePlace(constants.getDefaultCourseUUID())); } } \ No newline at end of file

diff --git a/EquationSystem.java b/EquationSystem.java index 38f1f48..edc6fe6 100644 --- a/EquationSystem.java +++ b/EquationSystem.java @@ -1,834 +1,834 @@ package applets.Termumformungen$in$der$Technik_01_URI; import java.math.BigInteger; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; public class EquationSystem { Set<String> baseUnits = new HashSet<String>(); static class Unit { static class Pot { String baseUnit; int pot; Pot(String u) { baseUnit = u; pot = 1; } Pot(String u, int p) { baseUnit = u; pot = p; } @Override public String toString() { return baseUnit + ((pot != 1) ? ("^" + pot) : ""); } } List<Pot> facs = new LinkedList<Pot>(); void init(String str) { int state = 0; String curPot = ""; String curBaseUnit = ""; for(int i = 0; i <= str.length(); ++i) { int c = (i < str.length()) ? str.charAt(i) : 0; boolean finishCurrent = false; if(c == '^') { if(state != 0) throw new AssertionError("bad ^ at " + i); if(curBaseUnit.isEmpty()) throw new AssertionError("missing unit, bad ^ at " + i); state = 1; } else if(c >= '0' && c <= '9' || c == '-') { if(state == 0) curBaseUnit += (char)c; else curPot += (char)c; } else if(c == ' ' || c == 0) { if(state == 0 && !curBaseUnit.isEmpty()) finishCurrent = true; if(state == 1 && !curPot.isEmpty()) finishCurrent = true; } else { if(state == 1) throw new AssertionError("invalid char " + (char)c + " at " + i); curBaseUnit += (char)c; } if(finishCurrent) { Pot p = new Pot(curBaseUnit); if(state > 0) p.pot = Integer.parseInt(curPot); facs.add(p); state = 0; curBaseUnit = ""; curPot = ""; } } } void simplify() { Map<String,Integer> pot = new HashMap<String, Integer>(); for(Pot p : this.facs) { int oldPot = pot.containsKey(p.baseUnit) ? pot.get(p.baseUnit) : 0; pot.put(p.baseUnit, oldPot + p.pot); } facs.clear(); for(String u : pot.keySet()) { if(pot.get(u) != 0) facs.add(new Pot(u, pot.get(u))); } } Unit(String str) { init(str); simplify(); } Unit(String str, Set<String> allowedBaseUnits) { init(str); simplify(); for(Pot p : facs) if(!allowedBaseUnits.contains(p.baseUnit)) throw new AssertionError("unit " + p.baseUnit + " not allowed"); } @Override public String toString() { return Utils.concat(facs, " "); } } Set<String> variableSymbols = new HashSet<String>(); void registerVariableSymbol(String var) { variableSymbols.add(var); } static abstract class Expression { <T> T castTo(Class<T> clazz) { if(clazz.isAssignableFrom(getClass())) return clazz.cast(this); if(clazz.isAssignableFrom(String.class)) return clazz.cast(asVariable()); if(clazz.isAssignableFrom(Integer.class)) return clazz.cast(asNumber()); try { return clazz.getConstructor(getClass()).newInstance(this); } catch (Exception e) {} throw new AssertionError("unknown type: " + clazz); } String asVariable() { return castTo(Equation.Sum.Prod.Pot.class).asVariable(); } Integer asNumber() { return castTo(Equation.Sum.Prod.class).asNumber(); } boolean equalsToNum(int num) { Integer myNum = asNumber(); if(myNum != null) return myNum == num; return false; } abstract Iterable<? extends Expression> childs(); Iterable<String> vars() { Iterable<Iterable<String>> varIters = Utils.map(childs(), new Utils.Function<Expression, Iterable<String>>() { public Iterable<String> eval(Expression obj) { return obj.vars(); } }); return Utils.concatCollectionView(varIters); } abstract String baseOp(); Utils.OperatorTree asOperatorTree() { Utils.OperatorTree ot = new Utils.OperatorTree(); ot.op = baseOp(); for(Expression child : childs()) ot.entities.add(new Utils.OperatorTree.Subtree(child.asOperatorTree())); return ot; } } static class Equation /*extends Expression*/ implements Comparable<Equation> { static class Sum extends Expression implements Comparable<Sum> { static class Prod extends Expression implements Comparable<Prod> { int fac = 0; static class Pot extends Expression implements Comparable<Pot> { String sym; int pot = 1; @Override public String toString() { return sym + ((pot != 1) ? ("^" + pot) : ""); } Pot(String s) { sym = s; } Pot(String s, int p) { sym = s; pot = p; } public int compareTo(Pot o) { int c = sym.compareTo(o.sym); if(c != 0) return c; if(pot < o.pot) return -1; if(pot > o.pot) return 1; return 0; } @Override public int hashCode() { int result = 1; result = 31 * result + pot; result = 31 * result + ((sym == null) ? 0 : sym.hashCode()); return result; } @Override public boolean equals(Object obj) { if(!(obj instanceof Pot)) return false; return compareTo((Pot) obj) == 0; } @Override Integer asNumber() { if(pot == 0) return 1; return null; } @Override String asVariable() { if(pot == 1) return sym; return null; } @Override Iterable<String> vars() { return Utils.listFromArgs(sym); } @Override Iterable<? extends Expression> childs() { return Utils.listFromArgs(); } @Override String baseOp() { return "∙"; } @Override Utils.OperatorTree asOperatorTree() { if(pot == 0) return new Utils.OperatorTree("", new Utils.OperatorTree.RawString("1")); Utils.OperatorTree ot = new Utils.OperatorTree(); if(pot > 0) { ot.op = (pot > 1) ? baseOp() : ""; for(int i = 0; i < pot; ++i) ot.entities.add(new Utils.OperatorTree.RawString(sym)); return ot; } else { ot.op = "/"; ot.entities.add(new Utils.OperatorTree.RawString("1")); ot.entities.add(new Utils.OperatorTree.Subtree(new Pot(sym, -pot).asOperatorTree())); } return ot; } } List<Pot> facs = new LinkedList<Pot>(); public int compareTo(Prod o) { int r = Utils.<Pot>orderOnCollection().compare(facs, o.facs); if(r != 0) return r; if(fac < o.fac) return -1; if(fac > o.fac) return 1; return 0; } @Override public boolean equals(Object obj) { if(!(obj instanceof Prod)) return false; return compareTo((Prod) obj) == 0; } @Override Integer asNumber() { if(fac == 0) return 0; if(facs.isEmpty()) return fac; return null; } @Override <T> T castTo(Class<T> clazz) { if(clazz.isAssignableFrom(Pot.class)) { if(facs.size() == 1) return clazz.cast(facs.get(0)); return null; } return super.castTo(clazz); } boolean isZero() { return fac == 0; } boolean isOne() { return fac == 1 && facs.isEmpty(); } @Override public String toString() { if(facs.isEmpty()) return "" + fac; if(fac == 1) return Utils.concat(facs, " ∙ "); if(fac == -1) return "-" + Utils.concat(facs, " ∙ "); return fac + " ∙ " + Utils.concat(facs, " ∙ "); } Map<String,Integer> varMap() { Map<String,Integer> vars = new TreeMap<String,Integer>(); for(Pot p : facs) { if(!vars.containsKey(p.sym)) vars.put(p.sym, 0); vars.put(p.sym, vars.get(p.sym) + p.pot); } return vars; } Prod normalize() { Prod prod = new Prod(); prod.fac = fac; Map<String,Integer> vars = varMap(); for(String sym : vars.keySet()) { if(vars.get(sym) != 0) prod.facs.add(new Pot(sym, vars.get(sym))); } return prod; } Prod minusOne() { return new Prod(-fac, facs); } Prod divideAndRemove(String var) { Prod prod = normalize(); for(Iterator<Pot> pit = prod.facs.iterator(); pit.hasNext(); ) { Pot p = pit.next(); if(p.sym.equals(var)) { if(p.pot == 1) { pit.remove(); return prod; } break; } } return null; // var not included or not pot=1 } Prod mult(Prod other) { Prod res = new Prod(); res.fac = fac * other.fac; res.facs.addAll(facs); res.facs.addAll(other.facs); return res.normalize(); } Prod divide(Prod other) { if(!(other.fac != 0)) throw new AssertionError("other.fac != 0 failed"); if(!(fac % other.fac == 0)) throw new AssertionError("fac % other.fac == 0 failed"); Prod res = new Prod(); res.fac = fac / other.fac; res.facs.addAll(facs); for(Pot p : other.facs) res.facs.add(new Pot(p.sym, -p.pot)); return res.normalize(); } Prod commonBase(Prod other) { Prod base = new Prod(); base.fac = BigInteger.valueOf(fac).gcd(BigInteger.valueOf(other.fac)).intValue(); Map<String,Integer> varMap1 = varMap(); Map<String,Integer> varMap2 = other.varMap(); Set<String> commonVars = new HashSet<String>(); commonVars.addAll(varMap1.keySet()); commonVars.retainAll(varMap2.keySet()); for(String var : commonVars) { Pot pot = new Pot(var); pot.pot = Math.min(varMap1.get(var), varMap2.get(var)); if(pot.pot != 0) base.facs.add(pot); } return base; } @Override Iterable<? extends Expression> childs() { return facs; } Prod() {} Prod(int num) { this.fac = num; } Prod(String var) { fac = 1; facs.add(new Pot(var)); } Prod(int fac, List<Pot> facs) { this.fac = fac; this.facs = facs; } Prod(Iterable<String> vars) { fac = 1; for(String v : vars) facs.add(new Pot(v)); } Prod(Utils.OperatorTree ot) throws ParseError { fac = 1; parse(ot); } void parse(Utils.OperatorTree ot) throws ParseError { if(ot.canBeInterpretedAsUnaryPrefixed() && ot.op.equals("-")) { fac = -fac; parse(ot.unaryPrefixedContent().asTree()); } else if(ot.op.equals("∙") || ot.entities.size() <= 1) { for(Utils.OperatorTree.Entity e : ot.entities) { if(e instanceof Utils.OperatorTree.RawString) { String s = ((Utils.OperatorTree.RawString) e).content; try { fac *= Integer.parseInt(s); } catch(NumberFormatException ex) { String var = s; facs.add(new Pot(var)); } } else parse( ((Utils.OperatorTree.Subtree) e).content ); } } else throw new ParseError("'" + ot + "' must be a product.", "'" + ot + "' muss ein Produkt sein."); if(facs.isEmpty()) throw new ParseError("'" + ot + "' must contain at least one variable.", "'" + ot + "' muss mindestens eine Variable enthalten."); } @Override String baseOp() { return "∙"; } } List<Prod> entries = new LinkedList<Prod>(); @Override public String toString() { return Utils.concat(entries, " + "); } public int compareTo(Sum o) { return Utils.<Prod>orderOnCollection().compare(entries, o.entries); } @Override public boolean equals(Object obj) { if(!(obj instanceof Sum)) return false; return compareTo((Sum) obj) == 0; } boolean isZero() { return entries.isEmpty(); } boolean isOne() { return entries.size() == 1 && entries.get(0).isOne(); } Sum normalize() { Sum sum = new Sum(); List<Prod> newEntries = new LinkedList<Prod>(); for(Prod prod : entries) newEntries.add(prod.normalize()); Collections.sort(newEntries); Prod lastProd = null; for(Prod prod : newEntries) { if(lastProd != null && lastProd.facs.equals(prod.facs)) lastProd.fac += prod.fac; else { lastProd = prod; sum.entries.add(lastProd); } } for(Iterator<Prod> pit = sum.entries.iterator(); pit.hasNext();) { if(pit.next().isZero()) pit.remove(); } return sum; } Sum minusOne() { Sum sum = new Sum(); for(Prod prod : entries) sum.entries.add(prod.minusOne()); return sum; } Sum sum(Sum other) { Sum sum = new Sum(); sum.entries.addAll(entries); sum.entries.addAll(other.entries); return sum; } Sum mult(Prod other) { Sum sum = new Sum(); if(other.isZero()) return sum; for(Prod p : entries) sum.entries.add(p.mult(other)); return sum; } Sum mult(Sum other) { Sum sum = new Sum(); for(Prod p : other.entries) sum.entries.addAll( mult(p).entries ); return sum; } Sum divide(Sum other) { if(other.isZero()) throw new AssertionError("division by 0"); if(other.entries.size() > 1) throw new AssertionError("not supported right now"); Sum sum = new Sum(); for(Prod p : entries) sum.entries.add(p.divide(other.entries.get(0))); return sum; } Sum commomBase(Sum other) { if(isZero() || other.isZero()) return new Sum(); if(entries.size() > 1 || other.entries.size() > 1) return new Sum(1); // we should optimize this maybe later... return new Sum(entries.get(0).commonBase(other.entries.get(0))); } @Override Iterable<? extends Expression> childs() { return entries; } static class ExtractedVar { String var; Sum varMult = new Sum(); Sum independentPart = new Sum(); } ExtractedVar extractVar(String var) { ExtractedVar extracted = new ExtractedVar(); extracted.var = var; for(Prod p : entries) { if(p.isZero()) continue; Prod newP = p.divideAndRemove(var); if(newP != null) extracted.varMult.entries.add(newP); else extracted.independentPart.entries.add(p); } if(!extracted.varMult.entries.isEmpty()) return extracted; return null; } Sum() {} Sum(String var) { entries.add(new Prod(var)); } Sum(Prod prod) { entries.add(prod); } Sum(int num) { entries.add(new Prod(num)); } Sum(Utils.OperatorTree left, Utils.OperatorTree right) throws ParseError { this(Utils.OperatorTree.MergedEquation(left, right) .transformMinusToPlus() .simplify() .transformMinusPushedDown() .multiplyAllDivisions() .pushdownAllMultiplications()); } Sum(Utils.OperatorTree ot) throws ParseError { add(ot); } void add(Utils.OperatorTree ot) throws ParseError { if(ot.entities.isEmpty()) return; if(ot.entities.size() == 1) { Utils.OperatorTree.Entity e = ot.entities.get(0); if(e instanceof Utils.OperatorTree.Subtree) add(((Utils.OperatorTree.Subtree) e).content); else entries.add(new Prod(ot)); return; } if(ot.canBeInterpretedAsUnaryPrefixed() && ot.op.equals("-")) { Utils.OperatorTree.Entity e = ot.unaryPrefixedContent(); try { entries.add(new Prod(e.asTree()).minusOne()); } catch(ParseError exc) { throw new ParseError( "Prefix '-' only allowed for single products: " + ot + "; " + exc.english, "Prexif '-' nur für einzelne Produkte erlaubt: " + ot + "; " + exc.german); } return; } if(ot.op.equals("+")) { for(Utils.OperatorTree.Entity e : ot.entities) add(e.asTree()); } else if(ot.op.equals("∙")) { entries.add(new Prod(ot)); } else // all necessary transformation should have been done already (e.g. in Sum(left,right)) throw new ParseError("'" + ot.op + "' not supported.", "'" + ot.op + "' nicht unterstützt."); } @Override String baseOp() { return "+"; } boolean isTautology() { return normalize().isZero(); } Equation asEquation() { return new Equation(asOperatorTree(), Utils.OperatorTree.Zero()); } } Utils.OperatorTree left, right; @Override public String toString() { return left.toString() + " = " + right.toString(); } public int compareTo(Equation o) { int r = left.compareTo(o.left); if(r != 0) return r; return right.compareTo(o.right); } @Override public boolean equals(Object obj) { if(!(obj instanceof Equation)) return false; return compareTo((Equation) obj) == 0; } Sum normalizedSum__throwExc() throws ParseError { return new Sum(left, right).normalize(); } Sum normalizedSum() { try { return normalizedSum__throwExc(); } catch (ParseError e) { // this should not happen; we should have checked that in the constructor e.printStackTrace(); return null; } } Equation normalize() { return normalizedSum().asEquation(); } // Equation minusOne() { return new Equation(left.minusOne(), right.minusOne()); } boolean isTautology() { return normalizedSum().isZero(); } boolean equalNorm(Equation other) { Sum myNorm = normalizedSum(); Sum otherNorm = other.normalizedSum(); if(myNorm.equals(otherNorm)) return true; if(myNorm.equals(otherNorm.minusOne())) return true; return false; } // @Override Iterable<? extends Expression> childs() { return Utils.listFromArgs(left, right); } Iterable<String> vars() { return Utils.concatCollectionView(left.vars(), right.vars()); } - Equation() {} + Equation() { left = new Utils.OperatorTree(); right = new Utils.OperatorTree(); } Equation(Utils.OperatorTree left, Utils.OperatorTree right) { this.left = left; this.right = right; } Equation(Utils.OperatorTree ot) throws ParseError { try { if(ot.entities.size() == 0) throw new ParseError("Please give me an equation.", "Bitte Gleichung eingeben."); if(!ot.op.equals("=")) throw new ParseError("'=' at top level required.", "'=' benötigt."); if(ot.entities.size() == 1) throw new ParseError("An equation with '=' needs two sides.", "'=' muss genau 2 Seiten haben."); if(ot.entities.size() > 2) throw new ParseError("Sorry, only two parts for '=' allowed.", "'=' darf nicht mehr als 2 Seiten haben."); left = ot.entities.get(0).asTree(); right = ot.entities.get(1).asTree(); normalizedSum__throwExc(); // do some checks (bad ops etc) } catch(ParseError e) { e.ot = ot; throw e; } } Equation(String str) throws ParseError { this(Utils.OperatorTree.parse(str)); } Equation(Utils.OperatorTree ot, Set<String> allowedVars) throws ParseError { this(ot); assertValidVars(allowedVars); } Equation(String str, Set<String> allowedVars) throws ParseError { this(str); assertValidVars(allowedVars); } void assertValidVars(Set<String> allowedVars) throws ParseError { for(String var : vars()) { if(!allowedVars.contains(var)) throw new ParseError("Variable '" + var + "' is unknown.", "Die Variable '" + var + "' ist unbekannt."); } } /*void swap(Equation eq) { Equation tmp = new Equation(left, right); left = eq.left; right = eq.right; eq.left = tmp.left; eq.right = tmp.right; }*/ static class ParseError extends Exception { private static final long serialVersionUID = 1L; String english, german; Utils.OperatorTree ot; public ParseError(String english, String german) { super(english); this.english = english; this.german = german; } public ParseError(ParseError e) { super(e.english); this.english = e.english; this.german = e.german; } } } void debugEquation(Utils.OperatorTree ot) { ot = ot.simplify().transformMinusToPlus(); System.out.print("normalised input: " + ot + ", "); try { Equation eq = new Equation(ot, variableSymbols); System.out.println("parsed: " + eq + ", normalised eq: " + eq.normalize()); } catch (Equation.ParseError e) { System.out.println("error while parsing " + ot + ": " + e.getMessage()); } } Collection<Equation> equations = new LinkedList<Equation>(); EquationSystem() {} EquationSystem(Set<String> variableSymbols) { this.variableSymbols = variableSymbols; } EquationSystem(Collection<Equation> equations, Set<String> variableSymbols) { this.equations = equations; this.variableSymbols = variableSymbols; } EquationSystem extendedSystem(Collection<Equation> additionalEquations) { return new EquationSystem( Utils.extendedCollectionView(equations, additionalEquations), variableSymbols); } EquationSystem extendedSystem() { return extendedSystem(new LinkedList<Equation>()); } EquationSystem normalized() { return new EquationSystem( Utils.map(equations, new Utils.Function<Equation,Equation>() { public Equation eval(Equation obj) { return obj.normalize(); } }), variableSymbols); } Iterable<Equation.Sum> normalizedSums() { return Utils.map(equations, new Utils.Function<Equation,Equation.Sum>() { public Equation.Sum eval(Equation obj) { return obj.normalizedSum(); } }); } EquationSystem linearIndependent() { EquationSystem eqSys = new EquationSystem(variableSymbols); for(Equation eq : equations) if(!eqSys.canConcludeTo(eq)) eqSys.equations.add(eq); return eqSys; } Equation add(String equStr) throws Equation.ParseError { Equation eq = new Equation(equStr, variableSymbols); equations.add(eq); return eq; } boolean contains(Equation eq) { for(Equation e : equations) { if(eq.equals(e)) return true; } return false; } private static boolean _canConcludeTo(Collection<Equation.Sum> baseEquations, Equation.Sum eq, Set<Equation.Sum> usedEquationList) { //System.out.println("to? " + eq); //dump(); Set<Equation.Sum> equations = new TreeSet<Equation.Sum>(baseEquations); if(equations.contains(eq)) return true; for(Equation.Sum myEq : baseEquations) { if(usedEquationList.contains(myEq)) continue; Collection<Equation.Sum> allConclusions = calcAllConclusions(eq, myEq); if(allConclusions.isEmpty()) continue; usedEquationList.add(myEq); equations.remove(myEq); Set<Equation.Sum> results = new TreeSet<Equation.Sum>(); for(Equation.Sum resultingEq : allConclusions) { if(resultingEq.isTautology()) return true; if(results.contains(resultingEq)) continue; results.add(resultingEq); if(_canConcludeTo(equations, resultingEq, usedEquationList)) return true; } equations.add(myEq); } return false; } boolean canConcludeTo(Equation eq) { return _canConcludeTo(Utils.collFromIter(normalizedSums()), eq.normalizedSum(), new TreeSet<Equation.Sum>()); } EquationSystem allConclusions() { return calcAllConclusions(null); } private static Set<String> commonVars(Equation.Sum eq1, Equation.Sum eq2) { Set<String> commonVars = new HashSet<String>(Utils.collFromIter(eq1.vars())); commonVars.retainAll(new HashSet<String>(Utils.collFromIter(eq2.vars()))); return commonVars; } private static List<Equation.Sum> calcAllConclusions(Equation.Sum eq1, Equation.Sum eq2) { List<Equation.Sum> results = new LinkedList<Equation.Sum>(); if(eq1.isTautology()) return results; if(eq2.isTautology()) return results; //System.out.println("vars in first equ " + pair.first + ": " + Utils.collFromIter(pair.first.vars())); //System.out.println("vars in second equ " + pair.second + ": " + Utils.collFromIter(pair.second.vars())); Set<String> commonVars = commonVars(eq1, eq2); //System.out.println("common vars in " + pair.first + " and " + pair.second + ": " + commonVars); for(String var : commonVars) { Equation.Sum.ExtractedVar extract1 = eq1.extractVar(var); Equation.Sum.ExtractedVar extract2 = eq2.extractVar(var); if(extract1 == null) continue; // can happen if we have higher order polynoms if(extract2 == null) continue; // can happen if we have higher order polynoms if(extract1.varMult.entries.size() != 1) continue; // otherwise not supported yet if(extract2.varMult.entries.size() != 1) continue; // otherwise not supported yet Equation.Sum.Prod varMult1 = extract1.varMult.entries.get(0); Equation.Sum.Prod varMult2 = extract2.varMult.entries.get(0); Equation.Sum.Prod commonBase = varMult1.commonBase(varMult2); varMult1 = varMult1.divide(commonBase); varMult2 = varMult2.divide(commonBase); if(!(!varMult1.varMap().containsKey(var))) throw new AssertionError("!varMult1.varMap().containsKey(var) failed"); // we tried to remove that if(!(!varMult2.varMap().containsKey(var))) throw new AssertionError("!varMult2.varMap().containsKey(var) failed"); // we tried to remove that Equation.Sum newSum1 = eq1.mult(varMult2); Equation.Sum newSum2 = eq2.mult(varMult1.minusOne()); Equation.Sum resultingEquation = newSum1.sum(newSum2); results.add(resultingEquation); } return results; } private EquationSystem calcAllConclusions(Equation breakIfThisEquIsFound) { if(breakIfThisEquIsFound != null) { breakIfThisEquIsFound = breakIfThisEquIsFound.normalize(); if(contains(breakIfThisEquIsFound)) return null; } // map values are the set of used based equations Map<Equation.Sum, Set<Equation.Sum>> resultingEquations = new TreeMap<Equation.Sum, Set<Equation.Sum>>(); Set<Equation.Sum> normalizedEquations = new TreeSet<Equation.Sum>(Utils.collFromIter(normalizedSums())); Iterable<Equation.Sum> nextEquations = normalizedEquations; int iteration = 0; while(true) { iteration++; List<Equation.Sum> newResults = new LinkedList<Equation.Sum>(); for(Utils.Pair<Equation.Sum,Equation.Sum> pair : Utils.allPairs(normalizedEquations, nextEquations) ) { // if we have used the same base equation in this resulted equation already, skip this one if(resultingEquations.containsKey(pair.second) && resultingEquations.get(pair.second).contains(pair.first)) continue; for(Equation.Sum resultingEquation : calcAllConclusions(pair.first, pair.second)) { if(!resultingEquation.isTautology() && !resultingEquations.containsKey(resultingEquation)) { //System.out.println("in iteration " + iteration + ": " + pair.first + " and " + pair.second + " -> " + resultingEquation); resultingEquations.put(resultingEquation, new TreeSet<Equation.Sum>(Utils.listFromArgs(pair.first))); if(normalizedEquations.contains(pair.second)) resultingEquations.get(resultingEquation).add(pair.second); else resultingEquations.get(resultingEquation).addAll(resultingEquations.get(pair.second)); newResults.add(resultingEquation); if(breakIfThisEquIsFound != null) { if(breakIfThisEquIsFound.equals(resultingEquation)) return null; if(breakIfThisEquIsFound.equals(resultingEquation.minusOne())) return null; } } } } nextEquations = newResults; if(newResults.isEmpty()) break; if(iteration >= normalizedEquations.size()) break; } /* System.out.println("{"); for(Equation e : normalizedEquations) System.out.println(" " + e); for(Equation e : resultingEquations) System.out.println("-> " + e); System.out.println("}"); */ Iterable<Equation.Sum> concludedEquSums = Utils.concatCollectionView(normalizedEquations, resultingEquations.keySet()); Iterable<Equation> concludedNormedEqu = Utils.map(concludedEquSums, new Utils.Function<Equation.Sum,Equation>() { public Equation eval(Equation.Sum obj) { return obj.asEquation(); } }); return new EquationSystem(new LinkedList<Equation>(Utils.collFromIter(concludedNormedEqu)), variableSymbols); } void dump() { System.out.println("equations: ["); for(Equation e : equations) System.out.println(" " + e + " ,"); System.out.println(" ]"); } void assertCanConcludeTo(String eqStr) throws Equation.ParseError { Equation eq = new Equation(eqStr, variableSymbols); if(!canConcludeTo(eq)) { debugEquationParsing(eqStr); throw new AssertionError("must follow: " + eq); } } void assertAndAdd(String eqStr) throws Equation.ParseError { assertCanConcludeTo(eqStr); add(eqStr); } static void debugEquationParsing(String equ) throws Equation.ParseError { Utils.OperatorTree ot = Utils.OperatorTree.parse(equ); if(!ot.op.equals("=")) throw new Equation.ParseError("'" + equ + "' must have '=' at the root.", ""); if(ot.entities.size() != 2) throw new Equation.ParseError("'" + equ + "' must have '=' with 2 sides.", ""); Utils.OperatorTree left = ot.entities.get(0).asTree(), right = ot.entities.get(1).asTree(); System.out.println("equ (" + left.debugStringDouble() + ") = (" + right.debugStringDouble() + "): {"); ot = Utils.OperatorTree.MergedEquation(left, right); System.out.println(" merge: " + ot.debugStringDouble()); ot = ot.transformMinusToPlus(); System.out.println(" transformMinusToPlus: " + ot.debugStringDouble()); ot = ot.simplify(); System.out.println(" simplify: " + ot.debugStringDouble()); ot = ot.transformMinusPushedDown(); System.out.println(" transformMinusPushedDown: " + ot.debugStringDouble()); ot = ot.multiplyAllDivisions(); System.out.println(" multiplyAllDivisions: " + ot.debugStringDouble()); ot = ot.pushdownAllMultiplications(); System.out.println(" pushdownAllMultiplications: " + ot.debugStringDouble()); System.out.println("}"); } static void debug() { EquationSystem sys = new EquationSystem(); for(int i = 1; i <= 10; ++i) sys.registerVariableSymbol("x" + i); for(int i = 1; i <= 10; ++i) sys.registerVariableSymbol("U" + i); for(int i = 1; i <= 10; ++i) sys.registerVariableSymbol("R" + i); for(int i = 1; i <= 10; ++i) sys.registerVariableSymbol("I" + i); try { //debugEquationParsing("x3 - x4 - x5 = 0"); sys.add("x3 - x4 - x5 = 0"); sys.add("-x2 + x5 = 0"); sys.add("-x1 + x2 = 0"); sys.assertCanConcludeTo("x1 - x3 + x4 = 0"); sys.equations.clear(); sys.add("x1 * x2 = 0"); sys.add("x1 = x3"); sys.assertCanConcludeTo("x2 * x3 = 0"); sys.equations.clear(); sys.add("x1 = x2 + x3"); sys.assertCanConcludeTo("x1 / x5 = (x2 + x3) / x5"); sys.assertCanConcludeTo("x1 * x5 = x2 * x5 + x3 * x5"); sys.equations.clear(); sys.add("x1 + x2 * x3 + x4 + x5 * x6 = 0"); sys.equations.clear(); sys.add("x1 = x2 ∙ x3 - x4 - x5"); sys.assertCanConcludeTo("x1 / x2 = x3 - x4 / x2 - x5 / x2"); sys.equations.clear(); sys.add("x1 = x2 ∙ x3 - x4 - x5"); sys.add("x6 = x2"); sys.assertCanConcludeTo("x1 / x6 = x3 - x4 / x6 - x5 / x6"); sys.equations.clear(); sys.add("U3 = R2 ∙ I2"); sys.add("I3 = I4 + I2"); sys.add("U3 / I3 = R2 ∙ I2 / I3"); sys.assertCanConcludeTo("I2 = U3 / R2"); sys.assertCanConcludeTo("U3 / I3 = R2 ∙ I2 / (I4 + I2)"); sys.equations.clear(); } catch (Equation.ParseError e) { System.out.println("Error: " + e.english); Utils.OperatorTree.debugOperatorTreeDump = true; System.out.println(" in " + e.ot); Utils.OperatorTree.debugOperatorTreeDump = false; e.printStackTrace(System.out); } catch (Throwable e) { e.printStackTrace(System.out); } } }

diff --git a/src/framework/tests/java/com/flexive/tests/embedded/SearchEngineTest.java b/src/framework/tests/java/com/flexive/tests/embedded/SearchEngineTest.java index be89fb5a..0738ff64 100644 --- a/src/framework/tests/java/com/flexive/tests/embedded/SearchEngineTest.java +++ b/src/framework/tests/java/com/flexive/tests/embedded/SearchEngineTest.java @@ -1,780 +1,782 @@ /*************************************************************** * This file is part of the [fleXive](R) project. * * Copyright (c) 1999-2008 * UCS - unique computing solutions gmbh (http://www.ucs.at) * All rights reserved * * The [fleXive](R) project is free software; you can redistribute * it and/or modify it under the terms of the GNU General Public * License as published by the Free Software Foundation; * either version 2 of the License, or (at your option) any * later version. * * The GNU General Public License can be found at * http://www.gnu.org/copyleft/gpl.html. * A copy is found in the textfile GPL.txt and important notices to the * license from the author are found in LICENSE.txt distributed with * these libraries. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * For further information about UCS - unique computing solutions gmbh, * please see the company website: http://www.ucs.at * * For further information about [fleXive](R), please see the * project website: http://www.flexive.org * * * This copyright notice MUST APPEAR in all copies of the file! ***************************************************************/ package com.flexive.tests.embedded; import com.flexive.shared.CacheAdmin; import com.flexive.shared.EJBLookup; import com.flexive.shared.FxContext; import com.flexive.shared.tree.FxTreeNode; import com.flexive.shared.tree.FxTreeMode; import com.flexive.shared.tree.FxTreeNodeEdit; import com.flexive.shared.workflow.Step; import com.flexive.shared.workflow.StepDefinition; import com.flexive.shared.content.FxPK; import com.flexive.shared.content.FxContent; import com.flexive.shared.exceptions.FxApplicationException; import com.flexive.shared.exceptions.FxNoAccessException; import com.flexive.shared.search.*; import com.flexive.shared.search.query.PropertyValueComparator; import com.flexive.shared.search.query.QueryOperatorNode; import com.flexive.shared.search.query.SqlQueryBuilder; import com.flexive.shared.search.query.VersionFilter; import com.flexive.shared.security.*; import com.flexive.shared.structure.FxType; import com.flexive.shared.structure.FxDataType; import com.flexive.shared.structure.FxPropertyAssignment; import com.flexive.shared.value.*; import static com.flexive.tests.embedded.FxTestUtils.login; import static com.flexive.tests.embedded.FxTestUtils.logout; import static org.testng.Assert.assertEquals; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.annotations.DataProvider; import org.testng.Assert; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.collections.CollectionUtils; import java.util.*; /** * FxSQL search query engine tests. * <p/> * Test data is created in init1201_testcontent.gy ! * * @author Daniel Lichtenberger ([email protected]), UCS - unique computing solutions gmbh (http://www.ucs.at) * @version $Rev$ */ @Test(groups = {"ejb", "search"}) public class SearchEngineTest { private static final String TEST_SUFFIX = "SearchProp"; private static final String TEST_TYPE = "SearchTest"; private static final Map<String, FxDataType> TEST_PROPS = new HashMap<String, FxDataType>(); static { TEST_PROPS.put("string", FxDataType.String1024); TEST_PROPS.put("text", FxDataType.Text); TEST_PROPS.put("html", FxDataType.HTML); TEST_PROPS.put("number", FxDataType.Number); TEST_PROPS.put("largeNumber", FxDataType.LargeNumber); TEST_PROPS.put("float", FxDataType.Float); TEST_PROPS.put("double", FxDataType.Double); TEST_PROPS.put("date", FxDataType.Date); TEST_PROPS.put("dateTime", FxDataType.DateTime); TEST_PROPS.put("boolean", FxDataType.Boolean); TEST_PROPS.put("binary", FxDataType.Binary); TEST_PROPS.put("reference", FxDataType.Reference); TEST_PROPS.put("selectOne", FxDataType.SelectOne); TEST_PROPS.put("selectMany", FxDataType.SelectMany); TEST_PROPS.put("dateRange", FxDataType.DateRange); TEST_PROPS.put("dateTimeRange", FxDataType.DateTimeRange); } private int testInstanceCount; // number of instances for the SearchTest type private final List<Long> generatedNodeIds = new ArrayList<Long>(); @BeforeClass public void setup() throws Exception { login(TestUsers.REGULAR); final List<FxPK> testPks = new SqlQueryBuilder().select("@pk").type(TEST_TYPE).getResult().collectColumn(1); testInstanceCount = testPks.size(); assert testInstanceCount > 0 : "No instances of test type " + TEST_TYPE + " found."; // link test instances in tree for (FxPK pk: testPks) { generatedNodeIds.add( EJBLookup.getTreeEngine().save(FxTreeNodeEdit.createNew("test" + pk) .setReference(pk).setName(RandomStringUtils.random(new Random().nextInt(1024), true, true))) ); } } @AfterClass public void shutdown() throws Exception { for (long nodeId: generatedNodeIds) { EJBLookup.getTreeEngine().remove( FxTreeNodeEdit.createNew("").setId(nodeId).setMode(FxTreeMode.Edit), false, true); } logout(); } @Test public void simpleSelectTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("caption", "comment").enterSub(QueryOperatorNode.Operator.AND) .condition("caption", PropertyValueComparator.LIKE, "test caption%") .condition("comment", PropertyValueComparator.LIKE, "folder comment%") .closeSub().getResult(); assert result.getRowCount() == 25 : "Expected to fetch 25 rows, got: " + result.getRowCount(); assert result.getColumnIndex("co.caption") == 1 : "Unexpected column index for co.caption: " + result.getColumnIndex("co.caption"); assert result.getColumnIndex("co.comment") == 2 : "Unexpected column index for co.comment: " + result.getColumnIndex("co.comment"); for (int i = 1; i <= result.getRowCount(); i++) { assert result.getString(i, 1).startsWith("test caption") : "Unexpected column value: " + result.getString(i, 1); assert result.getString(i, 2).startsWith("folder comment") : "Unexpected column value: " + result.getString(i, 2); } } @Test public void simpleNestedQueryTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("caption").andSub() .condition("caption", PropertyValueComparator.LIKE, "test caption%") .orSub().condition("comment", PropertyValueComparator.LIKE, "folder comment 1") .condition("comment", PropertyValueComparator.LIKE, "folder comment 2").closeSub().getResult(); assert result.getRowCount() == 2 : "Expected to fetch 2 rows, got: " + result.getRowCount(); for (int i = 1; i <= 2; i++) { assert result.getString(i, 1).matches("test caption [12]") : "Unexpected column value: " + result.getString(i, 1); } } /** * Check if the SQL search for empty string properties works. * * @throws FxApplicationException if the search failed */ @Test public void stringEmptyQuery() throws FxApplicationException { new SqlQueryBuilder().condition("caption", PropertyValueComparator.EMPTY, null).getResult(); new SqlQueryBuilder().condition("caption", PropertyValueComparator.NOT_EMPTY, null).getResult(); new SqlQueryBuilder().condition("caption", PropertyValueComparator.EMPTY, null) .orSub().condition("caption", PropertyValueComparator.EMPTY, null).condition("caption", PropertyValueComparator.NOT_EMPTY, null) .closeSub().getResult(); } @Test public void selectUserTest() throws FxApplicationException { for (FxResultRow row : new SqlQueryBuilder().select("created_by", "created_by.username").getResult().getResultRows()) { final Account account = EJBLookup.getAccountEngine().load(((FxLargeNumber) row.getFxValue(1)).getDefaultTranslation()); assertEquals(row.getFxValue(2).getDefaultTranslation(), account.getName()); } } @Test public void filterByTypeTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("typedef").filterType("FOLDER").getResult(); assert result.getRowCount() > 0; final FxType folderType = CacheAdmin.getEnvironment().getType("FOLDER"); for (FxResultRow row : result.getResultRows()) { assert folderType.getId() == ((FxLargeNumber) row.getValue(1)).getBestTranslation() : "Unexpected result type: " + row.getValue(1) + ", expected: " + folderType.getId(); } } @Test public void briefcaseQueryTest() throws FxApplicationException { // create briefcase final String selectFolders = new SqlQueryBuilder().filterType("FOLDER").getQuery(); final FxSQLSearchParams params = new FxSQLSearchParams().saveResultInBriefcase("test briefcase", "description", (Long) null); final FxResultSet result = EJBLookup.getSearchEngine().search(selectFolders, 0, Integer.MAX_VALUE, params); long bcId = result.getCreatedBriefcaseId(); try { assert result.getRowCount() > 0; assert result.getCreatedBriefcaseId() != -1 : "Briefcase should have been created, but no ID returned."; // select briefcase final FxResultSet briefcase = new SqlQueryBuilder().filterBriefcase(result.getCreatedBriefcaseId()).getResult(); assert briefcase.getRowCount() > 0 : "Empty briefcase returned, but getResult returned " + result.getRowCount() + " rows."; } finally { EJBLookup.getBriefcaseEngine().remove(bcId); } } @Test public void typeConditionTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("typedef").type(FxType.CONTACTDATA).getResult(); final FxType cdType = CacheAdmin.getEnvironment().getType(FxType.CONTACTDATA); assert result.getRowCount() > 0; for (FxResultRow row : result.getResultRows()) { assert ((FxLargeNumber) row.getFxValue(1)).getDefaultTranslation() == cdType.getId() : "Unexpected type in result, expected " + cdType.getId() + ", was: " + row.getFxValue(1); } } /** * Generic tests on the SearchTest type. * * @param name the base property name * @param dataType the datatype of the property * @throws com.flexive.shared.exceptions.FxApplicationException * on search engine errors */ @Test(dataProvider = "testProperties") public void genericSelectTest(String name, FxDataType dataType) throws FxApplicationException { // also select virtual properties to make sure they don't mess up the result final FxResultSet result = new SqlQueryBuilder().select( getTestPropertyName(name)).type(TEST_TYPE).getResult(); assert result.getRowCount() == testInstanceCount : "Expected all test instances to be returned, got " + result.getRowCount() + " instead of " + testInstanceCount; final int idx = 1; for (FxResultRow row : result.getResultRows()) { assert dataType.getValueClass().isAssignableFrom(row.getFxValue(idx).getClass()) : "Invalid class returned for datatype " + dataType + ": " + row.getFxValue(idx).getClass() + " instead of " + dataType.getValueClass(); assert row.getFxValue(idx).getXPathName() != null : "XPath was null"; assert row.getFxValue(idx).getXPathName().equalsIgnoreCase(getTestPropertyName(name)) : "Invalid property name: " + row.getFxValue(idx).getXPathName() + ", expected: " + getTestPropertyName(name); } } @Test public void selectVirtualPropertiesTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", "@path", "@node_position", "@permissions", getTestPropertyName("string")).type(TEST_TYPE).getResult(); final int idx = 5; for (FxResultRow row : result.getResultRows()) { assert getTestPropertyName("string").equalsIgnoreCase(row.getFxValue(idx).getXPathName()) : "Invalid property name from XPath: " + row.getFxValue(idx).getXPathName() + ", expected: " + getTestPropertyName("string"); } } @Test(dataProvider = "testProperties") public void orderByTest(String name, FxDataType dataType) throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", getTestPropertyName(name)).type(TEST_TYPE) .orderBy(2, SortDirection.ASCENDING).getResult(); assert result.getRowCount() > 0; assertAscendingOrder(result, 2); } @Test public void selectPermissionsTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", "@permissions").type(TEST_TYPE).getResult(); assert result.getRowCount() > 0; for (FxResultRow row : result.getResultRows()) { final FxPK pk = row.getPk(1); final PermissionSet permissions = row.getPermissions(2); assert permissions.isMayRead(); final PermissionSet contentPerms = EJBLookup.getContentEngine().load(pk).getPermissions(); assert contentPerms.equals(permissions) : "Permissions from search: " + permissions + ", content: " + contentPerms; } } @Test public void orderByResultPreferencesTest() throws FxApplicationException { setResultPreferences(SortDirection.ASCENDING); final FxResultSet result = new SqlQueryBuilder().select("@pk", getTestPropertyName("string")).filterType(TEST_TYPE).getResult(); assertAscendingOrder(result, 2); setResultPreferences(SortDirection.DESCENDING); final FxResultSet descendingResult = new SqlQueryBuilder().select("@pk", getTestPropertyName("string")).filterType(TEST_TYPE).getResult(); assertDescendingOrder(descendingResult, 2); } private void setResultPreferences(SortDirection sortDirection) throws FxApplicationException { - final ResultPreferencesEdit prefs = new ResultPreferencesEdit(new ArrayList<ResultColumnInfo>(0), Arrays.asList( + final ResultPreferencesEdit prefs = new ResultPreferencesEdit(Arrays.asList( + new ResultColumnInfo(Table.CONTENT, getTestPropertyName("string"), "") + ), Arrays.asList( new ResultOrderByInfo(Table.CONTENT, getTestPropertyName("string"), "", sortDirection)), 25, 100); EJBLookup.getResultPreferencesEngine().save(prefs, CacheAdmin.getEnvironment().getType(TEST_TYPE).getId(), ResultViewType.LIST, AdminResultLocations.DEFAULT); } /** * Tests all available value comparators for the given datatype. Note that no semantic * tests are performed, each comparator is executed with a random value. * * @param name the base property name * @param dataType the datatype of the property * @throws com.flexive.shared.exceptions.FxApplicationException * on search engine errors */ @Test(dataProvider = "testProperties") public void genericConditionTest(String name, FxDataType dataType) throws FxApplicationException { final FxPropertyAssignment assignment = getTestPropertyAssignment(name); final Random random = new Random(0); // need to get some folder IDs for the reference property final List<FxPK> folderPks = new SqlQueryBuilder().select("@pk").type("folder").getResult().collectColumn(1); for (PropertyValueComparator comparator : PropertyValueComparator.getAvailable(dataType)) { for (String prefix : new String[]{ TEST_TYPE + "/", TEST_TYPE + "/groupTop/", TEST_TYPE + "/groupTop/groupNested/" }) { final String assignmentName = prefix + getTestPropertyName(name); try { // submit a query with the given property/comparator combination final FxValue value; switch (dataType) { case Reference: value = new FxReference(new ReferencedContent(folderPks.get(random.nextInt(folderPks.size())))); break; case DateRange: // a query is always performed against a particular date, but not a date range value = new FxDate(new Date()); break; case DateTimeRange: value = new FxDateTime(new Date()); break; default: value = dataType.getRandomValue(random, assignment); } new SqlQueryBuilder().condition(assignmentName, comparator, value).getResult(); // no exception thrown, consider it a success } catch (Exception e) { assert false : "Failed to submit for property " + dataType + " with comparator " + comparator + ":\n" + e.getMessage() + ", thrown at:\n" + StringUtils.join(e.getStackTrace(), '\n'); } } } } /** * Tests relative comparators like &lt; and == for all datatypes that support them. * * @param name the base property name * @param dataType the datatype of the property * @throws com.flexive.shared.exceptions.FxApplicationException * on search engine errors */ @Test(dataProvider = "testProperties") public void genericRelativeComparatorsTest(String name, FxDataType dataType) throws FxApplicationException { final String propertyName = getTestPropertyName(name); for (PropertyValueComparator comparator : PropertyValueComparator.getAvailable(dataType)) { if (!(comparator.equals(PropertyValueComparator.EQ) || comparator.equals(PropertyValueComparator.GE) || comparator.equals(PropertyValueComparator.GT) || comparator.equals(PropertyValueComparator.LE) || comparator.equals(PropertyValueComparator.LT))) { continue; } final FxValue value = getTestValue(name, comparator); final SqlQueryBuilder builder = new SqlQueryBuilder().select("@pk", propertyName).condition(propertyName, comparator, value); final FxResultSet result = builder.getResult(); assert result.getRowCount() > 0 : "Cannot test on empty result sets, query=\n" + builder.getQuery(); for (FxResultRow row: result.getResultRows()) { final FxValue rowValue = row.getFxValue(2); switch(comparator) { case EQ: assert rowValue.compareTo(value) == 0 : "Result value " + rowValue + " is not equal to " + value + " (compareTo = " + rowValue.compareTo(value) + ")"; assert rowValue.getBestTranslation().equals(value.getBestTranslation()) : "Result value " + rowValue + " is not equal to " + value; break; case LT: assert rowValue.compareTo(value) < 0 : "Result value " + rowValue + " is not less than " + value; break; case LE: assert rowValue.compareTo(value) <= 0 : "Result value " + rowValue + " is not less or equal to " + value; break; case GT: assert rowValue.compareTo(value) > 0 : "Result value " + rowValue + " is not greater than " + value; break; case GE: assert rowValue.compareTo(value) >= 0 : "Result value " + rowValue + " is not greater or equal to " + value; break; default: assert false : "Invalid comparator: " + comparator; } } } } /** * Finds a FxValue of the test instances that matches some of the result rows * for the given comparator, but not all or none. * * @param name the test property name * @param comparator the comparator * @return a value that matches some rows * @throws FxApplicationException on search engine errors */ private FxValue getTestValue(String name, PropertyValueComparator comparator) throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select(getTestPropertyName(name)).type(TEST_TYPE).getResult(); final List<FxValue> values = result.collectColumn(1); assert values.size() == testInstanceCount : "Expected " + testInstanceCount + " rows, got: " + values.size(); for (FxValue value: values) { if (value == null || value.isEmpty()) { continue; } int match = 0; // number of matched values for the given comparator int count = 0; // number of values checked so far for (FxValue value2: values) { if (value2 == null || value2.isEmpty()) { continue; } count++; switch(comparator) { case EQ: if (value.getBestTranslation().equals(value2.getBestTranslation())) { match++; } break; case LT: if (value2.compareTo(value) < 0) { match++; } break; case LE: if (value2.compareTo(value) <= 0) { match++; } break; case GT: if (value2.compareTo(value) > 0) { match++; } break; case GE: if (value2.compareTo(value) >= 0) { match++; } break; default: assert false : "Cannot check relative ordering for comparator " + comparator; } if (match > 0 && count > match) { // this value is matched by _some_ other row values, so it's suitable as test input if (value instanceof FxDateRange) { // daterange checks are performed against an actual date, not another range return new FxDate(((FxDateRange) value).getBestTranslation().getLower()); } else if (value instanceof FxDateTimeRange) { // see above return new FxDateTime(((FxDateTimeRange) value).getBestTranslation().getLower()); } return value; } } } throw new IllegalArgumentException("Failed to find a suitable test value for property " + getTestPropertyName(name) + " and comparator " + comparator); } @Test public void aclSelectorTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", "acl", "acl.label", "acl.name", "acl.mandator", "acl.description", "acl.cat_type", "acl.color", "acl.created_by", "acl.created_at", "acl.modified_by", "acl.modified_at").type(TEST_TYPE).getResult(); assert result.getRowCount() > 0; for (FxResultRow row: result.getResultRows()) { final ACL acl = CacheAdmin.getEnvironment().getACL(row.getLong("acl")); final FxContent content = EJBLookup.getContentEngine().load(row.getPk(1)); assert content.getAclId() == acl.getId() : "Invalid ACL for instance " + row.getPk(1) + ": " + acl.getId() + ", content engine returned " + content.getAclId(); // check label assert acl.getLabel().getBestTranslation().equals(row.getFxValue("acl.label").getBestTranslation()) : "Invalid ACL label '" + row.getValue(3) + "', expected: '" + acl.getLabel() + "'"; // check fields selected directly from the ACL table assertEquals(row.getString("acl.name"), (Object) acl.getName(), "Invalid value for field: name"); assertEquals(row.getLong("acl.mandator"), (Object) acl.getMandatorId(), "Invalid value for field: mandator"); assertEquals(row.getString("acl.description"), (Object) acl.getDescription(), "Invalid value for field: description"); assertEquals(row.getInt("acl.cat_type"), (Object) acl.getCategory().getId(), "Invalid value for field: category"); assertEquals(row.getString("acl.color"), (Object) acl.getColor(), "Invalid value for field: color"); checkLifecycleInfo(row, "acl", acl.getLifeCycleInfo()); } } @Test public void stepSelectorTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", "step", "step.label", "step.id", "step.stepdef", "step.workflow", "step.acl").getResult(); assert result.getRowCount() > 0; for (FxResultRow row: result.getResultRows()) { final Step step = CacheAdmin.getEnvironment().getStep(row.getLong("step")); final StepDefinition definition = CacheAdmin.getEnvironment().getStepDefinition(step.getStepDefinitionId()); assert definition.getLabel().getBestTranslation().equals(row.getFxValue("step.label").getBestTranslation()) : "Invalid step label '" + row.getValue(3) + "', expected: '" + definition.getLabel() + "'"; try { final FxContent content = EJBLookup.getContentEngine().load(row.getPk(1)); assert content.getStepId() == step.getId() : "Invalid step for instance " + row.getPk(1) + ": " + step.getId() + ", content engine returned " + content.getStepId(); } catch (FxNoAccessException e) { assert false : "Content engine denied read access to instance " + row.getPk(1) + " that was returned by search."; } // check fields selected from the ACL table assertEquals(row.getLong("step.id"), step.getId(), "Invalid value for field: id"); assertEquals(row.getLong("step.stepdef"), step.getStepDefinitionId(), "Invalid value for field: stepdef"); assertEquals(row.getLong("step.workflow"), step.getWorkflowId(), "Invalid value for field: workflow"); assertEquals(row.getLong("step.acl"), step.getAclId(), "Invalid value for field: acl"); } } @Test public void contactDataSelectTest() throws FxApplicationException { // contact data is an example of a content with extended private permissions and no permissions for other users final FxResultSet result = new SqlQueryBuilder().select("@pk", "@permissions").type(FxType.CONTACTDATA).getResult(); for (FxResultRow row: result.getResultRows()) { try { final FxContent content = EJBLookup.getContentEngine().load(row.getPk(1)); assert content.getPermissions().equals(row.getPermissions("@permissions")) : "Content perm: " + content.getPermissions() + ", search perm: " + row.getPermissions(2); } catch (FxNoAccessException e) { assert false : "Search returned contact data #" + row.getPk(1) + ", but content engine disallows access: " + e.getMessage(); } } } /** * Executes a query without conditions and checks if it returns only instances * the user can actually read (a select without conditions is an optimized case of the * search that must implement the same security constraints as a regular query). * * @throws FxApplicationException on errors */ @Test public void selectAllPermissionsTest() throws FxApplicationException { final FxResultSet result = EJBLookup.getSearchEngine().search("SELECT co.@pk FROM content co", 0, 999999, null); for (FxResultRow row: result.getResultRows()) { try { EJBLookup.getContentEngine().load(row.getPk(1)); } catch (FxNoAccessException e) { assert false : "Content engine denied read access to instance " + row.getPk(1) + " that was returned by search."; } } } @Test public void mandatorSelectorTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", "mandator", "mandator.id", "mandator.metadata", "mandator.is_active", "mandator.created_by", "mandator.created_at", "mandator.modified_by", "mandator.modified_at").getResult(); assert result.getRowCount() > 0; for (FxResultRow row: result.getResultRows()) { final Mandator mandator = CacheAdmin.getEnvironment().getMandator(row.getLong("mandator")); final FxContent content = EJBLookup.getContentEngine().load(row.getPk(1)); assertEquals(mandator.getId(), content.getMandatorId(), "Search returned different mandator than content engine"); assertEquals(row.getLong("mandator.id"), mandator.getId(), "Invalid value for field: id"); if( row.getValue("mandator.metadata") != null ) { long mand = row.getLong("mandator.metadata"); if (!(mand == 0 || mand == -1)) Assert.fail("Invalid mandator: " + mand + "! Expected 0 or -1 (System default or test division)"); } assertEquals(row.getLong("mandator.is_active"), mandator.isActive() ? 1 : 0, "Invalid value for field: is_active"); checkLifecycleInfo(row, "mandator", mandator.getLifeCycleInfo()); } } @Test public void accountSelectorTest() throws FxApplicationException { for (String name : new String[] { "created_by", "modified_by" }) { final FxResultSet result = new SqlQueryBuilder().select("@pk", name, name + ".mandator", name + ".username", name + ".password", name + ".email", name + ".contact_id", name + ".valid_from", name + ".valid_to", name + ".description", name + ".created_by", name + ".created_at", name + ".modified_by", name + ".modified_at", name + ".is_active", name + ".is_validated", name + ".lang", name + ".login_name", name + ".allow_multilogin", name + ".default_node").maxRows(10).getResult(); assert result.getRowCount() == 10 : "Expected 10 result rows"; for (FxResultRow row: result.getResultRows()) { final Account account = EJBLookup.getAccountEngine().load(row.getLong(name)); assertEquals(row.getString(name + ".username"), account.getName(), "Invalid value for field: username"); assertEquals(row.getString(name + ".login_name"), account.getLoginName(), "Invalid value for field: login_name"); assertEquals(row.getString(name + ".email"), account.getEmail(), "Invalid value for field: email"); assertEquals(row.getLong(name + ".contact_id"), account.getContactDataId(), "Invalid value for field: contact_id"); assertEquals(row.getLong(name + ".is_active"), account.isActive() ? 1 : 0, "Invalid value for field: is_active"); assertEquals(row.getLong(name + ".is_validated"), account.isValidated() ? 1 : 0, "Invalid value for field: is_validated"); assertEquals(row.getLong(name + ".allow_multilogin"), account.isAllowMultiLogin() ? 1 : 0, "Invalid value for field: allow_multilogin"); assertEquals(row.getLong(name + ".lang"), account.getLanguage().getId(), "Invalid value for field: lang"); // default_node is not supported yet //assertEquals(row.getLong(name + ".default_node"), account.getDefaultNode(), "Invalid value for field: default_node"); checkLifecycleInfo(row, name, account.getLifeCycleInfo()); } } } private void checkLifecycleInfo(FxResultRow row, String baseName, LifeCycleInfo lifeCycleInfo) { assertEquals(row.getLong(baseName + ".created_by"), lifeCycleInfo.getCreatorId(), "Invalid value for field: created_by"); assertEquals(row.getDate(baseName + ".created_at").getTime(), lifeCycleInfo.getCreationTime(), "Invalid value for field: id"); assertEquals(row.getLong(baseName + ".modified_by"), lifeCycleInfo.getModificatorId(), "Invalid value for field: modified_by"); assertEquals(row.getDate(baseName + ".modified_at").getTime(), lifeCycleInfo.getModificationTime(), "Invalid value for field: modified_at"); } @Test public void treeSelectorTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", "@path").isChild(FxTreeNode.ROOT_NODE).getResult(); assert result.getRowCount() > 0; for (FxResultRow row: result.getResultRows()) { final List<FxPaths.Path> paths = row.getPaths(2); assert paths.size() > 0 : "Returned no path information for content " + row.getPk(1); for (FxPaths.Path path: paths) { assert path.getItems().size() > 0 : "Empty path returned"; final FxPaths.Item leaf = path.getItems().get(path.getItems().size() - 1); assert leaf.getReferenceId() == row.getPk(1).getId() : "Expected reference ID " + row.getPk(1) + ", got: " + leaf.getReferenceId() + " (nodeId=" + leaf.getNodeId() + ")"; final String treePath = StringUtils.join(EJBLookup.getTreeEngine().getLabels(FxTreeMode.Edit, leaf.getNodeId()), '/'); assert treePath.equals(path.getCaption()) : "Unexpected tree path '" + path.getCaption() + "', expected: '" + treePath + "'"; } } // test selection via node path final FxResultSet pathResult = new SqlQueryBuilder().select("@pk", "@path").isChild("/").getResult(); assert pathResult.getRowCount() == result.getRowCount() : "Path select returned " + pathResult.getRowCount() + " rows, select by ID returned " + result.getRowCount() + " rows."; // query a leaf node new SqlQueryBuilder().select("@pk").isChild(EJBLookup.getTreeEngine().getPathById(FxTreeMode.Edit, pathResult.getResultRow(0).getPk(1).getId())); } @Test public void fulltextSearchTest() throws FxApplicationException { final FxResultSet result = new SqlQueryBuilder().select("@pk", getTestPropertyName("string")).type(TEST_TYPE).maxRows(1).getResult(); assert result.getRowCount() == 1 : "Expected only one result, got: " + result.getRowCount(); // perform a fulltext query against the first word final FxPK pk = result.getResultRow(0).getPk(1); final String[] words = StringUtils.split(((FxString) result.getResultRow(0).getFxValue(2)).getBestTranslation(), ' '); assert words.length > 0; assert words[0].length() > 0 : "Null length word: " + words[0]; final FxResultSet ftresult = new SqlQueryBuilder().select("@pk").fulltext(words[0]).getResult(); assert ftresult.getRowCount() > 0 : "Expected at least one result for fulltext query '" + words[0] + "'"; assert ftresult.collectColumn(1).contains(pk) : "Didn't find pk " + pk + " in result, got: " + ftresult.collectColumn(1); } @Test public void versionFilterTest() throws FxApplicationException { final List<FxPK> allVersions = getPksForVersion(VersionFilter.ALL); final List<FxPK> liveVersions = getPksForVersion(VersionFilter.LIVE); final List<FxPK> maxVersions = getPksForVersion(VersionFilter.MAX); assert allVersions.size() > 0 : "All versions result must not be empty"; assert liveVersions.size() > 0 : "Live versions result must not be empty"; assert maxVersions.size() > 0 : "Max versions result must not be empty"; assert allVersions.size() > liveVersions.size() : "Expected more than only live versions"; assert allVersions.size() > maxVersions.size() : "Expected more than only max versions"; assert !CollectionUtils.isEqualCollection(liveVersions, maxVersions) : "Expected different results for max and live version filter"; for (FxPK pk: liveVersions) { final FxContent content = EJBLookup.getContentEngine().load(pk); assert content.isLiveVersion() : "Expected live version for " + pk; } for (FxPK pk: maxVersions) { final FxContent content = EJBLookup.getContentEngine().load(pk); assert content.isMaxVersion() : "Expected max version for " + pk; assert content.getVersion() == 1 || !content.isLiveVersion(); } } @Test public void lastContentChangeTest() throws FxApplicationException { final long lastContentChange = EJBLookup.getSearchEngine().getLastContentChange(false); assert lastContentChange > 0; final FxContent content = EJBLookup.getContentEngine().initialize(TEST_TYPE); content.setAclId(TestUsers.getInstanceAcl().getId()); content.setValue("/" + getTestPropertyName("string"), new FxString(false, "lastContentChangeTest")); FxPK pk = null; try { assert EJBLookup.getSearchEngine().getLastContentChange(false) == lastContentChange : "Didn't touch contents, but lastContentChange timestamp was increased"; pk = EJBLookup.getContentEngine().save(content); assert EJBLookup.getSearchEngine().getLastContentChange(false) > lastContentChange : "Saved content, but lastContentChange timestamp was not increased: " + EJBLookup.getSearchEngine().getLastContentChange(false); } finally { if (pk != null) { EJBLookup.getContentEngine().remove(pk); } } } @Test public void lastContentChangeTreeTest() throws FxApplicationException { final long lastContentChange = EJBLookup.getSearchEngine().getLastContentChange(false); assert lastContentChange > 0; final long nodeId = EJBLookup.getTreeEngine().save(FxTreeNodeEdit.createNew("lastContentChangeTreeTest")); try { final long editContentChange = EJBLookup.getSearchEngine().getLastContentChange(false); assert editContentChange > lastContentChange : "Saved content, but lastContentChange timestamp was not increased: " + editContentChange; EJBLookup.getTreeEngine().activate(FxTreeMode.Edit, nodeId, false); assert EJBLookup.getSearchEngine().getLastContentChange(true) > editContentChange : "Activated content, but live mode lastContentChange timestamp was not increased: " + EJBLookup.getSearchEngine().getLastContentChange(true); assert EJBLookup.getSearchEngine().getLastContentChange(false) == editContentChange : "Edit tree didn't change, but lastContentChange timestamp was updated"; } finally { FxContext.get().runAsSystem(); try { try { EJBLookup.getTreeEngine().remove(EJBLookup.getTreeEngine().getNode(FxTreeMode.Edit, nodeId), true, false); } catch (FxApplicationException e) { // pass } try { EJBLookup.getTreeEngine().remove(EJBLookup.getTreeEngine().getNode(FxTreeMode.Live, nodeId), true, false); } catch (FxApplicationException e) { // pass } } finally { FxContext.get().stopRunAsSystem(); } } } private List<FxPK> getPksForVersion(VersionFilter versionFilter) throws FxApplicationException { return new SqlQueryBuilder().select("@pk").type(TEST_TYPE).filterVersion(versionFilter).getResult().collectColumn(1); } @DataProvider(name = "testProperties") public Object[][] getTestProperties() { final Object[][] result = new Object[TEST_PROPS.size()][]; int ctr = 0; for (Map.Entry<String, FxDataType> entry : TEST_PROPS.entrySet()) { result[ctr++] = new Object[]{entry.getKey(), entry.getValue()}; } return result; } private String getTestPropertyName(String baseName) { return baseName + TEST_SUFFIX; } private FxPropertyAssignment getTestPropertyAssignment(String baseName) { return (FxPropertyAssignment) CacheAdmin.getEnvironment().getAssignment(TEST_TYPE + "/" + getTestPropertyName(baseName)); } private void assertAscendingOrder(FxResultSet result, int column) { assertOrder(result, column, true); } private void assertDescendingOrder(FxResultSet result, int column) { assertOrder(result, column, false); } private void assertOrder(FxResultSet result, int column, boolean ascending) { FxValue oldValue = null; for (FxResultRow row : result.getResultRows()) { // check order assert oldValue == null || (ascending ? row.getFxValue(column).compareTo(oldValue) >= 0 : row.getFxValue(column).compareTo(oldValue) <= 0) : row.getFxValue(column) + " is not " + (ascending ? "greater" : "less") + " than " + oldValue; oldValue = row.getFxValue(column); } } }

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/ClassTransformer.java b/src/com/redhat/ceylon/compiler/java/codegen/ClassTransformer.java index bd3fb2358..1444f4b71 100755 --- a/src/com/redhat/ceylon/compiler/java/codegen/ClassTransformer.java +++ b/src/com/redhat/ceylon/compiler/java/codegen/ClassTransformer.java @@ -1,1432 +1,1430 @@ /* * Copyright Red Hat Inc. and/or its affiliates and other contributors * as indicated by the authors tag. All rights reserved. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions * of the GNU General Public License version 2. * * This particular file is subject to the "Classpath" exception as provided in the * LICENSE file that accompanied this code. * * This program is distributed in the hope that it will be useful, but WITHOUT A * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A * PARTICULAR PURPOSE. See the GNU General Public License for more details. * You should have received a copy of the GNU General Public License, * along with this distribution; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ package com.redhat.ceylon.compiler.java.codegen; import static com.sun.tools.javac.code.Flags.ABSTRACT; import static com.sun.tools.javac.code.Flags.FINAL; import static com.sun.tools.javac.code.Flags.INTERFACE; import static com.sun.tools.javac.code.Flags.PRIVATE; import static com.sun.tools.javac.code.Flags.PROTECTED; import static com.sun.tools.javac.code.Flags.PUBLIC; import static com.sun.tools.javac.code.Flags.STATIC; import static com.redhat.ceylon.compiler.java.codegen.CodegenUtil.NameFlag.*; import java.util.Collections; import java.util.HashSet; import java.util.Set; import com.redhat.ceylon.compiler.loader.model.LazyInterface; import com.redhat.ceylon.compiler.typechecker.model.Class; import com.redhat.ceylon.compiler.typechecker.model.ClassOrInterface; import com.redhat.ceylon.compiler.typechecker.model.Declaration; import com.redhat.ceylon.compiler.typechecker.model.Functional; import com.redhat.ceylon.compiler.typechecker.model.FunctionalParameter; import com.redhat.ceylon.compiler.typechecker.model.Getter; import com.redhat.ceylon.compiler.typechecker.model.Interface; import com.redhat.ceylon.compiler.typechecker.model.Method; import com.redhat.ceylon.compiler.typechecker.model.Parameter; import com.redhat.ceylon.compiler.typechecker.model.ParameterList; import com.redhat.ceylon.compiler.typechecker.model.ProducedType; import com.redhat.ceylon.compiler.typechecker.model.ProducedTypedReference; import com.redhat.ceylon.compiler.typechecker.model.Scope; import com.redhat.ceylon.compiler.typechecker.model.Setter; import com.redhat.ceylon.compiler.typechecker.model.TypeDeclaration; import com.redhat.ceylon.compiler.typechecker.model.TypeParameter; import com.redhat.ceylon.compiler.typechecker.model.TypedDeclaration; import com.redhat.ceylon.compiler.typechecker.model.Value; import com.redhat.ceylon.compiler.typechecker.model.ValueParameter; import com.redhat.ceylon.compiler.typechecker.tree.Node; import com.redhat.ceylon.compiler.typechecker.tree.Tree; import com.redhat.ceylon.compiler.typechecker.tree.Tree.AttributeDeclaration; import com.redhat.ceylon.compiler.typechecker.tree.Tree.AttributeGetterDefinition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.AttributeSetterDefinition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Block; import com.redhat.ceylon.compiler.typechecker.tree.Tree.DefaultArgument; import com.redhat.ceylon.compiler.typechecker.tree.Tree.MethodDeclaration; import com.redhat.ceylon.compiler.typechecker.tree.Tree.MethodDefinition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.SpecifierExpression; import com.redhat.ceylon.compiler.typechecker.tree.Tree.SpecifierStatement; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCBinary; import com.sun.tools.javac.tree.JCTree.JCBlock; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; import com.sun.tools.javac.tree.JCTree.JCNewClass; import com.sun.tools.javac.tree.JCTree.JCStatement; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.ListBuffer; /** * This transformer deals with class/interface declarations */ public class ClassTransformer extends AbstractTransformer { public static ClassTransformer getInstance(Context context) { ClassTransformer trans = context.get(ClassTransformer.class); if (trans == null) { trans = new ClassTransformer(context); context.put(ClassTransformer.class, trans); } return trans; } private ClassTransformer(Context context) { super(context); } // FIXME: figure out what insertOverloadedClassConstructors does and port it public List<JCTree> transform(final Tree.ClassOrInterface def) { final ClassOrInterface model = def.getDeclarationModel(); noteDecl(model); final String className; if (def instanceof Tree.AnyInterface) { className = declName(model, QUALIFIED).replaceFirst(".*\\.", ""); } else { className = def.getIdentifier().getText(); } ClassDefinitionBuilder classBuilder = ClassDefinitionBuilder .klass(this, Decl.isAncestorLocal(def), className); if (def instanceof Tree.AnyClass) { Tree.ParameterList paramList = ((Tree.AnyClass)def).getParameterList(); for (Tree.Parameter param : paramList.getParameters()) { classBuilder.parameter(param); DefaultArgument defaultArgument = param.getDefaultArgument(); if (defaultArgument != null || param.getDeclarationModel().isSequenced()) { ClassDefinitionBuilder cbForDevaultValues; if (Strategy.defaultParameterMethodStatic(model)) { cbForDevaultValues = classBuilder; } else { cbForDevaultValues = classBuilder.getCompanionBuilder(model); } cbForDevaultValues.defs(makeParamDefaultValueMethod(false, def.getDeclarationModel(), paramList, param)); // Add overloaded constructors for defaulted parameter MethodDefinitionBuilder overloadBuilder = classBuilder.addConstructor(); makeOverloadsForDefaultedParameter(OL_BODY, overloadBuilder, model, paramList, param); } } satisfaction((Class)model, classBuilder); at(def); } if (def instanceof Tree.AnyInterface) { // Copy all the qualifying type's type parameters into the interface ProducedType type = model.getType().getQualifyingType(); while (type != null) { java.util.List<TypeParameter> typeArguments = type.getDeclaration().getTypeParameters(); if (typeArguments == null) { continue; } for (TypeParameter typeArgument : typeArguments) { classBuilder.typeParameter(typeArgument); } type = type.getQualifyingType(); } // Build the companion class buildCompanion(def, (Interface)model, classBuilder); } // Transform the class/interface members CeylonVisitor visitor = gen().visitor; final ListBuffer<JCTree> prevDefs = visitor.defs; final boolean prevInInitializer = visitor.inInitializer; final ClassDefinitionBuilder prevClassBuilder = visitor.classBuilder; List<JCStatement> childDefs; try { visitor.defs = new ListBuffer<JCTree>(); visitor.inInitializer = true; visitor.classBuilder = classBuilder; def.visitChildren(visitor); childDefs = (List<JCStatement>)visitor.getResult().toList(); } finally { visitor.classBuilder = prevClassBuilder; visitor.inInitializer = prevInInitializer; visitor.defs = prevDefs; } // If it's a Class without initializer parameters... if (Strategy.generateMain(def)) { // ... then add a main() method classBuilder.body(makeMainForClass(model)); } return classBuilder .modelAnnotations(model.getAnnotations()) .modifiers(transformClassDeclFlags(def)) .satisfies(model.getSatisfiedTypes()) .caseTypes(model.getCaseTypes()) .of(model.getSelfType()) .init(childDefs) .build(); } private void satisfaction(final Class model, ClassDefinitionBuilder classBuilder) { final java.util.List<ProducedType> satisfiedTypes = model.getSatisfiedTypes(); Set<Interface> satisfiedInterfaces = new HashSet<Interface>(); for (ProducedType satisfiedType : satisfiedTypes) { TypeDeclaration decl = satisfiedType.getDeclaration(); if (!(decl instanceof Interface)) { continue; } concreteMembersFromSuperinterfaces((Class)model, classBuilder, satisfiedType, satisfiedInterfaces); } } /** * Generates companion fields ($Foo$impl) and methods */ private void concreteMembersFromSuperinterfaces(final Class model, ClassDefinitionBuilder classBuilder, ProducedType satisfiedType, Set<Interface> satisfiedInterfaces) { Interface iface = (Interface)satisfiedType.getDeclaration(); if (satisfiedInterfaces.contains(iface)) { return; } // If there is no $impl (e.g. implementing a Java interface) // then don't instantiate it... if (hasImpl(iface)) { // ... otherwise for each satisfied interface, // instantiate an instance of the // companion class in the constructor and assign it to a // $Interface$impl field transformInstantiateCompanions(classBuilder, iface, satisfiedType); } // For each super interface for (Declaration member : iface.getMembers()) { if (Strategy.onlyOnCompanion(member)) { // non-shared interface methods don't need implementing // (they're just private methods on the $impl) continue; } if (member instanceof Method) { Method method = (Method)member; final ProducedTypedReference typedMember = satisfiedType.getTypedMember(method, Collections.<ProducedType>emptyList()); final java.util.List<TypeParameter> typeParameters = method.getTypeParameters(); final java.util.List<Parameter> parameters = method.getParameterLists().get(0).getParameters(); if (!satisfiedInterfaces.contains((Interface)method.getContainer())) { for (Parameter param : parameters) { if (param.isDefaulted() || param.isSequenced()) { final ProducedTypedReference typedParameter = typedMember.getTypedParameter(param); // If that method has a defaulted parameter, // we need to generate a default value method // which also delegates to the $impl final JCMethodDecl defaultValueDelegate = makeDelegateToCompanion(iface, typedParameter, PUBLIC | FINAL, typeParameters, typedParameter.getType(), CodegenUtil.getDefaultedParamMethodName(method, param), parameters.subList(0, parameters.indexOf(param)), Decl.isAncestorLocal(model)); classBuilder.defs(defaultValueDelegate); final JCMethodDecl overload = makeDelegateToCompanion(iface, typedMember, PUBLIC | FINAL, typeParameters, typedMember.getType(), CodegenUtil.quoteMethodName(method), parameters.subList(0, parameters.indexOf(param)), Decl.isAncestorLocal(model)); classBuilder.defs(overload); } } } // if it has the *most refined* default concrete member, // then generate a method on the class // delegating to the $impl instance if (needsCompanionDelegate(model, member)) { final JCMethodDecl concreteMemberDelegate = makeDelegateToCompanion(iface, typedMember, PUBLIC, method.getTypeParameters(), method.getType(), CodegenUtil.quoteMethodName(method), method.getParameterLists().get(0).getParameters(), Decl.isAncestorLocal(model)); classBuilder.defs(concreteMemberDelegate); } } else if (member instanceof Getter || member instanceof Setter || member instanceof Value) { TypedDeclaration attr = (TypedDeclaration)member; final ProducedTypedReference typedMember = satisfiedType.getTypedMember(attr, null); if (needsCompanionDelegate(model, member)) { if (member instanceof Value || member instanceof Getter) { final JCMethodDecl getterDelegate = makeDelegateToCompanion(iface, typedMember, PUBLIC | (attr.isDefault() ? 0 : FINAL), Collections.<TypeParameter>emptyList(), typedMember.getType(), CodegenUtil.getGetterName(attr), Collections.<Parameter>emptyList(), Decl.isAncestorLocal(model)); classBuilder.defs(getterDelegate); } if (member instanceof Setter) { final JCMethodDecl setterDelegate = makeDelegateToCompanion(iface, typedMember, PUBLIC | (attr.isDefault() ? 0 : FINAL), Collections.<TypeParameter>emptyList(), typeFact().getVoidDeclaration().getType(), CodegenUtil.getSetterName(attr), Collections.<Parameter>singletonList(((Setter)member).getParameter()), Decl.isAncestorLocal(model)); classBuilder.defs(setterDelegate); } if (member instanceof Value && ((Value)attr).isVariable()) { // I don't *think* this can happen because although a // variable Value can be declared on an interface it // will need to we refined as a Getter+Setter on a // subinterface in order for there to be a method in a // $impl to delegate to throw new RuntimeException(); } } } else if (needsCompanionDelegate(model, member)) { log.error("ceylon", "Unhandled concrete interface member " + member.getQualifiedNameString() + " " + member.getClass()); } } // Add $impl instances for the whole interface hierarchy satisfiedInterfaces.add(iface); for (ProducedType sat : iface.getSatisfiedTypes()) { sat = satisfiedType.getSupertype(sat.getDeclaration()); concreteMembersFromSuperinterfaces(model, classBuilder, sat, satisfiedInterfaces); } } private boolean needsCompanionDelegate(final Class model, Declaration member) { final boolean mostRefined; if (member instanceof Setter) { mostRefined = member.equals(((Getter)model.getMember(member.getName(), null)).getSetter()); } else { mostRefined = member.equals(model.getMember(member.getName(), null)); } return mostRefined && (member.isDefault() || !member.isFormal()); } /** * Generates a method which delegates to the companion instance $Foo$impl */ private JCMethodDecl makeDelegateToCompanion(Interface iface, ProducedTypedReference typedMember, final long mods, final java.util.List<TypeParameter> typeParameters, final ProducedType methodType, final String methodName, final java.util.List<Parameter> parameters, boolean ancestorLocal) { final MethodDefinitionBuilder concreteWrapper = MethodDefinitionBuilder.systemMethod(gen(), ancestorLocal, methodName); concreteWrapper.modifiers(mods); concreteWrapper.annotations(makeAtOverride()); for (TypeParameter tp : typeParameters) { concreteWrapper.typeParameter(tp); } if (!isVoid(methodType)) { concreteWrapper.resultType(typedMember.getDeclaration(), typedMember.getType()); } ListBuffer<JCExpression> arguments = ListBuffer.<JCExpression>lb(); for (Parameter param : parameters) { final ProducedTypedReference typedParameter = typedMember.getTypedParameter(param); concreteWrapper.parameter(param, typedParameter.getType()); arguments.add(makeQuotedIdent(param.getName())); } JCExpression expr = make().Apply( null, // TODO Type args makeSelect(getCompanionFieldName(iface), methodName), arguments.toList()); if (isVoid(methodType)) { concreteWrapper.body(gen().make().Exec(expr)); } else { concreteWrapper.body(gen().make().Return(expr)); } final JCMethodDecl build = concreteWrapper.build(); return build; } private Boolean hasImpl(Interface iface) { if (gen().willEraseToObject(iface.getType())) { return false; } if (iface instanceof LazyInterface) { return ((LazyInterface)iface).isCeylon(); } return true; } private void transformInstantiateCompanions( ClassDefinitionBuilder classBuilder, Interface iface, ProducedType satisfiedType) { at(null); final List<JCExpression> state = List.<JCExpression>of(makeUnquotedIdent("this")); final String fieldName = getCompanionFieldName(iface); classBuilder.init(make().Exec(make().Assign( makeSelect("this", fieldName),// TODO Use qualified name for quoting? make().NewClass(null, null, makeJavaType(satisfiedType, AbstractTransformer.COMPANION | SATISFIES), state, null)))); classBuilder.field(PRIVATE | FINAL, fieldName, makeJavaType(satisfiedType, AbstractTransformer.COMPANION | SATISFIES), null, false); } private void buildCompanion(final Tree.ClassOrInterface def, final Interface model, ClassDefinitionBuilder classBuilder) { at(def); // Give the $impl companion a $this field... ClassDefinitionBuilder companionBuilder = classBuilder.getCompanionBuilder(model); ProducedType thisType = model.getType(); companionBuilder.field(PRIVATE | FINAL, "$this", makeJavaType(thisType), null, false); MethodDefinitionBuilder ctor = companionBuilder.addConstructor(); ctor.modifiers(model.isShared() ? PUBLIC : 0); // ...initialize the $this field from a ctor parameter... ctor.parameter(0, "$this", makeJavaType(thisType), null); ListBuffer<JCStatement> bodyStatements = ListBuffer.<JCStatement>of( make().Exec( make().Assign( makeSelect("this", "$this"), makeUnquotedIdent("$this")))); ctor.body(bodyStatements.toList()); } public List<JCStatement> transformRefinementSpecifierStatement(SpecifierStatement op, ClassDefinitionBuilder classBuilder) { List<JCStatement> result = List.<JCStatement>nil(); // Check if this is a shortcut form of formal attribute refinement if (op.getRefinement()) { Tree.BaseMemberExpression expr = (Tree.BaseMemberExpression)op.getBaseMemberExpression(); Declaration decl = expr.getDeclaration(); if (decl instanceof Value) { // Now build a "fake" declaration for the attribute Tree.AttributeDeclaration attrDecl = new Tree.AttributeDeclaration(null); attrDecl.setDeclarationModel((Value)decl); attrDecl.setIdentifier(expr.getIdentifier()); attrDecl.setScope(op.getScope()); // Make sure the boxing information is set correctly BoxingDeclarationVisitor v = new BoxingDeclarationVisitor(this); v.visit(attrDecl); // Generate the attribute transform(attrDecl, classBuilder); // Generate the specifier statement result = result.append(expressionGen().transform(op)); } else if (decl instanceof Method) { // Now build a "fake" declaration for the method Tree.MethodDeclaration methDecl = new Tree.MethodDeclaration(null); Method m = (Method)decl; methDecl.setDeclarationModel(m); methDecl.setIdentifier(expr.getIdentifier()); methDecl.setScope(op.getScope()); methDecl.setSpecifierExpression(op.getSpecifierExpression()); for (ParameterList pl : m.getParameterLists()) { Tree.ParameterList tpl = new Tree.ParameterList(null); for (Parameter p : pl.getParameters()) { Tree.Parameter tp = null; if (p instanceof ValueParameter) { Tree.ValueParameterDeclaration tvpd = new Tree.ValueParameterDeclaration(null); tvpd.setDeclarationModel((ValueParameter)p); tp = tvpd; } else if (p instanceof FunctionalParameter) { Tree.FunctionalParameterDeclaration tfpd = new Tree.FunctionalParameterDeclaration(null); tfpd.setDeclarationModel((FunctionalParameter)p); tp = tfpd; } tp.setScope(p.getContainer()); tp.setIdentifier(makeIdentifier(p.getName())); tpl.addParameter(tp); } methDecl.addParameterList(tpl); } // Make sure the boxing information is set correctly BoxingDeclarationVisitor v = new BoxingDeclarationVisitor(this); v.visit(methDecl); // Generate the attribute classBuilder.method(methDecl); } } else { // Normal case, just generate the specifier statement result = result.append(expressionGen().transform(op)); } return result; } private Tree.Identifier makeIdentifier(String name) { Tree.Identifier id = new Tree.Identifier(null); id.setText(name); return id; } public void transform(AttributeDeclaration decl, ClassDefinitionBuilder classBuilder) { final Value model = decl.getDeclarationModel(); boolean useField = Strategy.useField(model); String attrName = decl.getIdentifier().getText(); // Only a non-formal attribute has a corresponding field // and if a captured class parameter exists with the same name we skip this part as well Parameter p = findParamForAttr(decl); boolean createField = Strategy.createField(p, model); boolean concrete = Decl.withinInterface(decl) && decl.getSpecifierOrInitializerExpression() != null; if (concrete || (!Decl.isFormal(decl) && createField)) { JCExpression initialValue = null; if (decl.getSpecifierOrInitializerExpression() != null) { Value declarationModel = model; initialValue = expressionGen().transformExpression(decl.getSpecifierOrInitializerExpression().getExpression(), CodegenUtil.getBoxingStrategy(declarationModel), declarationModel.getType()); } int flags = 0; TypedDeclaration nonWideningTypeDeclaration = nonWideningTypeDecl(model); ProducedType nonWideningType = nonWideningType(model, nonWideningTypeDeclaration); if (!CodegenUtil.isUnBoxed(nonWideningTypeDeclaration)) { flags |= NO_PRIMITIVES; } JCExpression type = makeJavaType(nonWideningType, flags); int modifiers = (useField) ? transformAttributeFieldDeclFlags(decl) : transformLocalDeclFlags(decl); if (model.getContainer() instanceof Functional) { // If the attribute is really from a parameter then don't generate a field // (The ClassDefinitionBuilder does it in that case) Parameter parameter = ((Functional)model.getContainer()).getParameter(model.getName()); if (parameter == null || ((parameter instanceof ValueParameter) && ((ValueParameter)parameter).isHidden())) { if (concrete) { classBuilder.getCompanionBuilder((Declaration)model.getContainer()).field(modifiers, attrName, type, initialValue, !useField); } else { classBuilder.field(modifiers, attrName, type, initialValue, !useField); } } } } if (useField) { classBuilder.defs(makeGetter(decl, false)); if (Decl.withinInterface(decl)) { classBuilder.getCompanionBuilder((Interface)decl.getDeclarationModel().getContainer()).defs(makeGetter(decl, true)); } if (Decl.isMutable(decl)) { classBuilder.defs(makeSetter(decl, false)); if (Decl.withinInterface(decl)) { classBuilder.getCompanionBuilder((Interface)decl.getDeclarationModel().getContainer()).defs(makeSetter(decl, true)); } } } } private Parameter findParamForAttr(AttributeDeclaration decl) { String attrName = decl.getIdentifier().getText(); if (Decl.withinClass(decl)) { Class c = (Class)decl.getDeclarationModel().getContainer(); if (!c.getParameterLists().isEmpty()) { for (Parameter p : c.getParameterLists().get(0).getParameters()) { if (attrName.equals(p.getName())) { return p; } } } } return null; } public List<JCTree> transform(AttributeSetterDefinition decl, boolean forCompanion) { ListBuffer<JCTree> lb = ListBuffer.<JCTree>lb(); String name = decl.getIdentifier().getText(); final AttributeDefinitionBuilder builder = AttributeDefinitionBuilder /* * We use the getter as TypedDeclaration here because this is the same type but has a refined * declaration we can use to make sure we're not widening the attribute type. */ .setter(this, name, decl.getDeclarationModel().getGetter()) .modifiers(transformAttributeGetSetDeclFlags(decl.getDeclarationModel(), false)); // companion class members are never actual no matter what the Declaration says if(forCompanion) builder.notActual(); if (Decl.withinClass(decl) || forCompanion) { JCBlock body = statementGen().transform(decl.getBlock()); builder.setterBlock(body); } else { builder.isFormal(true); } if (!Strategy.onlyOnCompanion(decl.getDeclarationModel()) || forCompanion) { lb.appendList(builder.build()); } return lb.toList(); } public List<JCTree> transform(AttributeGetterDefinition decl, boolean forCompanion) { ListBuffer<JCTree> lb = ListBuffer.<JCTree>lb(); String name = decl.getIdentifier().getText(); final AttributeDefinitionBuilder builder = AttributeDefinitionBuilder .getter(this, name, decl.getDeclarationModel()) .modifiers(transformAttributeGetSetDeclFlags(decl.getDeclarationModel(), forCompanion)); // companion class members are never actual no matter what the Declaration says if(forCompanion) builder.notActual(); if (Decl.withinClass(decl) || forCompanion) { JCBlock body = statementGen().transform(decl.getBlock()); builder.getterBlock(body); } else { builder.isFormal(true); } if (!Strategy.onlyOnCompanion(decl.getDeclarationModel()) || forCompanion) { lb.appendList(builder.build()); } return lb.toList(); } private int transformClassDeclFlags(ClassOrInterface cdecl) { int result = 0; result |= Decl.isShared(cdecl) ? PUBLIC : 0; result |= cdecl.isAbstract() && (cdecl instanceof Class) ? ABSTRACT : 0; result |= (cdecl instanceof Interface) ? INTERFACE : 0; return result; } private int transformClassDeclFlags(Tree.ClassOrInterface cdecl) { return transformClassDeclFlags(cdecl.getDeclarationModel()); } private int transformOverloadCtorFlags(Class typeDecl) { return transformClassDeclFlags(typeDecl) & (PUBLIC | PRIVATE | PROTECTED); } private int transformMethodDeclFlags(Method def) { int result = 0; if (def.isToplevel()) { result |= def.isShared() ? PUBLIC : 0; result |= STATIC; } else if (Decl.isLocal(def)) { result |= def.isShared() ? PUBLIC : 0; } else { result |= def.isShared() ? PUBLIC : PRIVATE; result |= def.isFormal() && !def.isDefault() ? ABSTRACT : 0; result |= !(def.isFormal() || def.isDefault() || def.getContainer() instanceof Interface) ? FINAL : 0; } return result; } private int transformOverloadMethodDeclFlags(final Method model) { int mods = transformMethodDeclFlags(model); if (!Decl.withinInterface((model))) { mods |= FINAL; } return mods; } private int transformAttributeFieldDeclFlags(Tree.AttributeDeclaration cdecl) { int result = 0; result |= Decl.isMutable(cdecl) ? 0 : FINAL; result |= PRIVATE; return result; } private int transformLocalDeclFlags(Tree.AttributeDeclaration cdecl) { int result = 0; result |= Decl.isMutable(cdecl) ? 0 : FINAL; return result; } private int transformAttributeGetSetDeclFlags(TypedDeclaration tdecl, boolean forCompanion) { if (tdecl instanceof Setter) { // Spec says: A setter may not be annotated shared, default or // actual. The visibility and refinement modifiers of an attribute // with a setter are specified by annotating the matching getter. tdecl = ((Setter)tdecl).getGetter(); } int result = 0; result |= tdecl.isShared() ? PUBLIC : PRIVATE; result |= (tdecl.isFormal() && !tdecl.isDefault() && !forCompanion) ? ABSTRACT : 0; result |= !(tdecl.isFormal() || tdecl.isDefault() || tdecl.getContainer() instanceof Interface) || forCompanion ? FINAL : 0; return result; } private int transformObjectDeclFlags(Value cdecl) { int result = 0; result |= FINAL; result |= !Decl.isAncestorLocal(cdecl) && Decl.isShared(cdecl) ? PUBLIC : 0; return result; } private List<JCTree> makeGetterOrSetter(Tree.AttributeDeclaration decl, boolean forCompanion, AttributeDefinitionBuilder builder, boolean isGetter) { at(decl); if (forCompanion) { if (decl.getSpecifierOrInitializerExpression() != null) { builder.getterBlock(make().Block(0, List.<JCStatement>of(make().Return(makeErroneous())))); } else { String accessorName = isGetter ? CodegenUtil.getGetterName(decl.getDeclarationModel()) : CodegenUtil.getSetterName(decl.getDeclarationModel()); if (isGetter) { builder.getterBlock(make().Block(0, List.<JCStatement>of(make().Return( make().Apply( null, makeSelect("$this", accessorName), List.<JCExpression>nil()))))); } else { List<JCExpression> args = List.<JCExpression>of(makeQuotedIdent(decl.getIdentifier().getText())); builder.setterBlock(make().Block(0, List.<JCStatement>of(make().Exec( make().Apply( null, makeSelect("$this", accessorName), args))))); } } } if(forCompanion) builder.notActual(); return builder .modifiers(transformAttributeGetSetDeclFlags(decl.getDeclarationModel(), forCompanion)) .isFormal(Decl.isFormal(decl) && !forCompanion) .build(); } private List<JCTree> makeGetter(Tree.AttributeDeclaration decl, boolean forCompanion) { at(decl); String attrName = decl.getIdentifier().getText(); AttributeDefinitionBuilder getter = AttributeDefinitionBuilder .getter(this, attrName, decl.getDeclarationModel()); return makeGetterOrSetter(decl, forCompanion, getter, true); } private List<JCTree> makeSetter(Tree.AttributeDeclaration decl, boolean forCompanion) { at(decl); String attrName = decl.getIdentifier().getText(); AttributeDefinitionBuilder setter = AttributeDefinitionBuilder.setter(this, attrName, decl.getDeclarationModel()); return makeGetterOrSetter(decl, forCompanion, setter, false); } public List<JCTree> transformWrappedMethod(Tree.AnyMethod def) { final Method model = def.getDeclarationModel(); noteDecl(model); // Generate a wrapper class for the method String name = def.getIdentifier().getText(); ClassDefinitionBuilder builder = ClassDefinitionBuilder.methodWrapper(this, Decl.isAncestorLocal(def), name, Decl.isShared(def)); builder.body(classGen().transform(def, builder)); // Toplevel method if (Strategy.generateMain(def)) { // Add a main() method builder.body(makeMainForFunction(model)); } List<JCTree> result = builder.build(); if (Decl.isLocal(def)) { // Inner method JCExpression nameId = makeQuotedIdent(name); JCVariableDecl call = at(def).VarDef( make().Modifiers(FINAL), names().fromString(name), nameId, makeNewClass(name, false)); result = result.append(call); } return result; } public List<JCTree> transform(Tree.AnyMethod def, ClassDefinitionBuilder classBuilder) { // Transform the method body of the 'inner-most method' List<JCStatement> body = transformMethodBody(def); return transform(def, classBuilder, body); } List<JCTree> transform(Tree.AnyMethod def, ClassDefinitionBuilder classBuilder, List<JCStatement> body) { final Method model = def.getDeclarationModel(); final String methodName = CodegenUtil.quoteMethodNameIfProperty(model, gen()); if (Decl.withinInterface(model)) { // Transform it for the companion final Block block; final SpecifierExpression specifier; if (def instanceof MethodDeclaration) { block = null; specifier = ((MethodDeclaration) def).getSpecifierExpression(); } else if (def instanceof MethodDefinition) { block = ((MethodDefinition) def).getBlock(); specifier = null; } else { throw new RuntimeException(); } boolean transformMethod = specifier != null || block != null; boolean actualAndAnnotations = def instanceof MethodDeclaration; List<JCStatement> cbody = specifier != null ? transformMplBody(model, body) : block != null ? statementGen().transform(block).getStatements() : null; boolean transformOverloads = def instanceof MethodDeclaration || block != null; int overloadsDelegator = OL_BODY | OL_IMPLEMENTOR | (def instanceof MethodDeclaration ? OL_DELEGATOR : 0); boolean transformDefaultValues = def instanceof MethodDeclaration || block != null; List<JCTree> companionDefs = transformMethod(def, model, methodName, transformMethod, actualAndAnnotations, cbody, transformOverloads, overloadsDelegator, transformDefaultValues, false); classBuilder.getCompanionBuilder((Declaration)model.getContainer()).defs(companionDefs); } List<JCTree> result; if (Strategy.onlyOnCompanion(model)) { result = List.<JCTree>nil(); } else { // Transform it for the interface/class List<JCStatement> cbody = !model.isInterfaceMember() ? transformMplBody(model, body) : null; result = transformMethod(def, model, methodName, true, true, cbody, true, Decl.withinInterface(model) ? 0 : OL_BODY, true, !Strategy.defaultParameterMethodOnSelf(model)); } return result; } /** * Transforms a method, optionally generating overloads and * default value methods * @param def The method * @param model The method model * @param methodName The method name * @param transformMethod Whether the method itself should be transformed. * @param actualAndAnnotations Whether the method itself is actual and has * model annotations * @param body The body of the method (or null for an abstract method) * @param transformOverloads Whether to generate overload methods * @param overloadsFlags The overload flags * @param transformDefaultValues Whether to generate default value methods * @param defaultValuesBody Whether the default value methods should have a body */ private List<JCTree> transformMethod(Tree.AnyMethod def, final Method model, final String methodName, boolean transformMethod, boolean actualAndAnnotations, List<JCStatement> body, boolean transformOverloads, int overloadsFlags, boolean transformDefaultValues, boolean defaultValuesBody) { ListBuffer<JCTree> lb = ListBuffer.<JCTree>lb(); final MethodDefinitionBuilder methodBuilder = MethodDefinitionBuilder.method( this, Decl.isAncestorLocal(model), model.isClassOrInterfaceMember(), methodName); final ParameterList parameterList = model.getParameterLists().get(0); Tree.ParameterList paramList = def.getParameterLists().get(0); for (Tree.Parameter param : paramList.getParameters()) { Parameter parameter = param.getDeclarationModel(); methodBuilder.parameter(parameter); if (parameter.isDefaulted() || parameter.isSequenced()) { if (model.getRefinedDeclaration() == model) { if (transformOverloads) { MethodDefinitionBuilder overloadBuilder = MethodDefinitionBuilder.method(this, Decl.isAncestorLocal(model), model.isClassOrInterfaceMember(), methodName); JCMethodDecl overloadedMethod = makeOverloadsForDefaultedParameter( overloadsFlags, overloadBuilder, model, parameterList.getParameters(), parameter).build(); lb.prepend(overloadedMethod); } if (transformDefaultValues) { lb.add(makeParamDefaultValueMethod(defaultValuesBody, model, paramList, param)); } } } } if (transformMethod) { methodBuilder.resultType(model); copyTypeParameters(model, methodBuilder); if (body != null) { // Construct the outermost method using the body we've built so far methodBuilder.body(body); } else { methodBuilder.noBody(); } methodBuilder .modifiers(transformMethodDeclFlags(model)); if (actualAndAnnotations) { methodBuilder.isActual(model.isActual()) .modelAnnotations(model.getAnnotations()); } if (CodegenUtil.hasCompilerAnnotation(def, "test")){ methodBuilder.annotations(List.of(make().Annotation(makeSelect("org", "junit", "Test"), List.<JCTree.JCExpression>nil()))); } lb.prepend(methodBuilder.build()); } return lb.toList(); } /** * Constructs all but the outer-most method of a {@code Method} with * multiple parameter lists * @param model The {@code Method} model * @param body The inner-most body */ List<JCStatement> transformMplBody(Method model, List<JCStatement> body) { ProducedType resultType = model.getType(); for (int index = model.getParameterLists().size() - 1; index > 0; index--) { resultType = gen().typeFact().getCallableType(resultType); CallableBuilder cb = CallableBuilder.mpl(gen(), resultType, model.getParameterLists().get(index), body); body = List.<JCStatement>of(make().Return(cb.build())); } return body; } private List<JCStatement> transformMethodBody(Tree.AnyMethod def) { List<JCStatement> body = null; final Method model = def.getDeclarationModel(); if (Decl.isDeferredInitialization(def)) { // Uninitialized or deferred initialized method => Make a Callable field current().field(PRIVATE, model.getName(), makeJavaType(typeFact().getCallableType(model.getType())), makeNull(), false); ListBuffer<JCExpression> args = ListBuffer.<JCExpression>lb(); for (Parameter param : model.getParameterLists().get(0).getParameters()) { args.append(makeQuotedIdent(param.getName())); } final JCBinary cond = make().Binary(JCTree.EQ, makeQuotedIdent(model.getName()), makeNull()); final JCStatement throw_ = make().Throw(make().NewClass(null, null, make().Type(syms().ceylonUninitializedMethodErrorType), List.<JCExpression>nil(), null)); JCExpression call = make().Apply(null, makeSelect( model.getName(), "$call"), args.toList()); call = gen().expressionGen().applyErasureAndBoxing(call, model.getType(), true, BoxingStrategy.UNBOXED, model.getType()); JCStatement stmt; if (isVoid(def)) { stmt = make().Exec(call); } else { stmt = make().Return(call); } return List.<JCStatement>of(make().If(cond, throw_, stmt)); } else if (def instanceof Tree.MethodDefinition) { Scope container = model.getContainer(); boolean isInterface = container instanceof com.redhat.ceylon.compiler.typechecker.model.Interface; if(!isInterface){ boolean prevNoExpressionlessReturn = statementGen().noExpressionlessReturn; try { statementGen().noExpressionlessReturn = Decl.isMpl(model); final Block block = ((Tree.MethodDefinition) def).getBlock(); body = statementGen().transform(block).getStatements(); // We void methods need to have their Callables return null // so adjust here. if (Decl.isMpl(model) && !block.getDefinitelyReturns()) { if (Decl.isUnboxedVoid(model)) { body = body.append(make().Return(makeNull())); } else { body = body.append(make().Return(makeErroneous(block, "non-void method doesn't definitely return"))); } } } finally { statementGen().noExpressionlessReturn = prevNoExpressionlessReturn; } } } else if (def instanceof MethodDeclaration && ((MethodDeclaration) def).getSpecifierExpression() != null) { body = transformSpecifiedMethodBody((MethodDeclaration)def, ((MethodDeclaration) def).getSpecifierExpression()); } return body; } List<JCStatement> transformSpecifiedMethodBody(Tree.MethodDeclaration def, SpecifierExpression specifierExpression) { final Method model = def.getDeclarationModel(); List<JCStatement> body; MethodDeclaration methodDecl = (MethodDeclaration)def; JCExpression bodyExpr; Tree.Term term = null; if (specifierExpression != null && specifierExpression.getExpression() != null) { term = specifierExpression.getExpression().getTerm(); } if (term instanceof Tree.FunctionArgument) { // Method specified with lambda: Don't bother generating a // Callable, just transform the expr to use as the method body. Tree.FunctionArgument fa = (Tree.FunctionArgument)term; ProducedType resultType = model.getType(); final java.util.List<com.redhat.ceylon.compiler.typechecker.tree.Tree.Parameter> lambdaParams = fa.getParameterLists().get(0).getParameters(); final java.util.List<com.redhat.ceylon.compiler.typechecker.tree.Tree.Parameter> defParams = def.getParameterLists().get(0).getParameters(); for (int ii = 0; ii < lambdaParams.size(); ii++) { gen().addVariableSubst(lambdaParams.get(ii).getIdentifier().getText(), defParams.get(ii).getIdentifier().getText()); } bodyExpr = gen().expressionGen().transformExpression(fa.getExpression(), BoxingStrategy.UNBOXED, null); bodyExpr = gen().expressionGen().applyErasureAndBoxing(bodyExpr, resultType, true, model.getUnboxed() ? BoxingStrategy.UNBOXED : BoxingStrategy.BOXED, resultType); for (int ii = 0; ii < lambdaParams.size(); ii++) { gen().removeVariableSubst(lambdaParams.get(ii).getIdentifier().getText(), null); } } else { InvocationBuilder specifierBuilder = InvocationBuilder.forSpecifierInvocation(gen(), specifierExpression, methodDecl.getDeclarationModel()); bodyExpr = specifierBuilder.build(); } if (Decl.isUnboxedVoid(model)) { body = List.<JCStatement>of(make().Exec(bodyExpr)); } else { body = List.<JCStatement>of(make().Return(bodyExpr)); } return body; } private boolean isVoid(Tree.Declaration def) { if (def instanceof Tree.AnyMethod) { return gen().isVoid(((Tree.AnyMethod)def).getType().getTypeModel()); } else if (def instanceof Tree.AnyClass) { // Consider classes void since ctors don't require a return statement return true; } throw new RuntimeException(); } private boolean isVoid(Declaration def) { if (def instanceof Method) { return gen().isVoid(((Method)def).getType()); } else if (def instanceof Class) { // Consider classes void since ctors don't require a return statement return true; } throw new RuntimeException(); } private static int OL_BODY = 1<<0; private static int OL_IMPLEMENTOR = 1<<1; private static int OL_DELEGATOR = 1<<2; /** * Generates an overloaded method where all the defaulted parameters after * and including the given {@code currentParam} are given their default * values. Using Java-side overloading ensures positional invocations * are binary compatible when new defaulted parameters are appended to a * parameter list. */ private MethodDefinitionBuilder makeOverloadsForDefaultedParameter( int flags, MethodDefinitionBuilder overloadBuilder, Declaration model, Tree.ParameterList paramList, Tree.Parameter currentParam) { at(currentParam); java.util.List<Parameter> parameters = new java.util.ArrayList<Parameter>(paramList.getParameters().size()); for (Tree.Parameter param : paramList.getParameters()) { parameters.add(param.getDeclarationModel()); } return makeOverloadsForDefaultedParameter(flags, overloadBuilder, model, parameters, currentParam.getDeclarationModel()); } /** * Generates an overloaded method where all the defaulted parameters after * and including the given {@code currentParam} are given their default * values. Using Java-side overloading ensures positional invocations * are binary compatible when new defaulted parameters are appended to a * parameter list. */ private MethodDefinitionBuilder makeOverloadsForDefaultedParameter( int flags, MethodDefinitionBuilder overloadBuilder, final Declaration model, java.util.List<Parameter> parameters, final Parameter currentParam) { overloadBuilder.annotations(makeAtIgnore()); final JCExpression methName; if (model instanceof Method) { long mods = transformOverloadMethodDeclFlags((Method)model); if ((flags & OL_BODY) != 0) { mods &= ~ABSTRACT; } if ((flags & OL_IMPLEMENTOR) != 0 || (flags & OL_DELEGATOR) != 0) { mods |= FINAL; } overloadBuilder.modifiers(mods); if ((flags & OL_DELEGATOR) != 0) { methName = makeSelect(makeUnquotedIdent("$this"), CodegenUtil.quoteMethodNameIfProperty((Method)model, gen())); } else { methName = makeQuotedIdent(CodegenUtil.quoteMethodNameIfProperty((Method)model, gen())); } overloadBuilder.resultType((Method)model); } else if (model instanceof Class) { overloadBuilder.modifiers(transformOverloadCtorFlags((Class)model)); methName = makeUnquotedIdent("this"); } else { throw new RuntimeException(); } // TODO MPL if (model instanceof Method) { copyTypeParameters((Method)model, overloadBuilder); } // TODO Some simple default expressions (e.g. literals, null and // base expressions it might be worth inlining the expression rather // than calling the default value method. // TODO This really belongs in the invocation builder ListBuffer<JCExpression> args = ListBuffer.<JCExpression>lb(); ListBuffer<JCStatement> vars = ListBuffer.<JCStatement>lb(); final String companionInstanceName = tempName("$impl$"); if (model instanceof Class && !Strategy.defaultParameterMethodStatic(model)) { Class classModel = (Class)model; vars.append(makeVar(companionInstanceName, makeJavaType(classModel.getType(), AbstractTransformer.COMPANION), make().NewClass(null, null, makeJavaType(classModel.getType(), AbstractTransformer.COMPANION), List.<JCExpression>nil(), null))); } boolean useDefault = false; for (Parameter param2 : parameters) { if (param2 == currentParam) { useDefault = true; } if (useDefault) { String methodName = CodegenUtil.getDefaultedParamMethodName(model, param2); JCExpression defaultValueMethodName; List<JCExpression> typeArguments = List.<JCExpression>nil(); if (Strategy.defaultParameterMethodOnSelf(model) || (flags & OL_IMPLEMENTOR) != 0) { defaultValueMethodName = gen().makeQuotedIdent(methodName); } else if (Strategy.defaultParameterMethodStatic(model)){ defaultValueMethodName = gen().makeQuotedQualIdent(makeQuotedQualIdentFromString(getFQDeclarationName(model)), methodName); if (model instanceof Class) { typeArguments = typeArguments((Class)model); } else if (model instanceof Method) { typeArguments = typeArguments((Method)model); } } else { defaultValueMethodName = gen().makeQuotedQualIdent(makeQuotedIdent(companionInstanceName), methodName); } String varName = tempName("$"+param2.getName()+"$"); final ProducedType paramType; if (param2 instanceof FunctionalParameter) { paramType = typeFact().getCallableType(param2.getType()); } else { paramType = param2.getType(); } vars.append(makeVar(varName, makeJavaType(paramType), make().Apply(typeArguments, defaultValueMethodName, ListBuffer.<JCExpression>lb().appendList(args).toList()))); args.add(makeUnquotedIdent(varName)); } else { overloadBuilder.parameter(param2); args.add(makeQuotedIdent(param2.getName())); } } // TODO Type args on method call if ((flags & OL_BODY) != 0) { JCExpression invocation = make().Apply(List.<JCExpression>nil(), methName, args.toList()); if (isVoid(model)) { vars.append(make().Exec(invocation)); invocation = make().LetExpr(vars.toList(), makeNull()); overloadBuilder.body(make().Exec(invocation)); } else { invocation = make().LetExpr(vars.toList(), invocation); overloadBuilder.body(make().Return(invocation)); } } else { overloadBuilder.noBody(); } return overloadBuilder; } /** * Creates a (possibly abstract) method for retrieving the value for a * defaulted parameter */ private JCMethodDecl makeParamDefaultValueMethod(boolean noBody, Declaration container, Tree.ParameterList params, Tree.Parameter currentParam) { at(currentParam); Parameter parameter = currentParam.getDeclarationModel(); String name = CodegenUtil.getDefaultedParamMethodName(container, parameter ); MethodDefinitionBuilder methodBuilder = MethodDefinitionBuilder.method(this, Decl.isAncestorLocal(container), true, name); methodBuilder.annotations(makeAtIgnore()); int modifiers = noBody ? PUBLIC | ABSTRACT : FINAL; if (container.isShared()) { modifiers |= PUBLIC; } else if (!container.isToplevel() && !noBody){ modifiers |= PRIVATE; } if (Strategy.defaultParameterMethodStatic(container)) { modifiers |= STATIC; } methodBuilder.modifiers(modifiers); if (container instanceof Method) { copyTypeParameters((Method)container, methodBuilder); } else if (Decl.isToplevel(container) && container instanceof Class) { copyTypeParameters((Class)container, methodBuilder); } // Add any of the preceding parameters as parameters to the method for (Tree.Parameter p : params.getParameters()) { if (p == currentParam) { break; } methodBuilder.parameter(p); } // The method's return type is the same as the parameter's type methodBuilder.resultType(parameter); // The implementation of the method if (noBody) { methodBuilder.noBody(); } else { JCExpression expr = expressionGen().transform(currentParam); JCBlock body = at(currentParam).Block(0, List.<JCStatement> of(at(currentParam).Return(expr))); methodBuilder.block(body); } return methodBuilder.build(); } public List<JCTree> transformObjectDefinition(Tree.ObjectDefinition def, ClassDefinitionBuilder containingClassBuilder) { return transformObject(def, def.getDeclarationModel(), def.getAnonymousClass(), containingClassBuilder, true); } public List<JCTree> transformObjectArgument(Tree.ObjectArgument def) { return transformObject(def, def.getDeclarationModel(), def.getAnonymousClass(), null, false); } private List<JCTree> transformObject(Node def, Value model, Class klass, ClassDefinitionBuilder containingClassBuilder, boolean makeInstanceIfLocal) { noteDecl(model); String name = model.getName(); ClassDefinitionBuilder objectClassBuilder = ClassDefinitionBuilder.klass(this, Decl.isAncestorLocal(model), name); CeylonVisitor visitor = gen().visitor; final ListBuffer<JCTree> prevDefs = visitor.defs; final boolean prevInInitializer = visitor.inInitializer; final ClassDefinitionBuilder prevClassBuilder = visitor.classBuilder; List<JCStatement> childDefs; try { visitor.defs = new ListBuffer<JCTree>(); visitor.inInitializer = true; visitor.classBuilder = objectClassBuilder; def.visitChildren(visitor); childDefs = (List<JCStatement>)visitor.getResult().toList(); } finally { visitor.classBuilder = prevClassBuilder; visitor.inInitializer = prevInInitializer; visitor.defs = prevDefs; } satisfaction(klass, objectClassBuilder); TypeDeclaration decl = model.getType().getDeclaration(); if (Decl.isToplevel(model) && def instanceof Tree.ObjectDefinition) { objectClassBuilder.body(makeObjectGlobal((Tree.ObjectDefinition)def, model.getQualifiedNameString()).toList()); } List<JCTree> result = objectClassBuilder .annotations(makeAtObject()) .modelAnnotations(model.getAnnotations()) .modifiers(transformObjectDeclFlags(model)) .constructorModifiers(PRIVATE) .satisfies(decl.getSatisfiedTypes()) .init(childDefs) .build(); if (Decl.isLocal(model) && makeInstanceIfLocal) { result = result.append(makeLocalIdentityInstance(name, false)); } else if (Decl.withinClassOrInterface(model)) { boolean visible = Decl.isCaptured(model); int modifiers = FINAL | ((visible) ? PRIVATE : 0); JCExpression type = makeJavaType(klass.getType()); JCExpression initialValue = makeNewClass(makeJavaType(klass.getType()), null); containingClassBuilder.field(modifiers, name, type, initialValue, !visible); if (visible) { result = result.appendList(AttributeDefinitionBuilder .getter(this, name, model) .modifiers(transformAttributeGetSetDeclFlags(model, false)) .build()); } } return result; } private ListBuffer<JCTree> makeObjectGlobal(Tree.ObjectDefinition decl, String generatedClassName) { ListBuffer<JCTree> defs = ListBuffer.lb(); AttributeDefinitionBuilder builder = AttributeDefinitionBuilder .wrapped(this, decl.getIdentifier().getText(), decl.getDeclarationModel(), true) .immutable() .initialValue(makeNewClass(generatedClassName, true)) .is(PUBLIC, Decl.isShared(decl)) .is(STATIC, true); builder.appendDefinitionsTo(defs); return defs; } /** * Makes a {@code main()} method which calls the given top-level method * @param def */ private JCMethodDecl makeMainForClass(final ClassOrInterface model) { at(null); JCExpression nameId = makeQuotedFQIdent(model.getQualifiedNameString()); JCNewClass expr = make().NewClass(null, null, nameId, List.<JCTree.JCExpression>nil(), null); return makeMainMethod(model, expr); } /** * Makes a {@code main()} method which calls the given top-level method * @param method */ private JCMethodDecl makeMainForFunction(Method method) { at(null); - String name = method.getName(); String path = method.getQualifiedNameString(); - path += "." + name; - JCExpression qualifiedName = makeQuotedFQIdent(path); + JCExpression qualifiedName = makeSelect(makeQuotedFQIdent(path), CodegenUtil.quoteMethodName(method)); JCMethodDecl mainMethod = makeMainMethod(method, make().Apply(null, qualifiedName, List.<JCTree.JCExpression>nil())); return mainMethod; } /** * Makes a {@code main()} method which calls the given callee * (a no-args method or class) * @param decl * @param callee */ private JCMethodDecl makeMainMethod(Declaration decl, JCExpression callee) { // Add a main() method MethodDefinitionBuilder methbuilder = MethodDefinitionBuilder .main(this, Decl.isAncestorLocal(decl)) .annotations(makeAtIgnore()); // Add call to process.setupArguments JCExpression argsId = makeUnquotedIdent("args"); JCMethodInvocation processExpr = make().Apply(null, makeFQIdent("ceylon", "language", "process", "getProcess"), List.<JCTree.JCExpression>nil()); methbuilder.body(make().Exec(make().Apply(null, makeSelect(processExpr, "setupArguments"), List.<JCTree.JCExpression>of(argsId)))); // Add call to toplevel method methbuilder.body(make().Exec(callee)); return methbuilder.build(); } void copyTypeParameters(Tree.AnyMethod def, MethodDefinitionBuilder methodBuilder) { copyTypeParameters(def.getDeclarationModel(), methodBuilder); } void copyTypeParameters(Functional def, MethodDefinitionBuilder methodBuilder) { if (def.getTypeParameters() != null) { for (TypeParameter t : def.getTypeParameters()) { methodBuilder.typeParameter(t); } } } void copyTypeParameters(Tree.AnyClass def, MethodDefinitionBuilder methodBuilder) { copyTypeParameters(def.getDeclarationModel(), methodBuilder); } } diff --git a/src/com/redhat/ceylon/compiler/java/codegen/ExpressionTransformer.java b/src/com/redhat/ceylon/compiler/java/codegen/ExpressionTransformer.java index 83160bc6f..eeb5dc545 100755 --- a/src/com/redhat/ceylon/compiler/java/codegen/ExpressionTransformer.java +++ b/src/com/redhat/ceylon/compiler/java/codegen/ExpressionTransformer.java @@ -1,2032 +1,2032 @@ /* * Copyright Red Hat Inc. and/or its affiliates and other contributors * as indicated by the authors tag. All rights reserved. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions * of the GNU General Public License version 2. * * This particular file is subject to the "Classpath" exception as provided in the * LICENSE file that accompanied this code. * * This program is distributed in the hope that it will be useful, but WITHOUT A * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A * PARTICULAR PURPOSE. See the GNU General Public License for more details. * You should have received a copy of the GNU General Public License, * along with this distribution; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ package com.redhat.ceylon.compiler.java.codegen; import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; import com.redhat.ceylon.compiler.java.codegen.Operators.AssignmentOperatorTranslation; import com.redhat.ceylon.compiler.java.codegen.Operators.OperatorTranslation; import com.redhat.ceylon.compiler.java.codegen.Operators.OptimisationStrategy; import com.redhat.ceylon.compiler.java.util.Util; import com.redhat.ceylon.compiler.loader.model.LazyMethod; import com.redhat.ceylon.compiler.loader.model.LazyValue; import com.redhat.ceylon.compiler.typechecker.model.Declaration; import com.redhat.ceylon.compiler.typechecker.model.Functional; import com.redhat.ceylon.compiler.typechecker.model.FunctionalParameter; import com.redhat.ceylon.compiler.typechecker.model.Getter; import com.redhat.ceylon.compiler.typechecker.model.Interface; import com.redhat.ceylon.compiler.typechecker.model.Method; import com.redhat.ceylon.compiler.typechecker.model.ProducedType; import com.redhat.ceylon.compiler.typechecker.model.Scope; import com.redhat.ceylon.compiler.typechecker.model.TypeDeclaration; import com.redhat.ceylon.compiler.typechecker.model.TypeParameter; import com.redhat.ceylon.compiler.typechecker.model.TypedDeclaration; import com.redhat.ceylon.compiler.typechecker.model.Value; import com.redhat.ceylon.compiler.typechecker.tree.Node; import com.redhat.ceylon.compiler.typechecker.tree.Tree; import com.redhat.ceylon.compiler.typechecker.tree.Tree.BooleanCondition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Comprehension; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Condition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.DefaultArgument; import com.redhat.ceylon.compiler.typechecker.tree.Tree.ExistsCondition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.ExistsOrNonemptyCondition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.ExpressionComprehensionClause; import com.redhat.ceylon.compiler.typechecker.tree.Tree.ForComprehensionClause; import com.redhat.ceylon.compiler.typechecker.tree.Tree.FunctionArgument; import com.redhat.ceylon.compiler.typechecker.tree.Tree.IfComprehensionClause; import com.redhat.ceylon.compiler.typechecker.tree.Tree.IsCondition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.KeyValueIterator; import com.redhat.ceylon.compiler.typechecker.tree.Tree.NonemptyCondition; import com.redhat.ceylon.compiler.typechecker.tree.Tree.SpecifierExpression; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Term; import com.redhat.ceylon.compiler.typechecker.tree.Tree.ValueIterator; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Variable; import com.sun.tools.javac.code.TypeTags; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCBlock; import com.sun.tools.javac.tree.JCTree.JCConditional; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCExpressionStatement; import com.sun.tools.javac.tree.JCTree.JCForLoop; import com.sun.tools.javac.tree.JCTree.JCLiteral; import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; import com.sun.tools.javac.tree.JCTree.JCNewArray; import com.sun.tools.javac.tree.JCTree.JCNewClass; import com.sun.tools.javac.tree.JCTree.JCStatement; import com.sun.tools.javac.tree.JCTree.JCUnary; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.ListBuffer; import com.sun.tools.javac.util.Name; /** * This transformer deals with expressions only */ public class ExpressionTransformer extends AbstractTransformer { static{ // only there to make sure this class is initialised before the enums defined in it, otherwise we // get an initialisation error Operators.init(); } private boolean inStatement = false; private boolean withinInvocation = false; private boolean withinCallableInvocation = false; private boolean withinSuperInvocation = false; public static ExpressionTransformer getInstance(Context context) { ExpressionTransformer trans = context.get(ExpressionTransformer.class); if (trans == null) { trans = new ExpressionTransformer(context); context.put(ExpressionTransformer.class, trans); } return trans; } private ExpressionTransformer(Context context) { super(context); } // // Statement expressions public JCStatement transform(Tree.ExpressionStatement tree) { // ExpressionStatements do not return any value, therefore we don't care about the type of the expressions. inStatement = true; JCStatement result = at(tree).Exec(transformExpression(tree.getExpression(), BoxingStrategy.INDIFFERENT, null)); inStatement = false; return result; } public JCStatement transform(Tree.SpecifierStatement op) { // SpecifierStatement do not return any value, therefore we don't care about the type of the expressions. inStatement = true; JCStatement result = at(op).Exec(transformAssignment(op, op.getBaseMemberExpression(), op.getSpecifierExpression().getExpression())); inStatement = false; return result; } // // Any sort of expression JCExpression transformExpression(final Tree.Term expr) { return transformExpression(expr, BoxingStrategy.BOXED, null); } JCExpression transformExpression(final Tree.Term expr, BoxingStrategy boxingStrategy, ProducedType expectedType) { if (expr == null) { return null; } at(expr); if (inStatement && boxingStrategy != BoxingStrategy.INDIFFERENT) { // We're not directly inside the ExpressionStatement anymore inStatement = false; } // Cope with things like ((expr)) // FIXME: shouldn't that be in the visitor? Tree.Term term = expr; while (term instanceof Tree.Expression) { term = ((Tree.Expression)term).getTerm(); } CeylonVisitor v = gen().visitor; final ListBuffer<JCTree> prevDefs = v.defs; final boolean prevInInitializer = v.inInitializer; final ClassDefinitionBuilder prevClassBuilder = v.classBuilder; JCExpression result = makeErroneous(); try { v.defs = new ListBuffer<JCTree>(); v.inInitializer = false; v.classBuilder = gen().current(); term.visit(v); if (v.hasResult()) { result = v.getSingleResult(); } } finally { v.classBuilder = prevClassBuilder; v.inInitializer = prevInInitializer; v.defs = prevDefs; } result = applyErasureAndBoxing(result, expr, boxingStrategy, expectedType); return result; } JCExpression transform(FunctionArgument farg) { Method model = farg.getDeclarationModel(); ProducedType callableType = typeFact().getCallableType(model.getType()); // TODO MPL CallableBuilder callableBuilder = CallableBuilder.anonymous( gen(), farg.getExpression(), model.getParameterLists().get(0), callableType); return callableBuilder.build(); } // // Boxing and erasure of expressions private JCExpression applyErasureAndBoxing(JCExpression result, Tree.Term expr, BoxingStrategy boxingStrategy, ProducedType expectedType) { ProducedType exprType = expr.getTypeModel(); boolean exprBoxed = !CodegenUtil.isUnBoxed(expr); return applyErasureAndBoxing(result, exprType, exprBoxed, boxingStrategy, expectedType); } JCExpression applyErasureAndBoxing(JCExpression result, ProducedType exprType, boolean exprBoxed, BoxingStrategy boxingStrategy, ProducedType expectedType) { boolean canCast = false; if (expectedType != null // don't add cast to an erased type && !willEraseToObject(expectedType) // don't add cast for null && !isNothing(exprType)) { if(willEraseToObject(exprType)){ // Set the new expression type to a "clean" copy of the expected type // (without the underlying type, because the cast is always to a non-primitive) exprType = expectedType.withoutUnderlyingType(); // Erased types need a type cast JCExpression targetType = makeJavaType(expectedType, AbstractTransformer.TYPE_ARGUMENT); result = make().TypeCast(targetType, result); }else canCast = true; } // we must do the boxing after the cast to the proper type JCExpression ret = boxUnboxIfNecessary(result, exprBoxed, exprType, boxingStrategy); // now check if we need variance casts if (canCast) { ret = applyVarianceCasts(ret, exprType, exprBoxed, boxingStrategy, expectedType); } ret = applySelfTypeCasts(ret, exprType, exprBoxed, boxingStrategy, expectedType); ret = applyJavaTypeConversions(ret, exprType, expectedType, boxingStrategy); return ret; } private JCExpression applyVarianceCasts(JCExpression result, ProducedType exprType, boolean exprBoxed, BoxingStrategy boxingStrategy, ProducedType expectedType) { // unboxed types certainly don't need casting for variance if(exprBoxed || boxingStrategy == BoxingStrategy.BOXED){ VarianceCastResult varianceCastResult = getVarianceCastResult(expectedType, exprType); if(varianceCastResult != null){ // Types with variance types need a type cast, let's start with a raw cast to get rid // of Java's type system constraint (javac doesn't grok multiple implementations of the same // interface with different type params, which the JVM allows) JCExpression targetType = makeJavaType(expectedType, AbstractTransformer.WANT_RAW_TYPE); // do not change exprType here since this is just a Java workaround result = make().TypeCast(targetType, result); // now, because a raw cast is losing a lot of info, can we do better? if(varianceCastResult.isBetterCastAvailable()){ // let's recast that to something finer than a raw cast targetType = makeJavaType(varianceCastResult.castType, AbstractTransformer.TYPE_ARGUMENT); result = make().TypeCast(targetType, result); } } } return result; } private JCExpression applySelfTypeCasts(JCExpression result, ProducedType exprType, boolean exprBoxed, BoxingStrategy boxingStrategy, ProducedType expectedType) { final ProducedType selfType = exprType.getDeclaration().getSelfType(); if (selfType != null) { if (selfType.isExactly(exprType) // self-type within its own scope || (expectedType != null && !exprType.isExactly(expectedType))) { // self type within another scope final ProducedType castType = findTypeArgument(exprType, selfType.getDeclaration()); JCExpression targetType = makeJavaType(castType, exprBoxed ? AbstractTransformer.TYPE_ARGUMENT : 0); result = make().TypeCast(targetType, result); } } return result; } private ProducedType findTypeArgument(ProducedType type, TypeDeclaration declaration) { if(type == null) return null; ProducedType typeArgument = type.getTypeArguments().get(declaration); if(typeArgument != null) return typeArgument; return findTypeArgument(type.getQualifyingType(), declaration); } private JCExpression applyJavaTypeConversions(JCExpression ret, ProducedType exprType, ProducedType expectedType, BoxingStrategy boxingStrategy) { ProducedType definiteExprType = simplifyType(exprType); String convertFrom = definiteExprType.getUnderlyingType(); ProducedType definiteExpectedType = null; String convertTo = null; if(expectedType != null){ definiteExpectedType = simplifyType(expectedType); convertTo = definiteExpectedType.getUnderlyingType(); } // check for identity conversion if(convertFrom != null && convertFrom.equals(convertTo)) return ret; boolean arrayUnbox = boxingStrategy == BoxingStrategy.UNBOXED && definiteExpectedType != null && isCeylonArray(definiteExpectedType); if(convertTo != null){ if(convertTo.equals("byte")) ret = make().TypeCast(syms().byteType, ret); else if(convertTo.equals("short")) ret = make().TypeCast(syms().shortType, ret); else if(convertTo.equals("int")) ret = make().TypeCast(syms().intType, ret); else if(convertTo.equals("float")) ret = make().TypeCast(syms().floatType, ret); else if(convertTo.equals("char")) ret = make().TypeCast(syms().charType, ret); else if(convertTo.equals("byte[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.BYTE)), ret); else if(convertTo.equals("short[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.SHORT)), ret); else if(convertTo.equals("int[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.INT)), ret); else if(convertTo.equals("long[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.LONG)), ret); else if(convertTo.equals("float[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.FLOAT)), ret); else if(convertTo.equals("double[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.DOUBLE)), ret); else if(convertTo.equals("char[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.CHAR)), ret); else if(convertTo.equals("boolean[]")) ret = make().TypeCast(make().TypeArray(make().TypeIdent(TypeTags.BOOLEAN)), ret); else if (arrayUnbox) { String ct = convertTo.substring(0, convertTo.length() - 2); ret = make().TypeCast(make().TypeArray(makeQuotedQualIdentFromString(ct)), ret); } } else if (arrayUnbox) { ProducedType ct = getArrayComponentType(definiteExpectedType); ret = make().TypeCast(make().TypeArray(makeJavaType(ct)), ret); } return ret; } /** * Gets the first type parameter from the type model representing a * ceylon.language.Array<Element>. * @param typeModel * @return The component type of the Array. */ protected ProducedType getArrayComponentType(ProducedType typeModel) { assert isCeylonArray(typeModel); return typeModel.getTypeArgumentList().get(0); } private static class VarianceCastResult { ProducedType castType; VarianceCastResult(ProducedType castType){ this.castType = castType; } private VarianceCastResult(){} boolean isBetterCastAvailable(){ return castType != null; } } private static final VarianceCastResult RawCastVarianceResult = new VarianceCastResult(); private VarianceCastResult getVarianceCastResult(ProducedType expectedType, ProducedType exprType) { // exactly the same type, doesn't need casting if(exprType.isExactly(expectedType)) return null; // if we're not trying to put it into an interface, there's no need if(!(expectedType.getDeclaration() instanceof Interface)) return null; // the interface must have type arguments, otherwise we can't use raw types if(expectedType.getTypeArguments().isEmpty()) return null; // see if any of those type arguments has variance boolean hasVariance = false; for(TypeParameter t : expectedType.getTypeArguments().keySet()){ if(t.isContravariant() || t.isCovariant()){ hasVariance = true; break; } } if(!hasVariance) return null; // see if we're inheriting the interface twice with different type parameters java.util.List<ProducedType> satisfiedTypes = new LinkedList<ProducedType>(); for(ProducedType superType : exprType.getSupertypes()){ if(superType.getDeclaration() == expectedType.getDeclaration()) satisfiedTypes.add(superType); } // we need at least two instantiations if(satisfiedTypes.size() <= 1) return null; boolean needsCast = false; // we need at least one that differs for(ProducedType superType : satisfiedTypes){ if(!exprType.isExactly(superType)){ needsCast = true; break; } } // no cast needed if they are all the same type if(!needsCast) return null; // find the better cast match for(ProducedType superType : satisfiedTypes){ if(expectedType.isExactly(superType)) return new VarianceCastResult(superType); } // nothing better than a raw cast (Stef: not sure that can happen) return RawCastVarianceResult; } // // Literals JCExpression ceylonLiteral(String s) { JCLiteral lit = make().Literal(s); return lit; } public JCExpression transform(Tree.StringLiteral string) { String value = string .getText() .substring(1, string.getText().length() - 1); at(string); return ceylonLiteral(value); } public JCExpression transform(Tree.QuotedLiteral string) { String value = string .getText() .substring(1, string.getText().length() - 1); JCExpression result = makeSelect(makeIdent(syms().ceylonQuotedType), "instance"); return at(string).Apply(null, result, List.<JCTree.JCExpression>of(make().Literal(value))); } public JCExpression transform(Tree.CharLiteral lit) { JCExpression expr = make().Literal(TypeTags.CHAR, (int) lit.getText().charAt(1)); // XXX make().Literal(lit.value) doesn't work here... something // broken in javac? return expr; } public JCExpression transform(Tree.FloatLiteral lit) { double value = Double.parseDouble(lit.getText()); // Don't need to handle the negative infinity and negative zero cases // because Ceylon Float literals have no sign if (value == Double.POSITIVE_INFINITY) { return makeErroneous(lit, "Literal so large it is indistinguishable from infinity"); } else if (value == 0.0 && !lit.getText().equals("0.0")) { return makeErroneous(lit, "Literal so small it is indistinguishable from zero"); } JCExpression expr = make().Literal(value); return expr; } private JCExpression integerLiteral(Node node, String num) { try { return make().Literal(Long.parseLong(num)); } catch (NumberFormatException e) { return makeErroneous(node, "Literal outside representable range"); } } public JCExpression transform(Tree.NaturalLiteral lit) { return integerLiteral(lit, lit.getText()); } public JCExpression transformStringExpression(Tree.StringTemplate expr) { at(expr); JCExpression builder; builder = make().NewClass(null, null, makeFQIdent("java","lang","StringBuilder"), List.<JCExpression>nil(), null); java.util.List<Tree.StringLiteral> literals = expr.getStringLiterals(); java.util.List<Tree.Expression> expressions = expr.getExpressions(); for (int ii = 0; ii < literals.size(); ii += 1) { Tree.StringLiteral literal = literals.get(ii); if (!"\"\"".equals(literal.getText())) {// ignore empty string literals at(literal); builder = make().Apply(null, makeSelect(builder, "append"), List.<JCExpression>of(transform(literal))); } if (ii == expressions.size()) { // The loop condition includes the last literal, so break out // after that because we've already exhausted all the expressions break; } Tree.Expression expression = expressions.get(ii); at(expression); // Here in both cases we don't need a type cast for erasure if (isCeylonBasicType(expression.getTypeModel())) {// TODO: Test should be erases to String, long, int, boolean, char, byte, float, double // If erases to a Java primitive just call append, don't box it just to call format. String method = isCeylonCharacter(expression.getTypeModel()) ? "appendCodePoint" : "append"; builder = make().Apply(null, makeSelect(builder, method), List.<JCExpression>of(transformExpression(expression, BoxingStrategy.UNBOXED, null))); } else { JCMethodInvocation formatted = make().Apply(null, makeSelect(transformExpression(expression), "toString"), List.<JCExpression>nil()); builder = make().Apply(null, makeSelect(builder, "append"), List.<JCExpression>of(formatted)); } } return make().Apply(null, makeSelect(builder, "toString"), List.<JCExpression>nil()); } public JCExpression transform(Tree.SequenceEnumeration value) { at(value); if (value.getComprehension() != null) { return make().Apply(null, make().Select(transformComprehension(value.getComprehension()), names().fromString("getSequence")), List.<JCExpression>nil()); } else if (value.getSequencedArgument() != null) { java.util.List<Tree.Expression> list = value.getSequencedArgument().getExpressionList().getExpressions(); if (value.getSequencedArgument().getEllipsis() == null) { ProducedType seqElemType = typeFact().getIteratedType(value.getTypeModel()); return makeSequence(list, seqElemType); } else { return make().Apply(null, make().Select(transformExpression(list.get(0)), names().fromString("getSequence")), List.<JCExpression>nil()); } } else { return makeEmpty(); } } public JCTree transform(Tree.This expr) { at(expr); if (needDollarThis(expr.getScope())) { return makeUnquotedIdent("$this"); } if (isWithinCallableInvocation()) { return makeSelect(makeJavaType(expr.getTypeModel()), "this"); } return makeUnquotedIdent("this"); } public JCTree transform(Tree.Super expr) { at(expr); return makeUnquotedIdent("super"); } public JCTree transform(Tree.Outer expr) { at(expr); ProducedType outerClass = com.redhat.ceylon.compiler.typechecker.model.Util.getOuterClassOrInterface(expr.getScope()); return makeSelect(makeQuotedIdent(outerClass.getDeclaration().getName()), "this"); } // // Unary and Binary operators that can be overridden // // Unary operators public JCExpression transform(Tree.NotOp op) { // No need for an erasure cast since Term must be Boolean and we never need to erase that JCExpression term = transformExpression(op.getTerm(), CodegenUtil.getBoxingStrategy(op), null); JCUnary jcu = at(op).Unary(JCTree.NOT, term); return jcu; } public JCExpression transform(Tree.IsOp op) { // we don't need any erasure type cast for an "is" test JCExpression expression = transformExpression(op.getTerm()); at(op); String varName = tempName(); JCExpression test = makeTypeTest(null, varName, op.getType().getTypeModel()); return makeLetExpr(varName, List.<JCStatement>nil(), make().Type(syms().objectType), expression, test); } public JCTree transform(Tree.Nonempty op) { // we don't need any erasure type cast for a "nonempty" test JCExpression expression = transformExpression(op.getTerm()); at(op); String varName = tempName(); JCExpression test = makeNonEmptyTest(null, varName); return makeLetExpr(varName, List.<JCStatement>nil(), make().Type(syms().objectType), expression, test); } public JCTree transform(Tree.Exists op) { // we don't need any erasure type cast for an "exists" test JCExpression expression = transformExpression(op.getTerm()); at(op); return make().Binary(JCTree.NE, expression, makeNull()); } public JCExpression transform(Tree.PositiveOp op) { return transformOverridableUnaryOperator(op, op.getUnit().getInvertableDeclaration()); } public JCExpression transform(Tree.NegativeOp op) { if (op.getTerm() instanceof Tree.NaturalLiteral) { // To cope with -9223372036854775808 we can't just parse the // number separately from the sign return integerLiteral(op.getTerm(), "-" + op.getTerm().getText()); } return transformOverridableUnaryOperator(op, op.getUnit().getInvertableDeclaration()); } public JCExpression transform(Tree.UnaryOperatorExpression op) { return transformOverridableUnaryOperator(op, (ProducedType)null); } private JCExpression transformOverridableUnaryOperator(Tree.UnaryOperatorExpression op, Interface compoundType) { ProducedType leftType = getSupertype(op.getTerm(), compoundType); return transformOverridableUnaryOperator(op, leftType); } private JCExpression transformOverridableUnaryOperator(Tree.UnaryOperatorExpression op, ProducedType expectedType) { at(op); Tree.Term term = op.getTerm(); OperatorTranslation operator = Operators.getOperator(op.getClass()); if (operator == null) { return makeErroneous(op); } if(operator.getOptimisationStrategy(op, this).useJavaOperator()){ // optimisation for unboxed types JCExpression expr = transformExpression(term, BoxingStrategy.UNBOXED, expectedType); // unary + is essentially a NOOP if(operator == OperatorTranslation.UNARY_POSITIVE) return expr; return make().Unary(operator.javacOperator, expr); } return make().Apply(null, makeSelect(transformExpression(term, BoxingStrategy.BOXED, expectedType), Util.getGetterName(operator.ceylonMethod)), List.<JCExpression> nil()); } // // Binary operators public JCExpression transform(Tree.NotEqualOp op) { OperatorTranslation operator = Operators.OperatorTranslation.BINARY_EQUAL; OptimisationStrategy optimisationStrategy = operator.getOptimisationStrategy(op, this); // we want it unboxed only if the operator is optimised // we don't care about the left erased type, since equals() is on Object JCExpression left = transformExpression(op.getLeftTerm(), optimisationStrategy.getBoxingStrategy(), null); // we don't care about the right erased type, since equals() is on Object JCExpression expr = transformOverridableBinaryOperator(op, operator, optimisationStrategy, left, null); return at(op).Unary(JCTree.NOT, expr); } public JCExpression transform(Tree.RangeOp op) { // we need to get the range bound type ProducedType comparableType = getSupertype(op.getLeftTerm(), op.getUnit().getComparableDeclaration()); ProducedType paramType = getTypeArgument(comparableType); JCExpression lower = transformExpression(op.getLeftTerm(), BoxingStrategy.BOXED, paramType); JCExpression upper = transformExpression(op.getRightTerm(), BoxingStrategy.BOXED, paramType); ProducedType rangeType = typeFact().getRangeType(op.getLeftTerm().getTypeModel()); JCExpression typeExpr = makeJavaType(rangeType, CeylonTransformer.CLASS_NEW); return at(op).NewClass(null, null, typeExpr, List.<JCExpression> of(lower, upper), null); } public JCExpression transform(Tree.EntryOp op) { // no erasure cast needed for both terms JCExpression key = transformExpression(op.getLeftTerm()); JCExpression elem = transformExpression(op.getRightTerm()); ProducedType entryType = typeFact().getEntryType(op.getLeftTerm().getTypeModel(), op.getRightTerm().getTypeModel()); JCExpression typeExpr = makeJavaType(entryType, CeylonTransformer.CLASS_NEW); return at(op).NewClass(null, null, typeExpr , List.<JCExpression> of(key, elem), null); } public JCTree transform(Tree.DefaultOp op) { JCExpression left = transformExpression(op.getLeftTerm()); JCExpression right = transformExpression(op.getRightTerm()); String varName = tempName(); JCExpression varIdent = makeUnquotedIdent(varName); JCExpression test = at(op).Binary(JCTree.NE, varIdent, makeNull()); JCExpression cond = make().Conditional(test , varIdent, right); JCExpression typeExpr = makeJavaType(op.getTypeModel(), NO_PRIMITIVES); return makeLetExpr(varName, null, typeExpr, left, cond); } public JCTree transform(Tree.ThenOp op) { JCExpression left = transformExpression(op.getLeftTerm(), CodegenUtil.getBoxingStrategy(op.getLeftTerm()), typeFact().getBooleanDeclaration().getType()); JCExpression right = transformExpression(op.getRightTerm()); return make().Conditional(left , right, makeNull()); } public JCTree transform(Tree.InOp op) { JCExpression left = transformExpression(op.getLeftTerm(), BoxingStrategy.BOXED, typeFact().getObjectDeclaration().getType()); JCExpression right = transformExpression(op.getRightTerm(), BoxingStrategy.BOXED, typeFact().getCategoryDeclaration().getType()); String varName = tempName(); JCExpression varIdent = makeUnquotedIdent(varName); JCExpression contains = at(op).Apply(null, makeSelect(right, "contains"), List.<JCExpression> of(varIdent)); JCExpression typeExpr = makeJavaType(op.getLeftTerm().getTypeModel(), NO_PRIMITIVES); return makeLetExpr(varName, null, typeExpr, left, contains); } // Logical operators public JCExpression transform(Tree.LogicalOp op) { OperatorTranslation operator = Operators.getOperator(op.getClass()); if(operator == null){ return makeErroneous(op, "Not supported yet: "+op.getNodeType()); } // Both terms are Booleans and can't be erased to anything JCExpression left = transformExpression(op.getLeftTerm(), BoxingStrategy.UNBOXED, null); return transformLogicalOp(op, operator, left, op.getRightTerm()); } private JCExpression transformLogicalOp(Node op, OperatorTranslation operator, JCExpression left, Tree.Term rightTerm) { // Both terms are Booleans and can't be erased to anything JCExpression right = transformExpression(rightTerm, BoxingStrategy.UNBOXED, null); return at(op).Binary(operator.javacOperator, left, right); } // Comparison operators public JCExpression transform(Tree.IdenticalOp op){ // The only thing which might be unboxed is boolean, and we can follow the rules of == for optimising it, // which are simple and require that both types be booleans to be unboxed, otherwise they must be boxed OptimisationStrategy optimisationStrategy = OperatorTranslation.BINARY_EQUAL.getOptimisationStrategy(op, this); JCExpression left = transformExpression(op.getLeftTerm(), optimisationStrategy.getBoxingStrategy(), null); JCExpression right = transformExpression(op.getRightTerm(), optimisationStrategy.getBoxingStrategy(), null); return at(op).Binary(JCTree.EQ, left, right); } public JCExpression transform(Tree.ComparisonOp op) { return transformOverridableBinaryOperator(op, op.getUnit().getComparableDeclaration()); } public JCExpression transform(Tree.CompareOp op) { return transformOverridableBinaryOperator(op, op.getUnit().getComparableDeclaration()); } // Arithmetic operators public JCExpression transform(Tree.ArithmeticOp op) { return transformOverridableBinaryOperator(op, op.getUnit().getNumericDeclaration()); } public JCExpression transform(Tree.SumOp op) { return transformOverridableBinaryOperator(op, op.getUnit().getSummableDeclaration()); } public JCExpression transform(Tree.RemainderOp op) { return transformOverridableBinaryOperator(op, op.getUnit().getIntegralDeclaration()); } // Overridable binary operators public JCExpression transform(Tree.BinaryOperatorExpression op) { return transformOverridableBinaryOperator(op, null, null); } private JCExpression transformOverridableBinaryOperator(Tree.BinaryOperatorExpression op, Interface compoundType) { ProducedType leftType = getSupertype(op.getLeftTerm(), compoundType); ProducedType rightType = getTypeArgument(leftType); return transformOverridableBinaryOperator(op, leftType, rightType); } private JCExpression transformOverridableBinaryOperator(Tree.BinaryOperatorExpression op, ProducedType leftType, ProducedType rightType) { OperatorTranslation operator = Operators.getOperator(op.getClass()); if (operator == null) { return makeErroneous(op); } OptimisationStrategy optimisationStrategy = operator.getOptimisationStrategy(op, this); JCExpression left = transformExpression(op.getLeftTerm(), optimisationStrategy.getBoxingStrategy(), leftType); return transformOverridableBinaryOperator(op, operator, optimisationStrategy, left, rightType); } private JCExpression transformOverridableBinaryOperator(Tree.BinaryOperatorExpression op, OperatorTranslation originalOperator, OptimisationStrategy optimisatonStrategy, JCExpression left, ProducedType rightType) { JCExpression result = null; JCExpression right = transformExpression(op.getRightTerm(), optimisatonStrategy.getBoxingStrategy(), rightType); // optimise if we can if(optimisatonStrategy.useJavaOperator()){ return make().Binary(originalOperator.javacOperator, left, right); } boolean loseComparison = originalOperator == OperatorTranslation.BINARY_SMALLER || originalOperator == OperatorTranslation.BINARY_SMALL_AS || originalOperator == OperatorTranslation.BINARY_LARGER || originalOperator == OperatorTranslation.BINARY_LARGE_AS; // for comparisons we need to invoke compare() OperatorTranslation actualOperator = originalOperator; if (loseComparison) { actualOperator = Operators.OperatorTranslation.BINARY_COMPARE; if (actualOperator == null) { return makeErroneous(); } } result = at(op).Apply(null, makeSelect(left, actualOperator.ceylonMethod), List.of(right)); if (loseComparison) { result = at(op).Apply(null, makeSelect(result, originalOperator.ceylonMethod), List.<JCExpression> nil()); } return result; } // // Operator-Assignment expressions public JCExpression transform(final Tree.ArithmeticAssignmentOp op){ final AssignmentOperatorTranslation operator = Operators.getAssignmentOperator(op.getClass()); if(operator == null){ return makeErroneous(op, "Not supported yet: "+op.getNodeType()); } // see if we can optimise it if(op.getUnboxed() && CodegenUtil.isDirectAccessVariable(op.getLeftTerm())){ return optimiseAssignmentOperator(op, operator); } // we can use unboxed types if both operands are unboxed final boolean boxResult = !op.getUnboxed(); // find the proper type Interface compoundType = op.getUnit().getNumericDeclaration(); if(op instanceof Tree.AddAssignOp){ compoundType = op.getUnit().getSummableDeclaration(); }else if(op instanceof Tree.RemainderAssignOp){ compoundType = op.getUnit().getIntegralDeclaration(); } final ProducedType leftType = getSupertype(op.getLeftTerm(), compoundType); final ProducedType rightType = getMostPreciseType(op.getLeftTerm(), getTypeArgument(leftType, 0)); // we work on boxed types return transformAssignAndReturnOperation(op, op.getLeftTerm(), boxResult, leftType, rightType, new AssignAndReturnOperationFactory(){ @Override public JCExpression getNewValue(JCExpression previousValue) { // make this call: previousValue OP RHS JCExpression ret = transformOverridableBinaryOperator(op, operator.binaryOperator, boxResult ? OptimisationStrategy.NONE : OptimisationStrategy.OPTIMISE, previousValue, rightType); ret = unAutoPromote(ret, rightType); return ret; } }); } public JCExpression transform(Tree.BitwiseAssignmentOp op){ return makeErroneous(op, "Not supported yet: "+op.getNodeType()); } public JCExpression transform(final Tree.LogicalAssignmentOp op){ final AssignmentOperatorTranslation operator = Operators.getAssignmentOperator(op.getClass()); if(operator == null){ return makeErroneous(op, "Not supported yet: "+op.getNodeType()); } // optimise if we can if(CodegenUtil.isDirectAccessVariable(op.getLeftTerm())){ return optimiseAssignmentOperator(op, operator); } ProducedType valueType = op.getLeftTerm().getTypeModel(); // we work on unboxed types return transformAssignAndReturnOperation(op, op.getLeftTerm(), false, valueType, valueType, new AssignAndReturnOperationFactory(){ @Override public JCExpression getNewValue(JCExpression previousValue) { // make this call: previousValue OP RHS return transformLogicalOp(op, operator.binaryOperator, previousValue, op.getRightTerm()); } }); } private JCExpression optimiseAssignmentOperator(final Tree.AssignmentOp op, final AssignmentOperatorTranslation operator) { // we don't care about their types since they're unboxed and we know it JCExpression left = transformExpression(op.getLeftTerm(), BoxingStrategy.UNBOXED, null); JCExpression right = transformExpression(op.getRightTerm(), BoxingStrategy.UNBOXED, null); return at(op).Assignop(operator.javacOperator, left, right); } // Postfix operator public JCExpression transform(Tree.PostfixOperatorExpression expr) { OperatorTranslation operator = Operators.getOperator(expr.getClass()); if(operator == null){ return makeErroneous(expr, "Not supported yet: "+expr.getNodeType()); } OptimisationStrategy optimisationStrategy = operator.getOptimisationStrategy(expr, this); boolean canOptimise = optimisationStrategy.useJavaOperator(); // only fully optimise if we don't have to access the getter/setter if(canOptimise && CodegenUtil.isDirectAccessVariable(expr.getTerm())){ JCExpression term = transformExpression(expr.getTerm(), BoxingStrategy.UNBOXED, expr.getTypeModel()); return at(expr).Unary(operator.javacOperator, term); } Tree.Term term = expr.getTerm(); Interface compoundType = expr.getUnit().getOrdinalDeclaration(); ProducedType valueType = getSupertype(expr.getTerm(), compoundType); ProducedType returnType = getMostPreciseType(term, getTypeArgument(valueType, 0)); List<JCVariableDecl> decls = List.nil(); List<JCStatement> stats = List.nil(); JCExpression result = null; // we can optimise that case a bit sometimes boolean boxResult = !canOptimise; // attr++ // (let $tmp = attr; attr = $tmp.getSuccessor(); $tmp;) if(term instanceof Tree.BaseMemberExpression){ JCExpression getter = transform((Tree.BaseMemberExpression)term, null); at(expr); // Type $tmp = attr JCExpression exprType = makeJavaType(returnType, boxResult ? NO_PRIMITIVES : 0); Name varName = names().fromString(tempName("op")); // make sure we box the results if necessary getter = applyErasureAndBoxing(getter, term, boxResult ? BoxingStrategy.BOXED : BoxingStrategy.UNBOXED, returnType); JCVariableDecl tmpVar = make().VarDef(make().Modifiers(0), varName, exprType, getter); decls = decls.prepend(tmpVar); // attr = $tmp.getSuccessor() JCExpression successor; if(canOptimise){ // use +1/-1 if we can optimise a bit successor = make().Binary(operator == OperatorTranslation.UNARY_POSTFIX_INCREMENT ? JCTree.PLUS : JCTree.MINUS, make().Ident(varName), makeInteger(1)); successor = unAutoPromote(successor, returnType); }else{ successor = make().Apply(null, makeSelect(make().Ident(varName), operator.ceylonMethod), List.<JCExpression>nil()); // make sure the result is boxed if necessary, the result of successor/predecessor is always boxed successor = boxUnboxIfNecessary(successor, true, term.getTypeModel(), CodegenUtil.getBoxingStrategy(term)); } JCExpression assignment = transformAssignment(expr, term, successor); stats = stats.prepend(at(expr).Exec(assignment)); // $tmp result = make().Ident(varName); } else if(term instanceof Tree.QualifiedMemberExpression){ // e.attr++ // (let $tmpE = e, $tmpV = $tmpE.attr; $tmpE.attr = $tmpV.getSuccessor(); $tmpV;) Tree.QualifiedMemberExpression qualified = (Tree.QualifiedMemberExpression) term; // transform the primary, this will get us a boxed primary JCExpression e = transformQualifiedMemberPrimary(qualified); at(expr); // Type $tmpE = e JCExpression exprType = makeJavaType(qualified.getTarget().getQualifyingType(), NO_PRIMITIVES); Name varEName = names().fromString(tempName("opE")); JCVariableDecl tmpEVar = make().VarDef(make().Modifiers(0), varEName, exprType, e); // Type $tmpV = $tmpE.attr JCExpression attrType = makeJavaType(returnType, boxResult ? NO_PRIMITIVES : 0); Name varVName = names().fromString(tempName("opV")); JCExpression getter = transformMemberExpression(qualified, make().Ident(varEName), null); // make sure we box the results if necessary getter = applyErasureAndBoxing(getter, term, boxResult ? BoxingStrategy.BOXED : BoxingStrategy.UNBOXED, returnType); JCVariableDecl tmpVVar = make().VarDef(make().Modifiers(0), varVName, attrType, getter); // define all the variables decls = decls.prepend(tmpVVar); decls = decls.prepend(tmpEVar); // $tmpE.attr = $tmpV.getSuccessor() JCExpression successor; if(canOptimise){ // use +1/-1 if we can optimise a bit successor = make().Binary(operator == OperatorTranslation.UNARY_POSTFIX_INCREMENT ? JCTree.PLUS : JCTree.MINUS, make().Ident(varVName), makeInteger(1)); successor = unAutoPromote(successor, returnType); }else{ successor = make().Apply(null, makeSelect(make().Ident(varVName), operator.ceylonMethod), List.<JCExpression>nil()); // make sure the result is boxed if necessary, the result of successor/predecessor is always boxed successor = boxUnboxIfNecessary(successor, true, term.getTypeModel(), CodegenUtil.getBoxingStrategy(term)); } JCExpression assignment = transformAssignment(expr, term, make().Ident(varEName), successor); stats = stats.prepend(at(expr).Exec(assignment)); // $tmpV result = make().Ident(varVName); }else{ return makeErroneous(term, "Not supported yet"); } // e?.attr++ is probably not legal // a[i]++ is not for M1 but will be: // (let $tmpA = a, $tmpI = i, $tmpV = $tmpA.item($tmpI); $tmpA.setItem($tmpI, $tmpV.getSuccessor()); $tmpV;) // a?[i]++ is probably not legal // a[i1..i1]++ and a[i1...]++ are probably not legal // a[].attr++ and a[].e.attr++ are probably not legal return make().LetExpr(decls, stats, result); } // Prefix operator public JCExpression transform(final Tree.PrefixOperatorExpression expr) { final OperatorTranslation operator = Operators.getOperator(expr.getClass()); if(operator == null){ return makeErroneous(expr, "Not supported yet: "+expr.getNodeType()); } OptimisationStrategy optimisationStrategy = operator.getOptimisationStrategy(expr, this); final boolean canOptimise = optimisationStrategy.useJavaOperator(); Term term = expr.getTerm(); // only fully optimise if we don't have to access the getter/setter if(canOptimise && CodegenUtil.isDirectAccessVariable(term)){ JCExpression jcTerm = transformExpression(term, BoxingStrategy.UNBOXED, expr.getTypeModel()); return at(expr).Unary(operator.javacOperator, jcTerm); } Interface compoundType = expr.getUnit().getOrdinalDeclaration(); ProducedType valueType = getSupertype(term, compoundType); final ProducedType returnType = getMostPreciseType(term, getTypeArgument(valueType, 0)); // we work on boxed types unless we could have optimised return transformAssignAndReturnOperation(expr, term, !canOptimise, valueType, returnType, new AssignAndReturnOperationFactory(){ @Override public JCExpression getNewValue(JCExpression previousValue) { // use +1/-1 if we can optimise a bit if(canOptimise){ JCExpression ret = make().Binary(operator == OperatorTranslation.UNARY_PREFIX_INCREMENT ? JCTree.PLUS : JCTree.MINUS, previousValue, makeInteger(1)); ret = unAutoPromote(ret, returnType); return ret; } // make this call: previousValue.getSuccessor() or previousValue.getPredecessor() return make().Apply(null, makeSelect(previousValue, operator.ceylonMethod), List.<JCExpression>nil()); } }); } // // Function to deal with expressions that have side-effects private interface AssignAndReturnOperationFactory { JCExpression getNewValue(JCExpression previousValue); } private JCExpression transformAssignAndReturnOperation(Node operator, Tree.Term term, boolean boxResult, ProducedType valueType, ProducedType returnType, AssignAndReturnOperationFactory factory){ List<JCVariableDecl> decls = List.nil(); List<JCStatement> stats = List.nil(); JCExpression result = null; // attr // (let $tmp = OP(attr); attr = $tmp; $tmp) if(term instanceof Tree.BaseMemberExpression){ JCExpression getter = transform((Tree.BaseMemberExpression)term, null); at(operator); // Type $tmp = OP(attr); JCExpression exprType = makeJavaType(returnType, boxResult ? NO_PRIMITIVES : 0); Name varName = names().fromString(tempName("op")); // make sure we box the results if necessary getter = applyErasureAndBoxing(getter, term, boxResult ? BoxingStrategy.BOXED : BoxingStrategy.UNBOXED, valueType); JCExpression newValue = factory.getNewValue(getter); // no need to box/unbox here since newValue and $tmpV share the same boxing type JCVariableDecl tmpVar = make().VarDef(make().Modifiers(0), varName, exprType, newValue); decls = decls.prepend(tmpVar); // attr = $tmp // make sure the result is unboxed if necessary, $tmp may be boxed JCExpression value = make().Ident(varName); value = boxUnboxIfNecessary(value, boxResult, term.getTypeModel(), CodegenUtil.getBoxingStrategy(term)); JCExpression assignment = transformAssignment(operator, term, value); stats = stats.prepend(at(operator).Exec(assignment)); // $tmp // return, with the box type we asked for result = make().Ident(varName); } else if(term instanceof Tree.QualifiedMemberExpression){ // e.attr // (let $tmpE = e, $tmpV = OP($tmpE.attr); $tmpE.attr = $tmpV; $tmpV;) Tree.QualifiedMemberExpression qualified = (Tree.QualifiedMemberExpression) term; // transform the primary, this will get us a boxed primary JCExpression e = transformQualifiedMemberPrimary(qualified); at(operator); // Type $tmpE = e JCExpression exprType = makeJavaType(qualified.getTarget().getQualifyingType(), NO_PRIMITIVES); Name varEName = names().fromString(tempName("opE")); JCVariableDecl tmpEVar = make().VarDef(make().Modifiers(0), varEName, exprType, e); // Type $tmpV = OP($tmpE.attr) JCExpression attrType = makeJavaType(returnType, boxResult ? NO_PRIMITIVES : 0); Name varVName = names().fromString(tempName("opV")); JCExpression getter = transformMemberExpression(qualified, make().Ident(varEName), null); // make sure we box the results if necessary getter = applyErasureAndBoxing(getter, term, boxResult ? BoxingStrategy.BOXED : BoxingStrategy.UNBOXED, valueType); JCExpression newValue = factory.getNewValue(getter); // no need to box/unbox here since newValue and $tmpV share the same boxing type JCVariableDecl tmpVVar = make().VarDef(make().Modifiers(0), varVName, attrType, newValue); // define all the variables decls = decls.prepend(tmpVVar); decls = decls.prepend(tmpEVar); // $tmpE.attr = $tmpV // make sure $tmpV is unboxed if necessary JCExpression value = make().Ident(varVName); value = boxUnboxIfNecessary(value, boxResult, term.getTypeModel(), CodegenUtil.getBoxingStrategy(term)); JCExpression assignment = transformAssignment(operator, term, make().Ident(varEName), value); stats = stats.prepend(at(operator).Exec(assignment)); // $tmpV // return, with the box type we asked for result = make().Ident(varVName); }else{ return makeErroneous(operator, "Not supported yet"); } // OP(e?.attr) is probably not legal // OP(a[i]) is not for M1 but will be: // (let $tmpA = a, $tmpI = i, $tmpV = OP($tmpA.item($tmpI)); $tmpA.setItem($tmpI, $tmpV); $tmpV;) // OP(a?[i]) is probably not legal // OP(a[i1..i1]) and OP(a[i1...]) are probably not legal // OP(a[].attr) and OP(a[].e.attr) are probably not legal return make().LetExpr(decls, stats, result); } public JCExpression transform(Tree.Parameter param) { // Transform the expression marking that we're inside a defaulted parameter for $this-handling //needDollarThis = true; JCExpression expr; at(param); DefaultArgument defaultArgument = param.getDefaultArgument(); if (defaultArgument != null) { SpecifierExpression spec = defaultArgument.getSpecifierExpression(); expr = expressionGen().transformExpression(spec.getExpression(), CodegenUtil.getBoxingStrategy(param.getDeclarationModel()), param.getDeclarationModel().getType()); } else if (param.getDeclarationModel().isSequenced()) { expr = makeEmpty(); } else { expr = makeErroneous(param, "No default and not sequenced"); } //needDollarThis = false; return expr; } // // Invocations public JCExpression transform(Tree.InvocationExpression ce) { return InvocationBuilder.forInvocation(this, ce).build(); } public JCExpression transformFunctional(Tree.Term expr, Functional functional) { return CallableBuilder.methodReference(gen(), expr, functional.getParameterLists().get(0)).build(); } // // Member expressions public static interface TermTransformer { JCExpression transform(JCExpression primaryExpr, String selector); } // Qualified members public JCExpression transform(Tree.QualifiedMemberExpression expr) { return transform(expr, null); } private JCExpression transform(Tree.QualifiedMemberExpression expr, TermTransformer transformer) { JCExpression result; if (expr.getMemberOperator() instanceof Tree.SafeMemberOp) { JCExpression primaryExpr = transformQualifiedMemberPrimary(expr); String tmpVarName = aliasName("safe"); JCExpression typeExpr = makeJavaType(expr.getTarget().getQualifyingType(), NO_PRIMITIVES); JCExpression transExpr = transformMemberExpression(expr, makeUnquotedIdent(tmpVarName), transformer); if (!isWithinInvocation() && isCeylonCallable(expr.getTypeModel())) { return transExpr; } transExpr = boxUnboxIfNecessary(transExpr, expr, expr.getTarget().getType(), BoxingStrategy.BOXED); JCExpression testExpr = make().Binary(JCTree.NE, makeUnquotedIdent(tmpVarName), makeNull()); JCExpression condExpr = make().Conditional(testExpr, transExpr, makeNull()); result = makeLetExpr(tmpVarName, null, typeExpr, primaryExpr, condExpr); } else if (expr.getMemberOperator() instanceof Tree.SpreadOp) { result = transformSpreadOperator(expr, transformer); } else { JCExpression primaryExpr = transformQualifiedMemberPrimary(expr); result = transformMemberExpression(expr, primaryExpr, transformer); } return result; } private JCExpression transformSpreadOperator(Tree.QualifiedMemberExpression expr, TermTransformer transformer) { at(expr); // this holds the ternary test for empty String testVarName = aliasName("spreadTest"); ProducedType testSequenceType = typeFact().getFixedSizedType(expr.getPrimary().getTypeModel()); JCExpression testSequenceTypeExpr = makeJavaType(testSequenceType, NO_PRIMITIVES); JCExpression testSequenceExpr = transformExpression(expr.getPrimary(), BoxingStrategy.BOXED, testSequenceType); // reset back here after transformExpression at(expr); // this holds the whole spread operation String varBaseName = aliasName("spread"); // sequence String srcSequenceName = varBaseName+"$0"; ProducedType srcSequenceType = typeFact().getNonemptySequenceType(expr.getPrimary().getTypeModel()); ProducedType srcElementType = typeFact().getElementType(srcSequenceType); JCExpression srcSequenceTypeExpr = makeJavaType(srcSequenceType, NO_PRIMITIVES); JCExpression srcSequenceExpr = make().TypeCast(srcSequenceTypeExpr, makeUnquotedIdent(testVarName)); // size, getSize() always unboxed, but we need to cast to int for Java array access String sizeName = varBaseName+"$2"; JCExpression sizeType = make().TypeIdent(TypeTags.INT); JCExpression sizeExpr = make().TypeCast(syms().intType, make().Apply(null, make().Select(makeUnquotedIdent(srcSequenceName), names().fromString("getSize")), List.<JCTree.JCExpression>nil())); // new array String newArrayName = varBaseName+"$4"; JCExpression arrayElementType = makeJavaType(expr.getTarget().getType(), NO_PRIMITIVES); JCExpression newArrayType = make().TypeArray(arrayElementType); JCNewArray newArrayExpr = make().NewArray(arrayElementType, List.of(makeUnquotedIdent(sizeName)), null); // return the new array JCExpression returnArrayType = makeJavaType(expr.getTarget().getType(), SATISFIES); JCExpression returnArrayIdent = make().QualIdent(syms().ceylonArraySequenceType.tsym); JCExpression returnArrayTypeExpr; // avoid putting type parameters such as j.l.Object if(returnArrayType != null) returnArrayTypeExpr = make().TypeApply(returnArrayIdent, List.of(returnArrayType)); else // go raw returnArrayTypeExpr = returnArrayIdent; JCNewClass returnArray = make().NewClass(null, null, returnArrayTypeExpr, List.of(makeUnquotedIdent(newArrayName)), null); // for loop Name indexVarName = names().fromString(aliasName("index")); // int index = 0 JCStatement initVarDef = make().VarDef(make().Modifiers(0), indexVarName, make().TypeIdent(TypeTags.INT), makeInteger(0)); List<JCStatement> init = List.of(initVarDef); // index < size JCExpression cond = make().Binary(JCTree.LT, make().Ident(indexVarName), makeUnquotedIdent(sizeName)); // index++ JCExpression stepExpr = make().Unary(JCTree.POSTINC, make().Ident(indexVarName)); List<JCExpressionStatement> step = List.of(make().Exec(stepExpr)); // newArray[index] JCExpression dstArrayExpr = make().Indexed(makeUnquotedIdent(newArrayName), make().Ident(indexVarName)); // srcSequence.item(box(index)) // index is always boxed JCExpression boxedIndex = boxType(make().Ident(indexVarName), typeFact().getIntegerDeclaration().getType()); JCExpression sequenceItemExpr = make().Apply(null, make().Select(makeUnquotedIdent(srcSequenceName), names().fromString("item")), List.<JCExpression>of(boxedIndex)); // item.member sequenceItemExpr = applyErasureAndBoxing(sequenceItemExpr, srcElementType, true, BoxingStrategy.BOXED, expr.getTarget().getQualifyingType()); JCExpression appliedExpr = transformMemberExpression(expr, sequenceItemExpr, transformer); if (!isWithinInvocation() && isCeylonCallable(expr.getTypeModel())) { return appliedExpr; } // reset back here after transformMemberExpression at(expr); // we always need to box to put in array appliedExpr = boxUnboxIfNecessary(appliedExpr, expr, expr.getTarget().getType(), BoxingStrategy.BOXED); // newArray[index] = box(srcSequence.item(box(index)).member) JCStatement body = make().Exec(make().Assign(dstArrayExpr, appliedExpr)); // for JCForLoop forStmt = make().ForLoop(init, cond , step , body); // build the whole spread operation JCExpression spread = makeLetExpr(varBaseName, List.<JCStatement>of(forStmt), srcSequenceTypeExpr, srcSequenceExpr, sizeType, sizeExpr, newArrayType, newArrayExpr, returnArray); JCExpression resultExpr; if (typeFact().isEmptyType(expr.getPrimary().getTypeModel())) { ProducedType emptyOrSequence = typeFact().getEmptyType(typeFact().getSequenceType(expr.getTarget().getType())); resultExpr = make().TypeCast(makeJavaType(emptyOrSequence), make().Conditional(makeNonEmptyTest(makeUnquotedIdent(testVarName)), spread, makeEmpty())); } else { resultExpr = spread; } // now surround it with the test return makeLetExpr(testVarName, List.<JCStatement>nil(), testSequenceTypeExpr, testSequenceExpr, resultExpr); } private JCExpression transformQualifiedMemberPrimary(Tree.QualifiedMemberOrTypeExpression expr) { if(expr.getTarget() == null) return makeErroneous(); return transformExpression(expr.getPrimary(), BoxingStrategy.BOXED, expr.getTarget().getQualifyingType()); } // Base members public JCExpression transform(Tree.BaseMemberExpression expr) { return transform(expr, null); } private JCExpression transform(Tree.BaseMemberOrTypeExpression expr, TermTransformer transformer) { return transformMemberExpression(expr, null, transformer); } // Type members public JCExpression transform(Tree.QualifiedTypeExpression expr) { return transform(expr, null); } public JCExpression transform(Tree.BaseTypeExpression expr) { return transform(expr, null); } private JCExpression transform(Tree.QualifiedTypeExpression expr, TermTransformer transformer) { JCExpression primaryExpr = transformQualifiedMemberPrimary(expr); return transformMemberExpression(expr, primaryExpr, transformer); } // Generic code for all primaries public JCExpression transformPrimary(Tree.Primary primary, TermTransformer transformer) { if (primary instanceof Tree.QualifiedMemberExpression) { return transform((Tree.QualifiedMemberExpression)primary, transformer); } else if (primary instanceof Tree.BaseMemberExpression) { return transform((Tree.BaseMemberExpression)primary, transformer); } else if (primary instanceof Tree.BaseTypeExpression) { return transform((Tree.BaseTypeExpression)primary, transformer); } else if (primary instanceof Tree.QualifiedTypeExpression) { return transform((Tree.QualifiedTypeExpression)primary, transformer); } else if (primary instanceof Tree.MemberOrTypeExpression) { return makeQuotedIdent(((Tree.MemberOrTypeExpression)primary).getDeclaration().getName()); } else if (primary instanceof Tree.InvocationExpression){ JCExpression primaryExpr = transform((Tree.InvocationExpression)primary); if (transformer != null) { primaryExpr = transformer.transform(primaryExpr, null); } return primaryExpr; } else { return makeErroneous(primary, "Unhandled primary"); } } private JCExpression transformMemberExpression(Tree.StaticMemberOrTypeExpression expr, JCExpression primaryExpr, TermTransformer transformer) { JCExpression result = null; // do not throw, an error will already have been reported Declaration decl = expr.getDeclaration(); if (decl == null) { return makeErroneous(); } // Explanation: primaryExpr and qualExpr both specify what is to come before the selector // but the important difference is that primaryExpr is used for those situations where // the result comes from the actual Ceylon code while qualExpr is used for those situations // where we need to refer to synthetic objects (like wrapper classes for toplevel methods) JCExpression qualExpr = null; String selector = null; if (decl instanceof Functional && !(decl instanceof FunctionalParameter) // A functional parameter will already be Callable-wrapped && isCeylonCallable(expr.getTypeModel()) && !isWithinInvocation()) { result = transformFunctional(expr, (Functional)decl); } else if (decl instanceof Getter) { // invoke the getter if (decl.isToplevel()) { primaryExpr = null; qualExpr = makeQualIdent(makeFQIdent(decl.getContainer().getQualifiedNameString()), Util.quoteIfJavaKeyword(decl.getName()), CodegenUtil.getGetterName(decl)); selector = null; } else if (decl.isClassMember() || decl.isInterfaceMember()) { selector = CodegenUtil.getGetterName(decl); } else { // method local attr if (!isRecursiveReference(expr)) { primaryExpr = makeQualIdent(primaryExpr, decl.getName() + "$getter"); } selector = CodegenUtil.getGetterName(decl); } } else if (decl instanceof Value) { if (decl.isToplevel()) { // ERASURE if ("null".equals(decl.getName())) { // FIXME this is a pretty brain-dead way to go about erase I think result = makeNull(); } else if (isBooleanTrue(decl)) { result = makeBoolean(true); } else if (isBooleanFalse(decl)) { result = makeBoolean(false); } else { // it's a toplevel attribute String topClsName = (decl instanceof LazyValue) ? ((LazyValue)decl).getRealName() : decl.getName(); primaryExpr = makeQualIdent(makeFQIdent(Util.quoteJavaKeywords(decl.getContainer().getQualifiedNameString())), Util.quoteIfJavaKeyword(topClsName)); selector = CodegenUtil.getGetterName(decl); } } else if (Decl.isClassAttribute(decl)) { if (Decl.isJavaField(decl) || isWithinSuperInvocation()){ selector = decl.getName(); } else { // invoke the getter, using the Java interop form of Util.getGetterName because this is the only case // (Value inside a Class) where we might refer to JavaBean properties selector = CodegenUtil.getGetterName(decl); } } else if (decl.isCaptured() || decl.isShared()) { TypeDeclaration typeDecl = ((Value)decl).getType().getDeclaration(); boolean isObject = Character.isLowerCase(typeDecl.getName().charAt(0)); if (Decl.isLocal(typeDecl) && isObject) { // accessing a local 'object' declaration, so don't need a getter } else if (decl.isCaptured() && !((Value) decl).isVariable()) { // accessing a local that is not getter wrapped } else { primaryExpr = makeQualIdent(primaryExpr, decl.getName()); selector = CodegenUtil.getGetterName(decl); } } } else if (decl instanceof Method) { if (Decl.isLocal(decl)) { java.util.List<String> path = new LinkedList<String>(); if (!isRecursiveReference(expr)) { path.add(decl.getName()); } primaryExpr = null; // Only want to quote the method name // e.g. enum.$enum() - qualExpr = makeQuotedQualIdent(makeQualIdent(path), decl.getName()); + qualExpr = makeQuotedQualIdent(makeQualIdent(path), CodegenUtil.quoteMethodName(decl)); selector = null; } else if (decl.isToplevel()) { java.util.List<String> path = new LinkedList<String>(); // FQN must start with empty ident (see https://github.com/ceylon/ceylon-compiler/issues/148) if (!decl.getContainer().getQualifiedNameString().isEmpty()) { path.add(""); path.addAll(Arrays.asList(decl.getContainer().getQualifiedNameString().split("\\."))); } else { path.add(""); } String topClsName = (decl instanceof LazyMethod) ? ((LazyMethod)decl).getRealName() : decl.getName(); // class path.add(topClsName); // method - path.add(decl.getName()); + path.add(CodegenUtil.quoteMethodName(decl)); primaryExpr = null; qualExpr = makeQuotedQualIdent(path); selector = null; } else { // not toplevel, not within method, must be a class member selector = Util.getErasedMethodName(CodegenUtil.quoteMethodNameIfProperty((Method) decl, gen())); } } if (result == null) { boolean useGetter = !(decl instanceof Method) && !(Decl.isJavaField(decl)) && !isWithinSuperInvocation(); if (qualExpr == null && selector == null) { useGetter = decl.isClassOrInterfaceMember() && CodegenUtil.isErasedAttribute(decl.getName()); if (useGetter) { selector = CodegenUtil.quoteMethodName(decl); } else { selector = substitute(decl.getName()); } } if (qualExpr == null) { qualExpr = primaryExpr; } if (qualExpr == null && needDollarThis(expr)) { qualExpr = makeUnquotedIdent("$this"); } if (qualExpr == null && decl.isStaticallyImportable()) { qualExpr = makeQuotedFQIdent(decl.getContainer().getQualifiedNameString()); } if (transformer != null) { result = transformer.transform(qualExpr, selector); } else { result = makeQualIdent(qualExpr, selector); if (useGetter) { result = make().Apply(List.<JCTree.JCExpression>nil(), result, List.<JCTree.JCExpression>nil()); } } } return result; } // // Array access private boolean needDollarThis(Tree.StaticMemberOrTypeExpression expr) { if (expr instanceof Tree.BaseMemberExpression) { // We need to add a `$this` prefix to the member expression if: // * The member was declared on an interface I and // * The member is being used in the companion class of I or // some subinterface of I, and // * The member is shared (non-shared means its only on the companion class) final Declaration decl = expr.getDeclaration(); // Find the method/getter/setter where the expr is being used Scope scope = expr.getScope(); while (Decl.isLocalScope(scope)) { scope = scope.getContainer(); } // Is it being used in an interface (=> impl) which is a subtyle of the declaration if (scope instanceof Interface && ((Interface) scope).getType().isSubtypeOf(scope.getDeclaringType(decl))) { return decl.isShared(); } } return false; } private boolean needDollarThis(Scope scope) { while (Decl.isLocalScope(scope)) { scope = scope.getContainer(); } return scope instanceof Interface; } public JCTree transform(Tree.IndexExpression access) { boolean safe = access.getIndexOperator() instanceof Tree.SafeIndexOp; // depends on the operator Tree.ElementOrRange elementOrRange = access.getElementOrRange(); if(elementOrRange instanceof Tree.Element){ Tree.Element element = (Tree.Element) elementOrRange; // let's see what types there are ProducedType leftType = access.getPrimary().getTypeModel(); if(safe) leftType = access.getUnit().getDefiniteType(leftType); ProducedType leftCorrespondenceType = leftType.getSupertype(access.getUnit().getCorrespondenceDeclaration()); ProducedType rightType = getTypeArgument(leftCorrespondenceType, 0); // do the index JCExpression index = transformExpression(element.getExpression(), BoxingStrategy.BOXED, rightType); // look at the lhs JCExpression lhs = transformExpression(access.getPrimary(), BoxingStrategy.BOXED, leftCorrespondenceType); if(!safe) // make a "lhs.item(index)" call return at(access).Apply(List.<JCTree.JCExpression>nil(), make().Select(lhs, names().fromString("item")), List.of(index)); // make a (let ArrayElem tmp = lhs in (tmp != null ? tmp.item(index) : null)) call JCExpression arrayType = makeJavaType(leftCorrespondenceType); Name varName = names().fromString(tempName("safeaccess")); // tmpVar.item(index) JCExpression safeAccess = make().Apply(List.<JCTree.JCExpression>nil(), make().Select(make().Ident(varName), names().fromString("item")), List.of(index)); at(access.getPrimary()); // (tmpVar != null ? safeAccess : null) JCConditional conditional = make().Conditional(make().Binary(JCTree.NE, make().Ident(varName), makeNull()), safeAccess, makeNull()); // ArrayElem tmp = lhs JCVariableDecl tmpVar = make().VarDef(make().Modifiers(0), varName, arrayType, lhs); // (let tmpVar in conditional) return make().LetExpr(tmpVar, conditional); }else{ // find the types ProducedType leftType = access.getPrimary().getTypeModel(); ProducedType leftRangedType = leftType.getSupertype(access.getUnit().getRangedDeclaration()); ProducedType rightType = getTypeArgument(leftRangedType, 0); // look at the lhs JCExpression lhs = transformExpression(access.getPrimary(), BoxingStrategy.BOXED, leftRangedType); // do the indices Tree.ElementRange range = (Tree.ElementRange) elementOrRange; JCExpression start = transformExpression(range.getLowerBound(), BoxingStrategy.BOXED, rightType); JCExpression end; if(range.getUpperBound() != null) end = transformExpression(range.getUpperBound(), BoxingStrategy.BOXED, rightType); else end = makeNull(); // make a "lhs.span(start, end)" call return at(access).Apply(List.<JCTree.JCExpression>nil(), make().Select(lhs, names().fromString("span")), List.of(start, end)); } } // // Assignment public JCExpression transform(Tree.AssignOp op) { return transformAssignment(op, op.getLeftTerm(), op.getRightTerm()); } private JCExpression transformAssignment(Node op, Tree.Term leftTerm, Tree.Term rightTerm) { // FIXME: can this be anything else than a Tree.MemberOrTypeExpression? TypedDeclaration decl = (TypedDeclaration) ((Tree.MemberOrTypeExpression)leftTerm).getDeclaration(); // Remember and disable inStatement for RHS boolean tmpInStatement = inStatement; inStatement = false; // right side final JCExpression rhs = transformExpression(rightTerm, CodegenUtil.getBoxingStrategy(decl), leftTerm.getTypeModel()); if (tmpInStatement) { return transformAssignment(op, leftTerm, rhs); } else { ProducedType valueType = leftTerm.getTypeModel(); return transformAssignAndReturnOperation(op, leftTerm, CodegenUtil.getBoxingStrategy(decl) == BoxingStrategy.BOXED, valueType, valueType, new AssignAndReturnOperationFactory(){ @Override public JCExpression getNewValue(JCExpression previousValue) { return rhs; } }); } } private JCExpression transformAssignment(final Node op, Tree.Term leftTerm, JCExpression rhs) { // left hand side can be either BaseMemberExpression, QualifiedMemberExpression or array access (M2) // TODO: array access (M2) JCExpression expr = null; if(leftTerm instanceof Tree.BaseMemberExpression) if (needDollarThis((Tree.BaseMemberExpression)leftTerm)) { expr = makeUnquotedIdent("$this"); } else { expr = null; } else if(leftTerm instanceof Tree.QualifiedMemberExpression){ Tree.QualifiedMemberExpression qualified = ((Tree.QualifiedMemberExpression)leftTerm); expr = transformExpression(qualified.getPrimary(), BoxingStrategy.BOXED, qualified.getTarget().getQualifyingType()); }else{ return makeErroneous(op, "Not supported yet: "+op.getNodeType()); } return transformAssignment(op, leftTerm, expr, rhs); } private JCExpression transformAssignment(Node op, Tree.Term leftTerm, JCExpression lhs, JCExpression rhs) { JCExpression result = null; // FIXME: can this be anything else than a Tree.MemberOrTypeExpression? TypedDeclaration decl = (TypedDeclaration) ((Tree.MemberOrTypeExpression)leftTerm).getDeclaration(); boolean variable = decl.isVariable(); at(op); String selector = CodegenUtil.getSetterName(decl); if (decl.isToplevel()) { // must use top level setter lhs = makeQualIdent(makeFQIdent(Util.quoteJavaKeywords(decl.getContainer().getQualifiedNameString())), Util.quoteIfJavaKeyword(decl.getName())); } else if ((decl instanceof Getter)) { // must use the setter if (Decl.isLocal(decl)) { lhs = makeQualIdent(lhs, decl.getName() + "$setter"); } } else if (decl instanceof Method && !Decl.withinClassOrInterface(decl)) { // Deferred method initialization of a local function result = at(op).Assign(makeQualIdent(lhs, decl.getName(), decl.getName()), rhs); } else if (variable && (Decl.isClassAttribute(decl))) { // must use the setter, nothing to do, unless it's a java field if(Decl.isJavaField(decl)){ if (decl.isStaticallyImportable()) { // static field result = at(op).Assign(makeQualIdent(makeQuotedFQIdent(decl.getContainer().getQualifiedNameString()), decl.getName()), rhs); }else{ // normal field result = at(op).Assign(makeQualIdent(lhs, decl.getName()), rhs); } } } else if (variable && (decl.isCaptured() || decl.isShared())) { // must use the qualified setter lhs = makeQualIdent(lhs, decl.getName()); } else { result = at(op).Assign(makeQualIdent(lhs, decl.getName()), rhs); } if (result == null) { result = make().Apply(List.<JCTree.JCExpression>nil(), makeQualIdent(lhs, selector), List.<JCTree.JCExpression>of(rhs)); } return result; } /** Creates an anonymous class that extends Iterable and implements the specified comprehension. */ public JCExpression transformComprehension(Comprehension comp) { at(comp); Tree.ComprehensionClause clause = comp.getForComprehensionClause(); ProducedType targetIterType = typeFact().getIterableType(clause.getTypeModel()); int idx = 0; ExpressionComprehensionClause excc = null; String prevItemVar = null; String ctxtName = null; //Iterator fields ListBuffer<JCTree> fields = new ListBuffer<JCTree>(); HashSet<String> fieldNames = new HashSet<String>(); while (clause != null) { final String iterVar = "iter$"+idx; String itemVar = null; //spread 1162 if (clause instanceof ForComprehensionClause) { ForComprehensionClause fcl = (ForComprehensionClause)clause; SpecifierExpression specexpr = fcl.getForIterator().getSpecifierExpression(); ProducedType iterType = specexpr.getExpression().getTypeModel(); JCExpression iterTypeExpr = makeJavaType(typeFact().getIteratorType( typeFact().getIteratedType(iterType))); if (clause == comp.getForComprehensionClause()) { //The first iterator can be initialized as a field fields.add(make().VarDef(make().Modifiers(2), names().fromString(iterVar), iterTypeExpr, make().Apply(null, make().Select(transformExpression(specexpr.getExpression()), names().fromString("getIterator")), List.<JCExpression>nil()))); fieldNames.add(iterVar); } else { //The subsequent iterators need to be inside a method, //in case they depend on the current element of the previous iterator fields.add(make().VarDef(make().Modifiers(2), names().fromString(iterVar), iterTypeExpr, null)); fieldNames.add(iterVar); JCBlock body = make().Block(0l, List.<JCStatement>of( make().If(make().Binary(JCTree.EQ, makeUnquotedIdent(iterVar), makeNull()), make().Exec(make().Apply(null, makeSelect("this", ctxtName), List.<JCExpression>nil())), null), make().Exec(make().Assign(makeUnquotedIdent(iterVar), make().Apply(null, make().Select(transformExpression(specexpr.getExpression()), names().fromString("getIterator")), List.<JCExpression>nil()))), make().Return(makeUnquotedIdent(iterVar)) )); fields.add(make().MethodDef(make().Modifiers(2), names().fromString(iterVar), iterTypeExpr, List.<JCTree.JCTypeParameter>nil(), List.<JCTree.JCVariableDecl>nil(), List.<JCExpression>nil(), body, null)); } if (fcl.getForIterator() instanceof ValueIterator) { //Add the item variable as a field in the iterator Value item = ((ValueIterator)fcl.getForIterator()).getVariable().getDeclarationModel(); itemVar = item.getName(); fields.add(make().VarDef(make().Modifiers(2), names().fromString(itemVar), makeJavaType(item.getType(),NO_PRIMITIVES), null)); fieldNames.add(itemVar); } else if (fcl.getForIterator() instanceof KeyValueIterator) { //Add the key and value variables as fields in the iterator KeyValueIterator kviter = (KeyValueIterator)fcl.getForIterator(); Value kdec = kviter.getKeyVariable().getDeclarationModel(); Value vdec = kviter.getValueVariable().getDeclarationModel(); //But we'll use this as the name for the context function and base for the exhausted field itemVar = "kv$" + kdec.getName() + "$" + vdec.getName(); fields.add(make().VarDef(make().Modifiers(2), names().fromString(kdec.getName()), makeJavaType(kdec.getType(), NO_PRIMITIVES), null)); fields.add(make().VarDef(make().Modifiers(2), names().fromString(vdec.getName()), makeJavaType(vdec.getType(), NO_PRIMITIVES), null)); fieldNames.add(kdec.getName()); fieldNames.add(vdec.getName()); } else { return makeErroneous(fcl, "No support yet for iterators of type " + fcl.getForIterator().getClass().getName()); } fields.add(make().VarDef(make().Modifiers(2), names().fromString(itemVar+"$exhausted"), makeJavaType(typeFact().getBooleanDeclaration().getType()), null)); //Now the context for this iterator ListBuffer<JCStatement> contextBody = new ListBuffer<JCStatement>(); if (idx>0) { //Subsequent iterators may depend on the item from the previous loop so we make sure we have one contextBody.add(make().If(make().Binary(JCTree.EQ, makeUnquotedIdent(iterVar), makeNull()), make().Exec(make().Apply(null, makeSelect("this", iterVar), List.<JCExpression>nil())), null)); } //Assign the next item to an Object variable String tmpItem = tempName("item"); contextBody.add(make().VarDef(make().Modifiers(0), names().fromString(tmpItem), makeJavaType(typeFact().getObjectDeclaration().getType()), make().Apply(null, make().Select(makeUnquotedIdent(iterVar), names().fromString("next")), List.<JCExpression>nil()))); //Then we check if it's exhausted contextBody.add(make().Exec(make().Assign(makeUnquotedIdent(itemVar+"$exhausted"), make().Binary(JCTree.EQ, makeUnquotedIdent(tmpItem), makeFinished())))); //Variables get assigned in the else block ListBuffer<JCStatement> elseBody = new ListBuffer<JCStatement>(); if (fcl.getForIterator() instanceof ValueIterator) { ProducedType itemType = ((ValueIterator)fcl.getForIterator()).getVariable().getDeclarationModel().getType(); elseBody.add(make().Exec(make().Assign(makeUnquotedIdent(itemVar), make().TypeCast(makeJavaType(itemType,NO_PRIMITIVES), makeUnquotedIdent(tmpItem))))); } else { KeyValueIterator kviter = (KeyValueIterator)fcl.getForIterator(); Value key = kviter.getKeyVariable().getDeclarationModel(); Value item = kviter.getValueVariable().getDeclarationModel(); //Assign the key and item to the corresponding fields with the proper type casts //equivalent to k=(KeyType)((Entry<KeyType,ItemType>)tmpItem).getKey() JCExpression castEntryExpr = make().TypeCast( makeJavaType(typeFact().getIteratedType(iterType)), makeUnquotedIdent(tmpItem)); elseBody.add(make().Exec(make().Assign(makeUnquotedIdent(key.getName()), make().TypeCast(makeJavaType(key.getType(), NO_PRIMITIVES), make().Apply(null, make().Select(castEntryExpr, names().fromString("getKey")), List.<JCExpression>nil()) )))); //equivalent to v=(ItemType)((Entry<KeyType,ItemType>)tmpItem).getItem() elseBody.add(make().Exec(make().Assign(makeUnquotedIdent(item.getName()), make().TypeCast(makeJavaType(item.getType(), NO_PRIMITIVES), make().Apply(null, make().Select(castEntryExpr, names().fromString("getItem")), List.<JCExpression>nil()) )))); } ListBuffer<JCStatement> innerBody = new ListBuffer<JCStatement>(); if (idx>0) { //Subsequent contexts run once for every iteration of the previous loop //This will reset our previous context by getting a new iterator if the previous loop isn't done innerBody.add(make().If(make().Apply(null, makeSelect("this", ctxtName), List.<JCExpression>nil()), make().Block(0, List.<JCStatement>of( make().Exec(make().Assign(makeUnquotedIdent(iterVar), make().Apply(null, makeSelect("this", iterVar), List.<JCExpression>nil()))), make().Return(make().Apply(null, make().Select(makeUnquotedIdent("this"), names().fromString(itemVar)), List.<JCExpression>nil())) )), null)); } innerBody.add(make().Return(makeBoolean(false))); //Assign the next item to the corresponding variables if not exhausted yet contextBody.add(make().If( makeUnquotedIdent(itemVar+"$exhausted"), make().Block(0, innerBody.toList()), make().Block(0, elseBody.toList()))); contextBody.add(make().Return(makeBoolean(true))); //Create the context method that returns the next item for this iterator ctxtName = itemVar; fields.add(make().MethodDef(make().Modifiers(2), names().fromString(itemVar), makeJavaType(typeFact().getBooleanDeclaration().getType()), List.<JCTree.JCTypeParameter>nil(), List.<JCTree.JCVariableDecl>nil(), List.<JCExpression>nil(), make().Block(0, contextBody.toList()), null)); clause = fcl.getComprehensionClause(); } else if (clause instanceof IfComprehensionClause) { Condition cond = ((IfComprehensionClause)clause).getCondition(); //The context of an if is an iteration through the parent, checking each element against the condition Variable var = null; boolean reassign = false; if (cond instanceof IsCondition || cond instanceof ExistsOrNonemptyCondition) { var = cond instanceof IsCondition ? ((IsCondition)cond).getVariable() : ((ExistsOrNonemptyCondition)cond).getVariable(); //Initialize the condition's attribute to finished so that this is returned //in case the condition is not met and the iterator is exhausted if (!fieldNames.contains(var.getDeclarationModel().getName())) { fields.add(make().VarDef(make().Modifiers(2), names().fromString(var.getDeclarationModel().getName()), makeJavaType(var.getDeclarationModel().getType(),NO_PRIMITIVES), null)); reassign = true; } } //Filter contexts need to check if the previous context applies and then check the condition JCExpression condExpr = make().Apply(null, make().Select(makeUnquotedIdent("this"), names().fromString(ctxtName)), List.<JCExpression>nil()); //_AND_ the previous iterator condition with the comprehension's final JCExpression otherCondition; if (cond instanceof IsCondition) { JCExpression _expr = transformExpression(var.getSpecifierExpression().getExpression()); String _varName = tempName("compr"); JCExpression test = makeTypeTest(null, _varName, ((IsCondition) cond).getType().getTypeModel()); test = makeLetExpr(_varName, List.<JCStatement>nil(), make().Type(syms().objectType), _expr, test); if (reassign) { _expr = make().Assign(makeUnquotedIdent(var.getDeclarationModel().getName()), make().Conditional(test, make().TypeCast(makeJavaType(var.getDeclarationModel().getType(), NO_PRIMITIVES), _expr), makeNull())); otherCondition = make().Binary(JCTree.EQ, _expr, makeNull()); } else { otherCondition = make().Unary(JCTree.NOT, test); } } else if (cond instanceof ExistsCondition) { JCExpression expression = transformExpression(var.getSpecifierExpression().getExpression()); if (reassign) { //Assign the expression, check it's not null expression = make().Assign(makeUnquotedIdent(var.getDeclarationModel().getName()), expression); } otherCondition = make().Binary(JCTree.EQ, expression, makeNull()); } else if (cond instanceof NonemptyCondition) { JCExpression expression = transformExpression(var.getSpecifierExpression().getExpression()); String varName = tempName("compr"); JCExpression test = makeNonEmptyTest(null, varName); test = makeLetExpr(varName, List.<JCStatement>nil(), make().Type(syms().objectType), expression, test); if (reassign) { //Assign the expression if it's nonempty expression = make().Assign(makeUnquotedIdent(var.getDeclarationModel().getName()), make().Conditional(test, make().TypeCast(makeJavaType(var.getDeclarationModel().getType(), NO_PRIMITIVES), expression), makeNull())); otherCondition = make().Binary(JCTree.EQ, expression, makeNull()); } else { otherCondition = make().Unary(JCTree.NOT, test); } } else if (cond instanceof BooleanCondition) { otherCondition = make().Unary(JCTree.NOT, transformExpression(((BooleanCondition) cond).getExpression(), BoxingStrategy.UNBOXED, typeFact().getBooleanDeclaration().getType())); } else { return makeErroneous(cond, "This type of condition is not supported yet for comprehensions"); } condExpr = make().Binary(JCTree.AND, condExpr, otherCondition); //Create the context method that filters from the last iterator ctxtName = "next"+idx; fields.add(make().MethodDef(make().Modifiers(2), names().fromString(ctxtName), makeJavaType(typeFact().getBooleanDeclaration().getType()), List.<JCTree.JCTypeParameter>nil(), List.<JCTree.JCVariableDecl>nil(), List.<JCExpression>nil(), make().Block(0, List.<JCStatement>of( make().WhileLoop(condExpr, make().Block(0, List.<JCStatement>nil())), make().Return(make().Unary(JCTree.NOT, makeUnquotedIdent(prevItemVar+"$exhausted"))) )), null)); clause = ((IfComprehensionClause)clause).getComprehensionClause(); itemVar = prevItemVar; } else if (clause instanceof ExpressionComprehensionClause) { //Just keep a reference to the expression excc = (ExpressionComprehensionClause)clause; at(excc); clause = null; } else { return makeErroneous(clause, "No support for comprehension clause of type " + clause.getClass().getName()); } idx++; if (itemVar != null) prevItemVar = itemVar; } //Define the next() method for the Iterator fields.add(make().MethodDef(make().Modifiers(1), names().fromString("next"), makeJavaType(typeFact().getObjectDeclaration().getType()), List.<JCTree.JCTypeParameter>nil(), List.<JCTree.JCVariableDecl>nil(), List.<JCExpression>nil(), make().Block(0, List.<JCStatement>of( make().Return( make().Conditional( make().Apply(null, make().Select(makeUnquotedIdent("this"), names().fromString(ctxtName)), List.<JCExpression>nil()), transformExpression(excc.getExpression(), BoxingStrategy.BOXED, typeFact().getIteratedType(targetIterType)), makeFinished())) )), null)); //Define the inner iterator class ProducedType iteratorType = typeFact().getIteratorType(typeFact().getIteratedType(targetIterType)); JCExpression iterator = make().NewClass(null, null,makeJavaType(iteratorType, CLASS_NEW|EXTENDS), List.<JCExpression>nil(), make().AnonymousClassDef(make().Modifiers(0), fields.toList())); //Define the anonymous iterable class JCExpression iterable = make().NewClass(null, null, make().TypeApply(makeIdent(syms().ceylonAbstractIterableType), List.<JCExpression>of(makeJavaType(typeFact().getIteratedType(targetIterType), NO_PRIMITIVES))), List.<JCExpression>nil(), make().AnonymousClassDef(make().Modifiers(0), List.<JCTree>of( make().MethodDef(make().Modifiers(1), names().fromString("getIterator"), makeJavaType(iteratorType, CLASS_NEW|EXTENDS), List.<JCTree.JCTypeParameter>nil(), List.<JCTree.JCVariableDecl>nil(), List.<JCExpression>nil(), make().Block(0, List.<JCStatement>of(make().Return(iterator))), null) ))); return iterable; } // // Type helper functions private ProducedType getSupertype(Tree.Term term, Interface compoundType){ return term.getTypeModel().getSupertype(compoundType); } private ProducedType getTypeArgument(ProducedType leftType) { if (leftType!=null && leftType.getTypeArguments().size()==1) { return leftType.getTypeArgumentList().get(0); } return null; } private ProducedType getTypeArgument(ProducedType leftType, int i) { if (leftType!=null && leftType.getTypeArguments().size() > i) { return leftType.getTypeArgumentList().get(i); } return null; } private JCExpression unAutoPromote(JCExpression ret, ProducedType returnType) { // +/- auto-promotes to int, so if we're using java types we'll need a cast return applyJavaTypeConversions(ret, typeFact().getIntegerDeclaration().getType(), returnType, BoxingStrategy.UNBOXED); } private ProducedType getMostPreciseType(Term term, ProducedType defaultType) { // special case for interop when we're dealing with java types ProducedType termType = term.getTypeModel(); if(termType.getUnderlyingType() != null) return termType; return defaultType; } // // Helper functions private boolean isRecursiveReference(Tree.StaticMemberOrTypeExpression expr) { Declaration decl = expr.getDeclaration(); Scope s = expr.getScope(); while (!(s instanceof Declaration) && (s.getContainer() != s)) { s = s.getContainer(); } return (s instanceof Declaration) && (s == decl); } boolean isWithinInvocation() { return withinInvocation; } void setWithinInvocation(boolean withinInvocation) { this.withinInvocation = withinInvocation; } public boolean isWithinCallableInvocation() { return withinCallableInvocation; } public void setWithinCallableInvocation(boolean withinCallableInvocation) { this.withinCallableInvocation = withinCallableInvocation; } public boolean isWithinSuperInvocation() { return withinSuperInvocation; } public void setWithinSuperInvocation(boolean withinSuperInvocation) { this.withinSuperInvocation = withinSuperInvocation; } }

diff --git a/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java b/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java index b11c71c2..0fb2f9e5 100644 --- a/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java +++ b/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java @@ -1,126 +1,127 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You 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 org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import org.apache.bcel.classfile.ArrayElementValue; import org.apache.bcel.classfile.ElementValue; public class ArrayElementValueGen extends ElementValueGen { // J5TODO: Should we make this an array or a list? A list would be easier to // modify ... - private List /* ElementValueGen */evalues; + private List<ElementValueGen> evalues; public ArrayElementValueGen(ConstantPoolGen cp) { super(ARRAY, cp); - evalues = new ArrayList(); + evalues = new ArrayList<ElementValueGen>(); } public ArrayElementValueGen(int type, ElementValue[] datums, ConstantPoolGen cpool) { super(type, cpool); if (type != ARRAY) throw new RuntimeException( "Only element values of type array can be built with this ctor - type specified: " + type); - this.evalues = new ArrayList(); + this.evalues = new ArrayList<ElementValueGen>(); for (int i = 0; i < datums.length; i++) { - evalues.add(datums[i]); + evalues.add(ElementValueGen.copy(datums[i], cpool, true)); } } /** * Return immutable variant of this ArrayElementValueGen */ public ElementValue getElementValue() { ElementValue[] immutableData = new ElementValue[evalues.size()]; int i = 0; - for (Iterator iter = evalues.iterator(); iter.hasNext();) + for (Iterator<ElementValueGen> iter = evalues.iterator(); iter.hasNext();) { - ElementValueGen element = (ElementValueGen) iter.next(); + ElementValueGen element = iter.next(); immutableData[i++] = element.getElementValue(); } return new ArrayElementValue(type, immutableData, cpGen .getConstantPool()); } /** * @param value * @param cpool */ public ArrayElementValueGen(ArrayElementValue value, ConstantPoolGen cpool, boolean copyPoolEntries) { super(ARRAY, cpool); - evalues = new ArrayList(); + evalues = new ArrayList<ElementValueGen>(); ElementValue[] in = value.getElementValuesArray(); for (int i = 0; i < in.length; i++) { evalues.add(ElementValueGen.copy(in[i], cpool, copyPoolEntries)); } } public void dump(DataOutputStream dos) throws IOException { dos.writeByte(type); // u1 type of value (ARRAY == '[') dos.writeShort(evalues.size()); - for (Iterator iter = evalues.iterator(); iter.hasNext();) + for (Iterator<ElementValueGen> iter = evalues.iterator(); iter.hasNext();) { - ElementValueGen element = (ElementValueGen) iter.next(); + ElementValueGen element = iter.next(); element.dump(dos); } } public String stringifyValue() { StringBuffer sb = new StringBuffer(); sb.append("["); - for (Iterator iter = evalues.iterator(); iter.hasNext();) + for (Iterator<ElementValueGen> iter = evalues.iterator(); iter.hasNext();) { - ElementValueGen element = (ElementValueGen) iter.next(); + ElementValueGen element = iter.next(); sb.append(element.stringifyValue()); if (iter.hasNext()) sb.append(","); } sb.append("]"); return sb.toString(); } - public List getElementValues() + public List<ElementValueGen> getElementValues() { return evalues; } public int getElementValuesSize() { return evalues.size(); } public void addElement(ElementValueGen gen) { evalues.add(gen); } }

diff --git a/opentripplanner-routing/src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java b/opentripplanner-routing/src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java index 6785b6b32..1a81572e1 100644 --- a/opentripplanner-routing/src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java +++ b/opentripplanner-routing/src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java @@ -1,543 +1,543 @@ /* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ package org.opentripplanner.routing.edgetype.factory; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.Vector; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.ShapePoint; import org.onebusaway.gtfs.model.Stop; import org.onebusaway.gtfs.model.StopTime; import org.onebusaway.gtfs.model.Transfer; import org.onebusaway.gtfs.model.Trip; import org.onebusaway.gtfs.services.GtfsRelationalDao; import org.opentripplanner.common.geometry.PackedCoordinateSequence; import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsLibrary; import org.opentripplanner.routing.core.Graph; import org.opentripplanner.routing.core.TraverseMode; import org.opentripplanner.routing.core.Vertex; import org.opentripplanner.routing.edgetype.Alight; import org.opentripplanner.routing.edgetype.Board; import org.opentripplanner.routing.edgetype.Dwell; import org.opentripplanner.routing.edgetype.Hop; import org.opentripplanner.routing.edgetype.PatternAlight; import org.opentripplanner.routing.edgetype.PatternBoard; import org.opentripplanner.routing.edgetype.PatternDwell; import org.opentripplanner.routing.edgetype.PatternHop; import org.opentripplanner.routing.edgetype.TripPattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.CoordinateSequence; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.linearref.LinearLocation; import com.vividsolutions.jts.linearref.LocationIndexedLine; class StopPattern2 { Vector<Stop> stops; AgencyAndId calendarId; public StopPattern2(Vector<Stop> stops, AgencyAndId calendarId) { this.stops = stops; this.calendarId = calendarId; } public boolean equals(Object other) { if (other instanceof StopPattern2) { StopPattern2 pattern = (StopPattern2) other; return pattern.stops.equals(stops) && pattern.calendarId.equals(calendarId); } else { return false; } } public int hashCode() { return this.stops.hashCode() ^ this.calendarId.hashCode(); } public String toString() { return "StopPattern(" + stops + ", " + calendarId + ")"; } } class EncodedTrip { Trip trip; int patternIndex; TripPattern pattern; public EncodedTrip(Trip trip, int i, TripPattern pattern) { this.trip = trip; this.patternIndex = i; this.pattern = pattern; } public boolean equals(Object o) { if (!(o instanceof EncodedTrip)) return false; EncodedTrip eto = (EncodedTrip) o; return trip.equals(eto.trip) && patternIndex == eto.patternIndex && pattern.equals(eto.pattern); } public String toString() { return "EncodedTrip(" + this.trip + ", " + this.patternIndex + ", " + this.pattern + ")"; } } public class GTFSPatternHopFactory { private final Logger _log = LoggerFactory.getLogger(GTFSPatternHopFactory.class); private static GeometryFactory _factory = new GeometryFactory(); private GtfsRelationalDao _dao; private Map<ShapeSegmentKey, LineString> _geometriesByShapeSegmentKey = new HashMap<ShapeSegmentKey, LineString>(); private Map<AgencyAndId, LineString> _geometriesByShapeId = new HashMap<AgencyAndId, LineString>(); private Map<AgencyAndId, double[]> _distancesByShapeId = new HashMap<AgencyAndId, double[]>(); public GTFSPatternHopFactory(GtfsContext context) throws Exception { _dao = context.getDao(); } public static StopPattern2 stopPatternfromTrip(Trip trip, GtfsRelationalDao dao) { Vector<Stop> stops = new Vector<Stop>(); for (StopTime stoptime : dao.getStopTimesForTrip(trip)) { stops.add(stoptime.getStop()); } StopPattern2 pattern = new StopPattern2(stops, trip.getServiceId()); return pattern; } private String id(AgencyAndId id) { return GtfsLibrary.convertIdToString(id); } public void run(Graph graph) throws Exception { clearCachedData(); /* * For each trip, create either pattern edges, the entries in a trip pattern's list of * departures, or simple hops */ // Load hops Collection<Trip> trips = _dao.getAllTrips(); HashMap<StopPattern2, TripPattern> patterns = new HashMap<StopPattern2, TripPattern>(); int index = 0; HashMap<String, ArrayList<EncodedTrip>> tripsByBlock = new HashMap<String, ArrayList<EncodedTrip>>(); for (Trip trip : trips) { if (index % 100 == 0) _log.debug("trips=" + index + "/" + trips.size()); index++; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); if (stopTimes.isEmpty()) continue; StopPattern2 stopPattern = stopPatternfromTrip(trip, _dao); TripPattern tripPattern = patterns.get(stopPattern); int lastStop = stopTimes.size() - 1; TraverseMode mode = GtfsLibrary.getTraverseMode(trip.getRoute()); if (tripPattern == null) { tripPattern = new TripPattern(trip, stopTimes); int patternIndex = -1; for (int i = 0; i < lastStop; i++) { StopTime st0 = stopTimes.get(i); Stop s0 = st0.getStop(); StopTime st1 = stopTimes.get(i + 1); Stop s1 = st1.getStop(); int dwellTime = st0.getDepartureTime() - st0.getArrivalTime(); int runningTime = st1.getArrivalTime() - st0.getDepartureTime(); // create journey vertices Vertex startJourneyDepart = graph.addVertex(id(s0.getId()) + "_" + id(trip.getId()) + "_D", s0.getLon(), s0.getLat()); Vertex endJourneyArrive = graph.addVertex(id(s1.getId()) + "_" + id(trip.getId()) + "_A", s1.getLon(), s1.getLat()); Vertex startJourneyArrive; if (i != 0) { startJourneyArrive = graph.addVertex(id(s0.getId()) + "_" + id(trip.getId()) + "_A", s0.getLon(), s0.getLat()); PatternDwell dwell = new PatternDwell(startJourneyArrive, startJourneyDepart, i, tripPattern); graph.addEdge(dwell); } PatternHop hop = new PatternHop(startJourneyDepart, endJourneyArrive, s0, s1, i, tripPattern); hop.setGeometry(getHopGeometry(trip.getShapeId(), st0, st1, startJourneyDepart, endJourneyArrive)); patternIndex = tripPattern.addHop(i, 0, st0.getDepartureTime(), runningTime, st1.getArrivalTime(), dwellTime); graph.addEdge(hop); Vertex startStation = graph.getVertex(id(s0.getId())); Vertex endStation = graph.getVertex(id(s1.getId())); PatternBoard boarding = new PatternBoard(startStation, startJourneyDepart, tripPattern, i, mode); graph.addEdge(boarding); graph.addEdge(new PatternAlight(endJourneyArrive, endStation, tripPattern, i, mode)); } patterns.put(stopPattern, tripPattern); String blockId = trip.getBlockId(); if (blockId != null && !blockId.equals("")) { ArrayList<EncodedTrip> blockTrips = tripsByBlock.get(blockId); if (blockTrips == null) { blockTrips = new ArrayList<EncodedTrip>(); tripsByBlock.put(blockId, blockTrips); } blockTrips.add(new EncodedTrip(trip, patternIndex, tripPattern)); } } else { int insertionPoint = tripPattern.getDepartureTimeInsertionPoint(stopTimes.get(0) .getDepartureTime()); if (insertionPoint < 0) { // There's already a departure at this time on this trip pattern. This means // that either (a) this will have all the same stop times as that one, and thus // will be a duplicate of it, or (b) it will have different stops, and thus // break the assumption that trips are non-overlapping. _log.warn("duplicate first departure time for trip " + trip.getId() + ". This will be handled correctly but inefficiently."); createSimpleHops(graph, trip, stopTimes); } else { // try to insert this trip at this location boolean simple = false; for (int i = 0; i < lastStop; i++) { StopTime st0 = stopTimes.get(i); StopTime st1 = stopTimes.get(i + 1); int dwellTime = st0.getDepartureTime() - st0.getArrivalTime(); int runningTime = st1.getArrivalTime() - st0.getDepartureTime(); try { tripPattern.addHop(i, insertionPoint, st0.getDepartureTime(), runningTime, st1.getArrivalTime(), dwellTime); } catch (TripOvertakingException e) { _log .warn("trip " + trip.getId() + " overtakes another trip with the same stops. This will be handled correctly but inefficiently."); // back out trips and revert to the simple method for (i=i-1; i >= 0; --i) { tripPattern.removeHop(i, insertionPoint); } createSimpleHops(graph, trip, stopTimes); simple = true; break; } } if (!simple) { String blockId = trip.getBlockId(); if (blockId != null && !blockId.equals("")) { ArrayList<EncodedTrip> blockTrips = tripsByBlock.get(blockId); if (blockTrips == null) { blockTrips = new ArrayList<EncodedTrip>(); tripsByBlock.put(blockId, blockTrips); } blockTrips.add(new EncodedTrip(trip, 0, tripPattern)); } } } } } /* for interlined trips, add final dwell edge */ for (ArrayList<EncodedTrip> blockTrips : tripsByBlock.values()) { HashMap<Stop, EncodedTrip> starts = new HashMap<Stop, EncodedTrip>(); for (EncodedTrip encoded : blockTrips) { Trip trip = encoded.trip; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); Stop start = stopTimes.get(0).getStop(); starts.put(start, encoded); } for (EncodedTrip encoded : blockTrips) { Trip trip = encoded.trip; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); StopTime endTime = stopTimes.get(stopTimes.size() - 1); Stop end = endTime.getStop(); if (starts.containsKey(end)) { EncodedTrip nextTrip = starts.get(end); Vertex arrive = graph.addVertex( id(end.getId()) + "_" + id(trip.getId()) + "_A", end.getLon(), end .getLat()); Vertex depart = graph.addVertex(id(end.getId()) + "_" + id(nextTrip.trip.getId()) + "_D", end.getLon(), end.getLat()); PatternDwell dwell = new PatternDwell(arrive, depart, nextTrip.patternIndex, encoded.pattern); graph.addEdge(dwell); List<StopTime> nextStopTimes = _dao.getStopTimesForTrip(nextTrip.trip); StopTime startTime = nextStopTimes.get(0); - int dwellTime = startTime.getDepartureTime() - endTime.getArrivalTime(); + int dwellTime = startTime.getDepartureTime() - startTime.getArrivalTime(); encoded.pattern.setDwellTime(stopTimes.size() - 2, encoded.patternIndex, dwellTime); } } } loadTransfers(graph); clearCachedData(); } private void clearCachedData() { _log.debug("shapes=" + _geometriesByShapeId.size()); _log.debug("segments=" + _geometriesByShapeSegmentKey.size()); _geometriesByShapeId.clear(); _distancesByShapeId.clear(); _geometriesByShapeSegmentKey.clear(); } private void loadTransfers(Graph graph) { Collection<Transfer> transfers = _dao.getAllTransfers(); Set<org.opentripplanner.routing.edgetype.Transfer> createdTransfers = new HashSet<org.opentripplanner.routing.edgetype.Transfer>(); for (Transfer t : transfers) { Stop fromStop = t.getFromStop(); Stop toStop = t.getToStop(); Vertex fromStation = graph.getVertex(id(fromStop.getId())); Vertex toStation = graph.getVertex(id(toStop.getId())); int transferTime = 0; if (t.getTransferType() < 3) { if (t.getTransferType() == 2) { transferTime = t.getMinTransferTime(); } org.opentripplanner.routing.edgetype.Transfer edge = new org.opentripplanner.routing.edgetype.Transfer( fromStation, toStation, transferTime); if (createdTransfers.contains(edge)) { continue; } GeometryFactory factory = new GeometryFactory(); LineString geometry = factory.createLineString(new Coordinate[] { new Coordinate(fromStop.getLon(), fromStop.getLat()), new Coordinate(toStop.getLon(), toStop.getLat()) }); edge.setGeometry(geometry); createdTransfers.add(edge); graph.addEdge(edge); } } } private void createSimpleHops(Graph graph, Trip trip, List<StopTime> stopTimes) throws Exception { String tripId = id(trip.getId()); ArrayList<Hop> hops = new ArrayList<Hop>(); for (int i = 0; i < stopTimes.size() - 1; i++) { StopTime st0 = stopTimes.get(i); Stop s0 = st0.getStop(); StopTime st1 = stopTimes.get(i + 1); Stop s1 = st1.getStop(); Vertex startStation = graph.getVertex(id(s0.getId())); Vertex endStation = graph.getVertex(id(s1.getId())); // create journey vertices Vertex startJourneyArrive = graph.addVertex(id(s0.getId()) + "_" + tripId, s0.getLon(), s0.getLat()); Vertex startJourneyDepart = graph.addVertex(id(s0.getId()) + "_" + tripId, s0.getLon(), s0.getLat()); Vertex endJourney = graph.addVertex(id(s1.getId()) + "_" + tripId, s1.getLon(), s1 .getLat()); Dwell dwell = new Dwell(startJourneyArrive, startJourneyDepart, st0); graph.addEdge(dwell); Hop hop = new Hop(startJourneyDepart, endJourney, st0, st1); hop.setGeometry(getHopGeometry(trip.getShapeId(), st0, st1, startJourneyDepart, endJourney)); hops.add(hop); Board boarding = new Board(startStation, startJourneyDepart, hop); graph.addEdge(boarding); graph.addEdge(new Alight(endJourney, endStation, hop)); } } private Geometry getHopGeometry(AgencyAndId shapeId, StopTime st0, StopTime st1, Vertex startJourney, Vertex endJourney) { if (shapeId == null || shapeId.getId() == null || shapeId.getId().equals("")) return null; double startDistance = st0.getShapeDistTraveled(); double endDistance = st1.getShapeDistTraveled(); boolean hasShapeDist = startDistance != -1 && endDistance != -1; if (hasShapeDist) { ShapeSegmentKey key = new ShapeSegmentKey(shapeId, startDistance, endDistance); LineString geometry = _geometriesByShapeSegmentKey.get(key); if (geometry != null) return geometry; double[] distances = getDistanceForShapeId(shapeId); if (distances != null) { LinearLocation startIndex = getSegmentFraction(distances, startDistance); LinearLocation endIndex = getSegmentFraction(distances, endDistance); LineString line = getLineStringForShapeId(shapeId); LocationIndexedLine lol = new LocationIndexedLine(line); return getSegmentGeometry(shapeId, lol, startIndex, endIndex, startDistance, endDistance); } } LineString line = getLineStringForShapeId(shapeId); LocationIndexedLine lol = new LocationIndexedLine(line); LinearLocation startCoord = lol.indexOf(startJourney.getCoordinate()); LinearLocation endCoord = lol.indexOf(endJourney.getCoordinate()); double distanceFrom = startCoord.getSegmentLength(line); double distanceTo = endCoord.getSegmentLength(line); return getSegmentGeometry(shapeId, lol, startCoord, endCoord, distanceFrom, distanceTo); } private Geometry getSegmentGeometry(AgencyAndId shapeId, LocationIndexedLine locationIndexedLine, LinearLocation startIndex, LinearLocation endIndex, double startDistance, double endDistance) { ShapeSegmentKey key = new ShapeSegmentKey(shapeId, startDistance, endDistance); LineString geometry = _geometriesByShapeSegmentKey.get(key); if (geometry == null) { geometry = (LineString) locationIndexedLine.extractLine(startIndex, endIndex); // Pack the resulting line string CoordinateSequence sequence = new PackedCoordinateSequence.Float(geometry .getCoordinates(), 2); geometry = _factory.createLineString(sequence); _geometriesByShapeSegmentKey.put(key, geometry); } return geometry; } private LineString getLineStringForShapeId(AgencyAndId shapeId) { LineString geometry = _geometriesByShapeId.get(shapeId); if (geometry != null) return geometry; List<ShapePoint> points = _dao.getShapePointsForShapeId(shapeId); Coordinate[] coordinates = new Coordinate[points.size()]; double[] distances = new double[points.size()]; boolean hasAllDistances = true; int i = 0; for (ShapePoint point : points) { coordinates[i] = new Coordinate(point.getLon(), point.getLat()); distances[i] = point.getDistTraveled(); if (point.getDistTraveled() == -1) hasAllDistances = false; i++; } /** * If we don't have distances here, we can't calculate them ourselves because we can't * assume the units will match */ if (!hasAllDistances) { distances = null; } CoordinateSequence sequence = new PackedCoordinateSequence.Float(coordinates, 2); geometry = _factory.createLineString(sequence); _geometriesByShapeId.put(shapeId, geometry); _distancesByShapeId.put(shapeId, distances); return geometry; } private double[] getDistanceForShapeId(AgencyAndId shapeId) { getLineStringForShapeId(shapeId); return _distancesByShapeId.get(shapeId); } private LinearLocation getSegmentFraction(double[] distances, double distance) { int index = Arrays.binarySearch(distances, distance); if (index < 0) index = -(index + 1); if (index == 0) return new LinearLocation(0, 0.0); if (index == distances.length) return new LinearLocation(distances.length, 0.0); double indexPart = (distance - distances[index - 1]) / (distances[index] - distances[index - 1]); return new LinearLocation(index - 1, indexPart); } }

public void run(Graph graph) throws Exception { clearCachedData(); /* * For each trip, create either pattern edges, the entries in a trip pattern's list of * departures, or simple hops */ // Load hops Collection<Trip> trips = _dao.getAllTrips(); HashMap<StopPattern2, TripPattern> patterns = new HashMap<StopPattern2, TripPattern>(); int index = 0; HashMap<String, ArrayList<EncodedTrip>> tripsByBlock = new HashMap<String, ArrayList<EncodedTrip>>(); for (Trip trip : trips) { if (index % 100 == 0) _log.debug("trips=" + index + "/" + trips.size()); index++; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); if (stopTimes.isEmpty()) continue; StopPattern2 stopPattern = stopPatternfromTrip(trip, _dao); TripPattern tripPattern = patterns.get(stopPattern); int lastStop = stopTimes.size() - 1; TraverseMode mode = GtfsLibrary.getTraverseMode(trip.getRoute()); if (tripPattern == null) { tripPattern = new TripPattern(trip, stopTimes); int patternIndex = -1; for (int i = 0; i < lastStop; i++) { StopTime st0 = stopTimes.get(i); Stop s0 = st0.getStop(); StopTime st1 = stopTimes.get(i + 1); Stop s1 = st1.getStop(); int dwellTime = st0.getDepartureTime() - st0.getArrivalTime(); int runningTime = st1.getArrivalTime() - st0.getDepartureTime(); // create journey vertices Vertex startJourneyDepart = graph.addVertex(id(s0.getId()) + "_" + id(trip.getId()) + "_D", s0.getLon(), s0.getLat()); Vertex endJourneyArrive = graph.addVertex(id(s1.getId()) + "_" + id(trip.getId()) + "_A", s1.getLon(), s1.getLat()); Vertex startJourneyArrive; if (i != 0) { startJourneyArrive = graph.addVertex(id(s0.getId()) + "_" + id(trip.getId()) + "_A", s0.getLon(), s0.getLat()); PatternDwell dwell = new PatternDwell(startJourneyArrive, startJourneyDepart, i, tripPattern); graph.addEdge(dwell); } PatternHop hop = new PatternHop(startJourneyDepart, endJourneyArrive, s0, s1, i, tripPattern); hop.setGeometry(getHopGeometry(trip.getShapeId(), st0, st1, startJourneyDepart, endJourneyArrive)); patternIndex = tripPattern.addHop(i, 0, st0.getDepartureTime(), runningTime, st1.getArrivalTime(), dwellTime); graph.addEdge(hop); Vertex startStation = graph.getVertex(id(s0.getId())); Vertex endStation = graph.getVertex(id(s1.getId())); PatternBoard boarding = new PatternBoard(startStation, startJourneyDepart, tripPattern, i, mode); graph.addEdge(boarding); graph.addEdge(new PatternAlight(endJourneyArrive, endStation, tripPattern, i, mode)); } patterns.put(stopPattern, tripPattern); String blockId = trip.getBlockId(); if (blockId != null && !blockId.equals("")) { ArrayList<EncodedTrip> blockTrips = tripsByBlock.get(blockId); if (blockTrips == null) { blockTrips = new ArrayList<EncodedTrip>(); tripsByBlock.put(blockId, blockTrips); } blockTrips.add(new EncodedTrip(trip, patternIndex, tripPattern)); } } else { int insertionPoint = tripPattern.getDepartureTimeInsertionPoint(stopTimes.get(0) .getDepartureTime()); if (insertionPoint < 0) { // There's already a departure at this time on this trip pattern. This means // that either (a) this will have all the same stop times as that one, and thus // will be a duplicate of it, or (b) it will have different stops, and thus // break the assumption that trips are non-overlapping. _log.warn("duplicate first departure time for trip " + trip.getId() + ". This will be handled correctly but inefficiently."); createSimpleHops(graph, trip, stopTimes); } else { // try to insert this trip at this location boolean simple = false; for (int i = 0; i < lastStop; i++) { StopTime st0 = stopTimes.get(i); StopTime st1 = stopTimes.get(i + 1); int dwellTime = st0.getDepartureTime() - st0.getArrivalTime(); int runningTime = st1.getArrivalTime() - st0.getDepartureTime(); try { tripPattern.addHop(i, insertionPoint, st0.getDepartureTime(), runningTime, st1.getArrivalTime(), dwellTime); } catch (TripOvertakingException e) { _log .warn("trip " + trip.getId() + " overtakes another trip with the same stops. This will be handled correctly but inefficiently."); // back out trips and revert to the simple method for (i=i-1; i >= 0; --i) { tripPattern.removeHop(i, insertionPoint); } createSimpleHops(graph, trip, stopTimes); simple = true; break; } } if (!simple) { String blockId = trip.getBlockId(); if (blockId != null && !blockId.equals("")) { ArrayList<EncodedTrip> blockTrips = tripsByBlock.get(blockId); if (blockTrips == null) { blockTrips = new ArrayList<EncodedTrip>(); tripsByBlock.put(blockId, blockTrips); } blockTrips.add(new EncodedTrip(trip, 0, tripPattern)); } } } } } /* for interlined trips, add final dwell edge */ for (ArrayList<EncodedTrip> blockTrips : tripsByBlock.values()) { HashMap<Stop, EncodedTrip> starts = new HashMap<Stop, EncodedTrip>(); for (EncodedTrip encoded : blockTrips) { Trip trip = encoded.trip; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); Stop start = stopTimes.get(0).getStop(); starts.put(start, encoded); } for (EncodedTrip encoded : blockTrips) { Trip trip = encoded.trip; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); StopTime endTime = stopTimes.get(stopTimes.size() - 1); Stop end = endTime.getStop(); if (starts.containsKey(end)) { EncodedTrip nextTrip = starts.get(end); Vertex arrive = graph.addVertex( id(end.getId()) + "_" + id(trip.getId()) + "_A", end.getLon(), end .getLat()); Vertex depart = graph.addVertex(id(end.getId()) + "_" + id(nextTrip.trip.getId()) + "_D", end.getLon(), end.getLat()); PatternDwell dwell = new PatternDwell(arrive, depart, nextTrip.patternIndex, encoded.pattern); graph.addEdge(dwell); List<StopTime> nextStopTimes = _dao.getStopTimesForTrip(nextTrip.trip); StopTime startTime = nextStopTimes.get(0); int dwellTime = startTime.getDepartureTime() - endTime.getArrivalTime(); encoded.pattern.setDwellTime(stopTimes.size() - 2, encoded.patternIndex, dwellTime); } } } loadTransfers(graph); clearCachedData(); }

public void run(Graph graph) throws Exception { clearCachedData(); /* * For each trip, create either pattern edges, the entries in a trip pattern's list of * departures, or simple hops */ // Load hops Collection<Trip> trips = _dao.getAllTrips(); HashMap<StopPattern2, TripPattern> patterns = new HashMap<StopPattern2, TripPattern>(); int index = 0; HashMap<String, ArrayList<EncodedTrip>> tripsByBlock = new HashMap<String, ArrayList<EncodedTrip>>(); for (Trip trip : trips) { if (index % 100 == 0) _log.debug("trips=" + index + "/" + trips.size()); index++; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); if (stopTimes.isEmpty()) continue; StopPattern2 stopPattern = stopPatternfromTrip(trip, _dao); TripPattern tripPattern = patterns.get(stopPattern); int lastStop = stopTimes.size() - 1; TraverseMode mode = GtfsLibrary.getTraverseMode(trip.getRoute()); if (tripPattern == null) { tripPattern = new TripPattern(trip, stopTimes); int patternIndex = -1; for (int i = 0; i < lastStop; i++) { StopTime st0 = stopTimes.get(i); Stop s0 = st0.getStop(); StopTime st1 = stopTimes.get(i + 1); Stop s1 = st1.getStop(); int dwellTime = st0.getDepartureTime() - st0.getArrivalTime(); int runningTime = st1.getArrivalTime() - st0.getDepartureTime(); // create journey vertices Vertex startJourneyDepart = graph.addVertex(id(s0.getId()) + "_" + id(trip.getId()) + "_D", s0.getLon(), s0.getLat()); Vertex endJourneyArrive = graph.addVertex(id(s1.getId()) + "_" + id(trip.getId()) + "_A", s1.getLon(), s1.getLat()); Vertex startJourneyArrive; if (i != 0) { startJourneyArrive = graph.addVertex(id(s0.getId()) + "_" + id(trip.getId()) + "_A", s0.getLon(), s0.getLat()); PatternDwell dwell = new PatternDwell(startJourneyArrive, startJourneyDepart, i, tripPattern); graph.addEdge(dwell); } PatternHop hop = new PatternHop(startJourneyDepart, endJourneyArrive, s0, s1, i, tripPattern); hop.setGeometry(getHopGeometry(trip.getShapeId(), st0, st1, startJourneyDepart, endJourneyArrive)); patternIndex = tripPattern.addHop(i, 0, st0.getDepartureTime(), runningTime, st1.getArrivalTime(), dwellTime); graph.addEdge(hop); Vertex startStation = graph.getVertex(id(s0.getId())); Vertex endStation = graph.getVertex(id(s1.getId())); PatternBoard boarding = new PatternBoard(startStation, startJourneyDepart, tripPattern, i, mode); graph.addEdge(boarding); graph.addEdge(new PatternAlight(endJourneyArrive, endStation, tripPattern, i, mode)); } patterns.put(stopPattern, tripPattern); String blockId = trip.getBlockId(); if (blockId != null && !blockId.equals("")) { ArrayList<EncodedTrip> blockTrips = tripsByBlock.get(blockId); if (blockTrips == null) { blockTrips = new ArrayList<EncodedTrip>(); tripsByBlock.put(blockId, blockTrips); } blockTrips.add(new EncodedTrip(trip, patternIndex, tripPattern)); } } else { int insertionPoint = tripPattern.getDepartureTimeInsertionPoint(stopTimes.get(0) .getDepartureTime()); if (insertionPoint < 0) { // There's already a departure at this time on this trip pattern. This means // that either (a) this will have all the same stop times as that one, and thus // will be a duplicate of it, or (b) it will have different stops, and thus // break the assumption that trips are non-overlapping. _log.warn("duplicate first departure time for trip " + trip.getId() + ". This will be handled correctly but inefficiently."); createSimpleHops(graph, trip, stopTimes); } else { // try to insert this trip at this location boolean simple = false; for (int i = 0; i < lastStop; i++) { StopTime st0 = stopTimes.get(i); StopTime st1 = stopTimes.get(i + 1); int dwellTime = st0.getDepartureTime() - st0.getArrivalTime(); int runningTime = st1.getArrivalTime() - st0.getDepartureTime(); try { tripPattern.addHop(i, insertionPoint, st0.getDepartureTime(), runningTime, st1.getArrivalTime(), dwellTime); } catch (TripOvertakingException e) { _log .warn("trip " + trip.getId() + " overtakes another trip with the same stops. This will be handled correctly but inefficiently."); // back out trips and revert to the simple method for (i=i-1; i >= 0; --i) { tripPattern.removeHop(i, insertionPoint); } createSimpleHops(graph, trip, stopTimes); simple = true; break; } } if (!simple) { String blockId = trip.getBlockId(); if (blockId != null && !blockId.equals("")) { ArrayList<EncodedTrip> blockTrips = tripsByBlock.get(blockId); if (blockTrips == null) { blockTrips = new ArrayList<EncodedTrip>(); tripsByBlock.put(blockId, blockTrips); } blockTrips.add(new EncodedTrip(trip, 0, tripPattern)); } } } } } /* for interlined trips, add final dwell edge */ for (ArrayList<EncodedTrip> blockTrips : tripsByBlock.values()) { HashMap<Stop, EncodedTrip> starts = new HashMap<Stop, EncodedTrip>(); for (EncodedTrip encoded : blockTrips) { Trip trip = encoded.trip; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); Stop start = stopTimes.get(0).getStop(); starts.put(start, encoded); } for (EncodedTrip encoded : blockTrips) { Trip trip = encoded.trip; List<StopTime> stopTimes = _dao.getStopTimesForTrip(trip); StopTime endTime = stopTimes.get(stopTimes.size() - 1); Stop end = endTime.getStop(); if (starts.containsKey(end)) { EncodedTrip nextTrip = starts.get(end); Vertex arrive = graph.addVertex( id(end.getId()) + "_" + id(trip.getId()) + "_A", end.getLon(), end .getLat()); Vertex depart = graph.addVertex(id(end.getId()) + "_" + id(nextTrip.trip.getId()) + "_D", end.getLon(), end.getLat()); PatternDwell dwell = new PatternDwell(arrive, depart, nextTrip.patternIndex, encoded.pattern); graph.addEdge(dwell); List<StopTime> nextStopTimes = _dao.getStopTimesForTrip(nextTrip.trip); StopTime startTime = nextStopTimes.get(0); int dwellTime = startTime.getDepartureTime() - startTime.getArrivalTime(); encoded.pattern.setDwellTime(stopTimes.size() - 2, encoded.patternIndex, dwellTime); } } } loadTransfers(graph); clearCachedData(); }

diff --git a/src/main/java/edu/wm/werewolf/service/GameService.java b/src/main/java/edu/wm/werewolf/service/GameService.java index 22b4a44..51373a5 100644 --- a/src/main/java/edu/wm/werewolf/service/GameService.java +++ b/src/main/java/edu/wm/werewolf/service/GameService.java @@ -1,367 +1,368 @@ package edu.wm.werewolf.service; import java.sql.SQLException; import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Random; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import edu.wm.werewolf.HomeController; import edu.wm.werewolf.dao.IGameDAO; import edu.wm.werewolf.dao.IKillDAO; import edu.wm.werewolf.dao.IPlayerDAO; import edu.wm.werewolf.dao.IUserDAO; import edu.wm.werewolf.domain.GPSLocation; import edu.wm.werewolf.domain.Game; import edu.wm.werewolf.domain.JsonResponse; import edu.wm.werewolf.domain.Player; import edu.wm.werewolf.domain.PlayerBasic; import edu.wm.werewolf.domain.Score; import edu.wm.werewolf.domain.User; import edu.wm.werewolf.exceptions.GameNotFoundException; import edu.wm.werewolf.exceptions.NoRemainingPlayersException; import edu.wm.werewolf.exceptions.PlayerNotFoundException; public class GameService { @Autowired private IPlayerDAO playerDAO; @Autowired private IUserDAO userDAO; @Autowired private IKillDAO killDAO; @Autowired private IGameDAO gameDAO; private Game activeGame = null; private boolean atNight; private int scentRadius = 800; private int killRadius = 500; private int disqualificationInterval = 30; private boolean testingMode = false; public void setTesting() { testingMode = true; } public List<PlayerBasic> getAllAlive() { List<Player> players = playerDAO.getAllAlive(); List<PlayerBasic> playersBasic = new ArrayList<PlayerBasic>(); for (int i = 0; i < players.size(); i++) { User u = userDAO.getUserByUsername(players.get(i).getUsername()); playersBasic.add(new PlayerBasic(u.getUsername(), u.getFirstname(), u.getLastname())); } return playersBasic; } public JsonResponse vote(String voterUsername, String votingForUsername) { Player voter; try { voter = playerDAO.getPlayerByUsername(voterUsername); } catch (PlayerNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); return new JsonResponse(false, "Error: your username could not be found."); } Player votingFor; try { votingFor = playerDAO.getPlayerByUsername(votingForUsername); } catch (PlayerNotFoundException e) { e.printStackTrace(); return new JsonResponse(false, "Error: the player you voted for could not be found."); } if (voter.isDead()) return new JsonResponse (false, "Error: you must be alive to vote for other players."); if (votingFor.isDead()) return new JsonResponse (false, "Error: the player you have voted for is already dead."); if (atNight) return new JsonResponse (false, "Error: you can only vote during the daytime."); playerDAO.vote(voter, votingFor); return new JsonResponse(true, "Vote registered successfully."); } public JsonResponse kill(String killerUsername, String victimUsername) { Player killer; try { killer = playerDAO.getPlayerByUsername(killerUsername); } catch (PlayerNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); return new JsonResponse(false, "Error: your username could not be found."); } Player victim; try { victim = playerDAO.getPlayerByUsername(victimUsername); } catch (PlayerNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); return new JsonResponse(false, "Error: your victim's username could not be found."); } if (!killer.isWerewolf()) return new JsonResponse (false, "Error: must be a werewolf to kill other players."); if (victim.isDead()) return new JsonResponse (false, "Error: victim is already dead."); if (killer.isDead()) return new JsonResponse (false, "Error: you must be alive to kill other players."); if (!atNight) return new JsonResponse (false, "Error: you can only kill players at night."); double playerDistance; try { playerDistance = playerDAO.getDistanceBetween(killer, victim); } catch (PlayerNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); return new JsonResponse(false, "Error: player not found"); } catch (SQLException e) { return new JsonResponse(false, "Error"); } if (playerDistance < 0 || playerDistance > killRadius) return new JsonResponse(false, "Error: victim is not within range."); else { playerDAO.setDead(victim); return new JsonResponse(true, "Victim killed successfully."); } } public List<PlayerBasic> getAllNearby(String username) { Player p; try { p = playerDAO.getPlayerByUsername(username); } catch (PlayerNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); return null; } if (!p.isWerewolf() || p.isDead() || !atNight) { return null; } List<Player> players = playerDAO.getAllNear(new GPSLocation(p.getLat(), p.getLng()), scentRadius); List<PlayerBasic> playersBasic = new ArrayList<PlayerBasic>(); for (int i = 0; i < players.size(); i++) { User u = userDAO.getUserByUsername(players.get(i).getUsername()); playersBasic.add(new PlayerBasic(u.getUsername(), u.getFirstname(), u.getLastname())); } return playersBasic; } public List<PlayerBasic> getAllVotable() { List<Player> players = playerDAO.getAllAlive(); List<PlayerBasic> playersBasic = new ArrayList<PlayerBasic>(); for (int i = 0; i < players.size(); i++) { User u = userDAO.getUserByUsername(players.get(i).getUsername()); playersBasic.add(new PlayerBasic(u.getUsername(), u.getFirstname(), u.getLastname())); } return playersBasic; } public List<Score> getScores() { return userDAO.getScores(); } public JsonResponse newGame(String adminUsername, int dayNightFrequency) { playerDAO.deleteAllPlayers(); List<User> users = userDAO.getAllUsers(); List<Player> players = new ArrayList<Player>(); for (int i = 0; i < users.size(); i++) { Player p = new Player(); p.setUsername(users.get(i).getUsername()); players.add(p); } Collections.shuffle(players, new Random(System.currentTimeMillis())); int numberOfWerewolves = players.size() / 3; for (int i = 0; i < players.size(); i++) { if (i < numberOfWerewolves) players.get(i).setWerewolf(true); playerDAO.insertPlayer(players.get(i)); } atNight = false; activeGame = new Game(adminUsername, Calendar.getInstance().getTime(), dayNightFrequency, null); String gameID = gameDAO.newGame(activeGame); activeGame.setGameID(gameID); JsonResponse r = new JsonResponse(true, "Sucessfully created new game"); return r; } public JsonResponse restartGame(String username) { if (!activeGame.getAdmin().equals(username)) { return new JsonResponse(false, "Error: only the admin is allowed to restart the game."); } List<String> IDs = playerDAO.getAllIDs(); playerDAO.deleteAllPlayers(); List<Player> players = new ArrayList<Player>(); for (int i = 0; i < IDs.size(); i++) { Player p = new Player(); p.setUsername(IDs.get(i)); players.add(p); } Collections.shuffle(players, new Random(System.currentTimeMillis())); int numberOfWerewolves = players.size() / 3; for (int i = 0; i < players.size(); i++) { if (i < numberOfWerewolves) players.get(i).setWerewolf(true); playerDAO.insertPlayer(players.get(i)); } try { - gameDAO.restartGameByID(activeGame.getGameID()); + activeGame = gameDAO.restartGameByID(activeGame.getGameID()); } catch (Exception e) { e.printStackTrace(); return new JsonResponse(false, "Error: could not restart game."); } + atNight = false; return new JsonResponse(true, "Successfully restarted the game."); } public JsonResponse updatePosition(String username, GPSLocation location) { playerDAO.moveByUsername(username, location); return new JsonResponse(true, "Player location updated successfully."); } public void forceNight() { atNight = true; tallyVotes(); checkForEndOfGame(); } public void forceDay() { atNight = false; checkForEndOfGame(); } public boolean atNight() { return atNight; } @Scheduled(fixedRate=5000) public void checkGameOperation() { if (testingMode) return; //HomeController.logger.info("Checking game operation"); if (!isActive()) return; playerDAO.removeInactivePlayers(disqualificationInterval); if (!atNight && activeGame.atNight()) { HomeController.logger.info("Entering night cycle"); atNight = true; tallyVotes(); checkForEndOfGame(); } if (atNight && !activeGame.atNight()) { HomeController.logger.info("Entering day cycle"); atNight = false; checkForEndOfGame(); } } private void checkForEndOfGame() { List<Player> aliveWerewolves; List<Player> aliveTownspeople; try { aliveWerewolves = playerDAO.getAliveWerewolves(); aliveTownspeople = playerDAO.getAliveTownspeople(); } catch (SQLException e) { e.printStackTrace(); return; } int numWerewolves = aliveWerewolves.size(); int numTownspeople = aliveTownspeople.size(); if (numWerewolves == 0) { gameOver(aliveTownspeople); } if (numWerewolves > numTownspeople) { gameOver(aliveWerewolves); } } private void gameOver(List<Player> winners) { for (int i = 0; i < winners.size(); i++) { User u = new User(); u.setUsername(winners.get(i).getUsername()); userDAO.logWin(u); } playerDAO.deleteAllPlayers(); activeGame = null; } public void tallyVotes() { try { playerDAO.logVotes(); } catch (SQLException e1) { e1.printStackTrace(); return; } catch (NoRemainingPlayersException e1) { e1.printStackTrace(); return; } } public boolean isActive() { return activeGame != null; } }

diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java index 3a66451..407030b 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositoryQueryPage.java @@ -1,386 +1,391 @@ /******************************************************************************* * Copyright (c) 2011 Red Hat and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * David Green <[email protected]> - initial contribution * Christian Trutz <[email protected]> - initial contribution * Chris Aniszczyk <[email protected]> - initial contribution *******************************************************************************/ package org.eclipse.mylyn.github.ui.internal; import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.LinkedList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.mylyn.commons.net.Policy; import org.eclipse.mylyn.github.internal.GitHubRepositoryConnector; import org.eclipse.mylyn.github.internal.IssueService; import org.eclipse.mylyn.github.internal.LabelComparator; import org.eclipse.mylyn.github.internal.Milestone; import org.eclipse.mylyn.github.internal.QueryUtils; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; /** * GitHub issue repository query page class. */ public class GitHubRepositoryQueryPage extends AbstractRepositoryQueryPage { private Button openButton; private Button closedButton; private Text titleText; private Text assigneeText; private Text mentionText; private Combo milestoneCombo; private CheckboxTableViewer labelsViewer; private List<Milestone> milestones; private SelectionListener completeListener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setPageComplete(isPageComplete()); } }; /** * @param pageName * @param taskRepository * @param query */ public GitHubRepositoryQueryPage(String pageName, TaskRepository taskRepository, IRepositoryQuery query) { super(pageName, taskRepository, query); setDescription(Messages.GitHubRepositoryQueryPage_Description); setPageComplete(false); } /** * @param taskRepository * @param query */ public GitHubRepositoryQueryPage(TaskRepository taskRepository, IRepositoryQuery query) { this("issueQueryPage", taskRepository, query); //$NON-NLS-1$ } private void createLabelsArea(Composite parent) { Group labelsArea = new Group(parent, SWT.NONE); labelsArea.setText(Messages.GitHubRepositoryQueryPage_LabelsLabel); GridDataFactory.fillDefaults().grab(true, true).applyTo(labelsArea); GridLayoutFactory.swtDefaults().applyTo(labelsArea); labelsViewer = CheckboxTableViewer.newCheckList(labelsArea, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); - GridDataFactory.fillDefaults().grab(true, true).hint(SWT.DEFAULT, 80) + GridDataFactory.fillDefaults().grab(true, true).hint(100, 80) .applyTo(labelsViewer.getControl()); labelsViewer.setContentProvider(ArrayContentProvider.getInstance()); labelsViewer.setLabelProvider(new LabelProvider() { public String getText(Object element) { return ((org.eclipse.mylyn.github.internal.Label) element) .getName(); } + public Image getImage(Object element) { + return GitHubImages.get(GitHubImages.GITHUB_ISSUE_LABEL_OBJ); + } + }); labelsViewer .addSelectionChangedListener(new ISelectionChangedListener() { public void selectionChanged(SelectionChangedEvent event) { setPageComplete(isPageComplete()); } }); } /** * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ public void createControl(Composite parent) { Composite displayArea = new Composite(parent, SWT.NONE); GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(false) .applyTo(displayArea); GridDataFactory.fillDefaults().grab(true, true).applyTo(displayArea); if (!inSearchContainer()) { Composite titleArea = new Composite(displayArea, SWT.NONE); GridLayoutFactory.fillDefaults().numColumns(2).applyTo(titleArea); GridDataFactory.fillDefaults().grab(true, false).span(2, 1) .applyTo(titleArea); new Label(titleArea, SWT.NONE) .setText(Messages.GitHubRepositoryQueryPage_TitleLabel); titleText = new Text(titleArea, SWT.SINGLE | SWT.BORDER); GridDataFactory.fillDefaults().grab(true, false).applyTo(titleText); titleText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { setPageComplete(isPageComplete()); } }); } Composite leftArea = new Composite(displayArea, SWT.NONE); GridLayoutFactory.fillDefaults().numColumns(2).applyTo(leftArea); GridDataFactory.fillDefaults().grab(true, true).applyTo(leftArea); Composite statusArea = new Composite(leftArea, SWT.NONE); GridLayoutFactory.fillDefaults().numColumns(3).equalWidth(false) .applyTo(statusArea); GridDataFactory.fillDefaults().grab(true, false).span(2, 1) .applyTo(statusArea); new Label(statusArea, SWT.NONE) .setText(Messages.GitHubRepositoryQueryPage_StatusLabel); openButton = new Button(statusArea, SWT.CHECK); openButton.setSelection(true); openButton.setText(Messages.GitHubRepositoryQueryPage_StatusOpen); openButton.addSelectionListener(this.completeListener); closedButton = new Button(statusArea, SWT.CHECK); closedButton.setSelection(true); closedButton.setText(Messages.GitHubRepositoryQueryPage_StatusClosed); closedButton.addSelectionListener(this.completeListener); Label milestonesLabel = new Label(leftArea, SWT.NONE); milestonesLabel .setText(Messages.GitHubRepositoryQueryPage_MilestoneLabel); milestoneCombo = new Combo(leftArea, SWT.DROP_DOWN | SWT.READ_ONLY); GridDataFactory.fillDefaults().grab(true, false) .applyTo(milestoneCombo); Label assigneeLabel = new Label(leftArea, SWT.NONE); assigneeLabel.setText(Messages.GitHubRepositoryQueryPage_AssigneeLabel); assigneeText = new Text(leftArea, SWT.BORDER | SWT.SINGLE); GridDataFactory.fillDefaults().grab(true, false).applyTo(assigneeText); Label mentionLabel = new Label(leftArea, SWT.NONE); mentionLabel.setText(Messages.GitHubRepositoryQueryPage_MentionsLabel); mentionText = new Text(leftArea, SWT.BORDER | SWT.SINGLE); GridDataFactory.fillDefaults().grab(true, false).applyTo(mentionText); createLabelsArea(displayArea); loadRepository(); initialize(); setControl(displayArea); } private void initialize() { IRepositoryQuery query = getQuery(); if (query == null) return; String milestoneNumber = query .getAttribute(IssueService.FILTER_MILESTONE); if (milestoneNumber != null && this.milestones != null) { int index = 0; for (Milestone milestone : this.milestones) { index++; if (milestoneNumber.equals(Integer.toString(milestone .getNumber()))) { this.milestoneCombo.select(index); break; } } } titleText.setText(query.getSummary()); labelsViewer.setCheckedElements(QueryUtils.getAttributes( IssueService.FILTER_LABELS, query).toArray()); List<String> status = QueryUtils.getAttributes( IssueService.FILTER_STATE, query); closedButton.setSelection(status.contains(IssueService.STATE_CLOSED)); openButton.setSelection(status.contains(IssueService.STATE_OPEN)); } private boolean updateLabels() { if (this.labelsViewer.getControl().isDisposed()) return false; GitHubRepositoryConnector connector = GitHubRepositoryConnectorUI .getCoreConnector(); TaskRepository repository = getTaskRepository(); boolean hasLabels = connector.hasCachedLabels(repository); if (hasLabels) { List<org.eclipse.mylyn.github.internal.Label> labels = connector .getLabels(repository); Collections.sort(labels, new LabelComparator()); this.labelsViewer.setInput(labels); } return hasLabels; } private boolean updateMilestones() { if (this.milestoneCombo.isDisposed()) return false; GitHubRepositoryConnector connector = GitHubRepositoryConnectorUI .getCoreConnector(); TaskRepository repository = getTaskRepository(); boolean hasMilestones = connector.hasCachedMilestones(repository); if (hasMilestones) { this.milestones = connector.getMilestones(repository); this.milestoneCombo.removeAll(); this.milestoneCombo .add(Messages.GitHubRepositoryQueryPage_MilestoneNone); for (Milestone milestone : milestones) this.milestoneCombo.add(milestone.getTitle()); this.milestoneCombo.select(0); } return hasMilestones; } private void refreshRepository() { try { getContainer().run(true, true, new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { Policy.monitorFor(monitor); monitor.beginTask("", 2); //$NON-NLS-1$ try { GitHubRepositoryConnector connector = GitHubRepositoryConnectorUI .getCoreConnector(); TaskRepository repository = getTaskRepository(); monitor.setTaskName(Messages.GitHubRepositoryQueryPage_TaskLoadingLabels); connector.refreshLabels(repository); monitor.worked(1); monitor.setTaskName(Messages.GitHubRepositoryQueryPage_TaskLoadingMilestones); connector.refreshMilestones(repository); monitor.done(); PlatformUI.getWorkbench().getDisplay() .asyncExec(new Runnable() { public void run() { updateLabels(); updateMilestones(); initialize(); } }); } catch (CoreException e) { throw new InvocationTargetException(e); } } }); } catch (InvocationTargetException e) { Throwable target = e.getTargetException(); if (target instanceof CoreException) { IStatus status = ((CoreException) target).getStatus(); ErrorDialog.openError(getShell(), Messages.GitHubRepositoryQueryPage_ErrorLoading, target.getLocalizedMessage(), status); } } catch (InterruptedException ignore) { // Ignore } } private void loadRepository() { boolean labelsLoaded = updateLabels(); boolean milestonesLoaded = updateMilestones(); if (!labelsLoaded || !milestonesLoaded) refreshRepository(); } /** * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#isPageComplete() */ public boolean isPageComplete() { boolean complete = super.isPageComplete(); if (complete) { String message = null; if (!openButton.getSelection() && !closedButton.getSelection()) message = Messages.GitHubRepositoryQueryPage_ErrorStatus; setErrorMessage(message); complete = message == null; } return complete; } /** * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#getQueryTitle() */ public String getQueryTitle() { return this.titleText != null ? this.titleText.getText() : null; } /** * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#applyTo(org.eclipse.mylyn.tasks.core.IRepositoryQuery) */ public void applyTo(IRepositoryQuery query) { query.setSummary(getQueryTitle()); List<String> statuses = new LinkedList<String>(); if (openButton.getSelection()) statuses.add(IssueService.STATE_OPEN); if (closedButton.getSelection()) statuses.add(IssueService.STATE_CLOSED); QueryUtils.setAttribute(IssueService.FILTER_STATE, statuses, query); String assignee = this.assigneeText.getText().trim(); if (assignee.length() > 0) query.setAttribute(IssueService.FILTER_ASSIGNEE, assignee); else query.setAttribute(IssueService.FILTER_ASSIGNEE, null); String mentions = this.mentionText.getText().trim(); if (assignee.length() > 0) query.setAttribute(IssueService.FILTER_MENTIONED, mentions); else query.setAttribute(IssueService.FILTER_MENTIONED, null); int milestoneSelected = this.milestoneCombo.getSelectionIndex() - 1; if (milestoneSelected >= 0) query.setAttribute(IssueService.FILTER_MILESTONE, Integer .toString(this.milestones.get(milestoneSelected) .getNumber())); else query.setAttribute(IssueService.FILTER_MILESTONE, null); List<String> labels = new LinkedList<String>(); for (Object label : labelsViewer.getCheckedElements()) labels.add(label.toString()); QueryUtils.setAttribute(IssueService.FILTER_LABELS, labels, query); } }

diff --git a/gui/src/main/java/com/jakeapp/gui/swing/actions/abstracts/ProjectAction.java b/gui/src/main/java/com/jakeapp/gui/swing/actions/abstracts/ProjectAction.java index 0093f386..0ebc2d75 100644 --- a/gui/src/main/java/com/jakeapp/gui/swing/actions/abstracts/ProjectAction.java +++ b/gui/src/main/java/com/jakeapp/gui/swing/actions/abstracts/ProjectAction.java @@ -1,42 +1,42 @@ package com.jakeapp.gui.swing.actions.abstracts; import com.jakeapp.core.domain.Project; import com.jakeapp.gui.swing.globals.JakeContext; import com.jakeapp.gui.swing.callbacks.ContextChanged; import com.jakeapp.gui.swing.callbacks.ProjectChanged; import com.jakeapp.gui.swing.xcore.EventCore; import java.util.EnumSet; /** * ProjectAction is an abstract action class for all project * related actions. * Implements the changed and selection interface. */ public abstract class ProjectAction extends JakeAction implements ProjectChanged, ContextChanged { //private static final Logger log = Logger.getLogger(ProjectAction.class); private Project project; public ProjectAction() { EventCore.get().addProjectChangedCallbackListener(this); EventCore.get().addContextChangedListener(this); } public Project getProject() { return JakeContext.getProject(); } public void updateAction() { - setEnabled(this.isEnabled() && JakeContext.getMsgService() != null); + setEnabled(JakeContext.getMsgService() != null); } public void projectChanged(final ProjectChangedEvent ev) { updateAction(); } public void contextChanged(EnumSet<Reason> reason, Object context) { updateAction(); } } diff --git a/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustFullUsersAction.java b/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustFullUsersAction.java index 96d47205..cbadd94e 100644 --- a/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustFullUsersAction.java +++ b/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustFullUsersAction.java @@ -1,44 +1,46 @@ package com.jakeapp.gui.swing.actions.users; import com.jakeapp.core.domain.TrustState; import com.jakeapp.gui.swing.JakeMainView; +import com.jakeapp.gui.swing.helpers.UserHelper; import com.jakeapp.gui.swing.actions.abstracts.UserAction; import org.apache.log4j.Logger; import javax.swing.*; import java.awt.event.ActionEvent; /** * The Invite people action. * Opens a Dialog that let you add people to the project. * They get an invitation and can join/refuse the project. */ public class TrustFullUsersAction extends UserAction { private static final Logger log = Logger.getLogger(TrustFullUsersAction.class); private static final TrustState actionTrustState = TrustState.AUTO_ADD_REMOVE; public TrustFullUsersAction(JList list) { super(list); String actionStr = JakeMainView.getMainView().getResourceMap(). getString("trustedAddPeoplePeopleMenuItem.text"); putValue(Action.NAME, actionStr); updateAction(); } public void actionPerformed(ActionEvent actionEvent) { log.info("Fully trust ProjectMember " + getList() + " from" + getProject()); setUserTrustState(actionTrustState); } @Override public void updateAction() { super.updateAction(); + setEnabled(this.isEnabled() && !UserHelper.isCurrentProjectMember(getSelectedUser().getUser())); // update state putValue(Action.SELECTED_KEY, checkUserStatus(actionTrustState)); } } \ No newline at end of file diff --git a/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustNoUsersAction.java b/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustNoUsersAction.java index 90030e53..2a5bf2b4 100644 --- a/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustNoUsersAction.java +++ b/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustNoUsersAction.java @@ -1,45 +1,47 @@ package com.jakeapp.gui.swing.actions.users; import com.jakeapp.core.domain.TrustState; import com.jakeapp.gui.swing.JakeMainView; +import com.jakeapp.gui.swing.helpers.UserHelper; import com.jakeapp.gui.swing.actions.abstracts.UserAction; import org.apache.log4j.Logger; import javax.swing.*; import java.awt.event.ActionEvent; /** * The Invite people action. * Opens a Dialog that let you add people to the project. * They get an invitation and can join/refuse the project. */ public class TrustNoUsersAction extends UserAction { private static final Logger log = Logger.getLogger(TrustNoUsersAction.class); private static final TrustState actionTrustState = TrustState.NO_TRUST; public TrustNoUsersAction(JList list) { super(list); String actionStr = JakeMainView.getMainView().getResourceMap(). getString("notTrustedPeopleMenuItem.text"); putValue(Action.NAME, actionStr); // update state updateAction(); } public void actionPerformed(ActionEvent actionEvent) { log.info("Don't trust ProjectMember " + getList() + " from" + getProject()); setUserTrustState(actionTrustState); } @Override public void updateAction() { super.updateAction(); + setEnabled(this.isEnabled() && !UserHelper.isCurrentProjectMember(getSelectedUser().getUser())); // update state putValue(Action.SELECTED_KEY, checkUserStatus(actionTrustState)); } } \ No newline at end of file diff --git a/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustUsersAction.java b/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustUsersAction.java index 3f1b26f7..d6ec3411 100644 --- a/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustUsersAction.java +++ b/gui/src/main/java/com/jakeapp/gui/swing/actions/users/TrustUsersAction.java @@ -1,45 +1,48 @@ package com.jakeapp.gui.swing.actions.users; import com.jakeapp.core.domain.TrustState; import com.jakeapp.gui.swing.JakeMainView; +import com.jakeapp.gui.swing.helpers.UserHelper; import com.jakeapp.gui.swing.actions.abstracts.UserAction; import org.apache.log4j.Logger; import javax.swing.*; import java.awt.event.ActionEvent; /** * The Invite people action. * Opens a Dialog that let you add people to the project. * They get an invitation and can join/refuse the project. */ +// fixme: make abstact trust user class public class TrustUsersAction extends UserAction { private static final Logger log = Logger.getLogger(TrustUsersAction.class); private static final TrustState actionTrustState = TrustState.TRUST; public TrustUsersAction(JList list) { super(list); String actionStr = JakeMainView.getMainView().getResourceMap(). getString("trustedPeopleMenuItem.text"); putValue(Action.NAME, actionStr); // update state updateAction(); } public void actionPerformed(ActionEvent actionEvent) { log.info("Trust ProjectMember " + getList() + " from" + getProject()); setUserTrustState(actionTrustState); } @Override public void updateAction() { super.updateAction(); + setEnabled(this.isEnabled() && !UserHelper.isCurrentProjectMember(getSelectedUser().getUser())); // update state putValue(Action.SELECTED_KEY, checkUserStatus(actionTrustState)); } } \ No newline at end of file diff --git a/gui/src/main/java/com/jakeapp/gui/swing/renderer/PeopleListCellRenderer.java b/gui/src/main/java/com/jakeapp/gui/swing/renderer/PeopleListCellRenderer.java index 70ae4d4a..40e91e28 100644 --- a/gui/src/main/java/com/jakeapp/gui/swing/renderer/PeopleListCellRenderer.java +++ b/gui/src/main/java/com/jakeapp/gui/swing/renderer/PeopleListCellRenderer.java @@ -1,147 +1,147 @@ package com.jakeapp.gui.swing.renderer; import com.jakeapp.core.domain.TrustState; import com.jakeapp.core.synchronization.UserInfo; import com.jakeapp.gui.swing.JakeMainApp; import com.jakeapp.gui.swing.helpers.UserHelper; import org.apache.log4j.Logger; import javax.swing.*; import java.awt.*; /** * The PeopleListCellRenderer. * Renders People info with Status Icon. */ // TODO: localize public class PeopleListCellRenderer extends DefaultListCellRenderer { private static final Logger log = Logger.getLogger(PeopleListCellRenderer.class); final static ImageIcon projectMemberIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage(JakeMainApp.class.getResource( "/icons/user-online-projectmember.png"))); // TODO: offline projectmember! final static ImageIcon onlineFullTrustIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage(JakeMainApp.class.getResource( "/icons/user-online-fulltrust.png"))); final static ImageIcon onlineTrustIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage( JakeMainApp.class.getResource("/icons/user-online-trust.png"))); final static ImageIcon onlineNoTrustIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage( JakeMainApp.class.getResource("/icons/user-online-notrust.png"))); final static ImageIcon offlineFullTrustIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage(JakeMainApp.class.getResource( "/icons/user-offline-fulltrust.png"))); final static ImageIcon offlineTrustIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage( JakeMainApp.class.getResource("/icons/user-offline-trust.png"))); final static ImageIcon offlineNoTrustIcon = new ImageIcon( Toolkit.getDefaultToolkit().getImage( JakeMainApp.class.getResource("/icons/user-offline-notrust.png"))); /* This is the only method defined by ListCellRenderer. We just * reconfigure the Jlabel each time we're called. */ @Override public Component getListCellRendererComponent(JList list, Object value, // value to display int index, // cell index boolean iss, // is the cell selected boolean chf) // the list and the cell have the focus { UserInfo user = (UserInfo) value; boolean isYou = UserHelper.isCurrentProjectMember(user.getUser()); - String nickOrFullName = UserHelper.getNickOrFullName(user); + String nickOrFullName = UserHelper.cleanUserId(UserHelper.getNickOrFullName(user)); // change color on selection String subColor = iss ? "White" : "Gray"; String shortStatusStr; shortStatusStr = user.getUser().getUserId(); String valStr; if (!isYou) { valStr = String.format("<html><b>%s</b><br><font color=%s>%s</font></html>", nickOrFullName, subColor, shortStatusStr); } else { // TODO: localize! valStr = String.format("<html><b>You</b><br><font color=%s>%s</font></html>", subColor, shortStatusStr); } /* The DefaultListCellRenderer class will take care of * the JLabels text property, it's foreground and background * colors, and so on. */ super.getListCellRendererComponent(list, valStr, index, iss, chf); TrustState memberTrust = user.getTrust(); if (memberTrust == null) { log.warn("Received NULL member trust from " + user); memberTrust = TrustState.NO_TRUST; } if (user.isOnline()) { switch (memberTrust) { case AUTO_ADD_REMOVE: { setIcon(onlineFullTrustIcon); } break; case TRUST: { setIcon(onlineTrustIcon); } break; case NO_TRUST: { setIcon(onlineNoTrustIcon); } } } else { switch (memberTrust) { case AUTO_ADD_REMOVE: { setIcon(offlineFullTrustIcon); } break; case TRUST: { setIcon(offlineTrustIcon); } break; case NO_TRUST: { setIcon(offlineNoTrustIcon); } } } // override icon for own project user if (isYou) { setIcon(projectMemberIcon); } String statusStr = (user.isOnline()) ? "Online" : "Offline"; statusStr += ", "; // TODO: localize + change labels switch (memberTrust) { case AUTO_ADD_REMOVE: { statusStr += "Trusted + Trusting new users"; } break; case TRUST: { statusStr += "Trusted"; } break; case NO_TRUST: { statusStr += "Not Trusted"; } } setToolTipText(String.format("<html><b>%s %s</b><br><b>'%s'</b><br>%s</html>", user.getFirstName(), user.getLastName(), user.getNickName(), statusStr)); return this; } }

diff --git a/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java b/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java index 1db272514..13226d485 100644 --- a/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java +++ b/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java @@ -1,317 +1,326 @@ // Copyright (2006-2007) Schibsted Søk AS /* * * Created on March 7, 2006, 1:01 PM * */ package no.schibstedsok.searchportal.mode.command; import java.util.regex.Matcher; import java.util.regex.Pattern; import no.schibstedsok.searchportal.query.AndClause; import no.schibstedsok.searchportal.query.DefaultOperatorClause; import no.schibstedsok.searchportal.query.OrClause; import no.schibstedsok.searchportal.result.SearchResult; import no.schibstedsok.searchportal.result.SearchResultItem; import no.schibstedsok.searchportal.datamodel.DataModel; import no.schibstedsok.searchportal.mode.command.AbstractSearchCommand.ReconstructedQuery; import no.schibstedsok.searchportal.mode.config.CatalogueAdsSearchConfiguration; import no.schibstedsok.searchportal.query.AndNotClause; import no.schibstedsok.searchportal.query.NotClause; import no.schibstedsok.searchportal.query.OperationClause; import org.apache.log4j.Logger; /** * Search command builds, executes and filters search result for * sponsed links in catalogue website. * * Executes two different queries, and compares them to summarize one * search result that is presented in the frontend. * * @version $Revision:$ * @author [email protected] */ public class CatalogueAdsSearchCommand extends AdvancedFastSearchCommand { /** Logger for this class. */ private static final Logger LOG = Logger.getLogger(CatalogueAdsSearchCommand.class); /** String that hold the original untransformed query supplied by the user. */ private String originalQuery; /** * String that hold the geographic part of the query, supplied in the * where field in the frontend. */ private String queryGeoString = null; /** * Two different queries are executed by this command each time the command is * executed. */ private enum QueryType { GEO, // include user supplied geographic in query INGENSTEDS // use "ingensteds" as geographic in query. } /** The query type to run. */ private QueryType whichQueryToRun; /** Constant for no defined geographic location. */ private final static String DOMESTIC_SEARCH = "ingensteds"; /** * Creates a new instance of CatalogueAdsSearchCommand. * * @param cxt Search command context. * @param parameters Search command parameters. */ public CatalogueAdsSearchCommand(final Context cxt) { super(cxt); final CatalogueAdsSearchConfiguration conf = (CatalogueAdsSearchConfiguration) cxt .getSearchConfiguration(); final String whereParameter = conf.getQueryParameterWhere(); /** * Use the geographic parameters in "where" if supplied by user. * If user hasent supplied any geographic, use "ingensteds" instead. */ if (getSingleParameter(whereParameter) != null && getSingleParameter(whereParameter).length() > 0) { final ReconstructedQuery queryGeo = createQuery(getSingleParameter(whereParameter)); - queryGeoString = queryGeo.getQuery().getQueryString(); + queryGeoString = queryGeo.getQuery().getQueryString().replaceAll("\\W", "").toLowerCase(); } else { queryGeoString = DOMESTIC_SEARCH; - } + } + + + originalQuery = super.getTransformedQuery().replaceAll("\\W", "").toLowerCase(); } /** * Execute search command. * * Run first query, which fetch all sponsorlinks * for a given geographic place. * * If there was 5 sponsor links found in first * search result, exit and return them from method. * * If there was less than 5 sponsor links from a * specific geographic place, we could add sponsor * links that does not have any specific geographic. * * Check where the search results from the first query * were located in the list, index 1 to 5 and add them to * the right spot. * * Run second query, which fetch all sponsod links * for a given set of keywords, without geographic. * * Check where the search results from the second query * were located in the list, index 1 to 5 and add them to * the right spot if still available (the spot is still NULL) * * Reverse result list, * index 5, is the most valued spot, and should be presented first in list. * index 1, is the least valued spot, and is presented last in list. * * @see no.schibstedsok.searchportal.mode.command.AbstractSimpleFastSearchCommand#execute */ @Override public SearchResult execute() { /** * search result from first query, this will be reused and returned * out from this method, with processed search result if needed. */ SearchResult firstQueryResult = null; SearchResult secondQueryResult = null; // if the query type is domestic, then we dont need to run more than // the domestic search and return the results the way they were returned // by Fast. if(queryGeoString.equals(DOMESTIC_SEARCH)){ whichQueryToRun = QueryType.INGENSTEDS; firstQueryResult = super.execute(); return firstQueryResult; } whichQueryToRun = QueryType.GEO; firstQueryResult = super.execute(); LOG.info("Found "+firstQueryResult.getHitCount()+" sponsed links"); if (firstQueryResult.getHitCount() < 5) { // Build the search result to return from this method // during processing in this array. final SearchResultItem[] searchResults = new SearchResultItem[5]; for (SearchResultItem item : firstQueryResult.getResults()) { - - Pattern p = Pattern.compile("^" + originalQuery - + queryGeoString+".*|.*;" + originalQuery + queryGeoString+".*"); + + Pattern p = Pattern.compile("(^|;)"+originalQuery+queryGeoString+"(;|$)"); int i = 0; boolean found = false; for(; i < 5 ; i++){ if(item.getField("iypspkeywords"+(i+1))!=null){ Matcher m = p.matcher(item.getField("iypspkeywords"+(i+1)).trim().toLowerCase()); - found = m.matches(); + found = m.find(); if(found){ break; } } } if(found){ searchResults[i] = item; LOG.info("Fant sponsortreff for plass " + (i+1) + ", " + item.getField("iypspkeywords"+(i+1))); }else{ - LOG.error("Fant IKKE sponsortreff, det er ikke mulig, " + item); + LOG.error("Fant IKKE sponsortreff, det er ikke mulig."); + LOG.error("iypspkeywords5:"+item.getField("iypspkeywords5").trim().toLowerCase()+"\n" + + "iypspkeywords4:"+item.getField("iypspkeywords4").trim().toLowerCase()+"\n" + + "iypspkeywords3:"+item.getField("iypspkeywords3").trim().toLowerCase()+"\n" + + "iypspkeywords2:"+item.getField("iypspkeywords2").trim().toLowerCase()+"\n" + + "iypspkeywords1:"+item.getField("iypspkeywords1").trim().toLowerCase()); + LOG.error("Pattern was: "+ p.pattern()); + + throw new IllegalStateException("Missing sponsor link in resultset, " + + "it was returned from qserver but not found by code."); } } // run second query, which fetch all sponsorlinks // for a given set of keywords, without geographic. whichQueryToRun = QueryType.INGENSTEDS; performQueryTransformation(); secondQueryResult = super.execute(); for (SearchResultItem item : secondQueryResult.getResults()) { - Pattern p = Pattern.compile("^" + originalQuery - + DOMESTIC_SEARCH+".*|.*;" + originalQuery + DOMESTIC_SEARCH+".*"); + Pattern p = Pattern.compile("(^|;)"+originalQuery+DOMESTIC_SEARCH+"(;|$)"); int i = 0; boolean found = false; for(; i < 5 ; i++){ if(item.getField("iypspkeywords"+(i+1))!=null){ Matcher m = p.matcher(item.getField("iypspkeywords"+(i+1)).trim().toLowerCase()); - found = m.matches(); + found = m.find(); if(found) break; } } if(found && searchResults[i]==null){ searchResults[i]=item; LOG.info("Fant sponsortreff for plass " + (i+1) + ", " + item.getField("iypspkeywords"+(i+1))); } } // end for firstQueryResult.getResults().clear(); LOG.info("Cleared original result."); for(SearchResultItem item:searchResults){ if(item!=null){ firstQueryResult.addResult(item); LOG.info("Added item "+item.getField("iypcompanyid")); } } firstQueryResult.setHitCount(firstQueryResult.getResults().size()); java.util.Collections.reverse(firstQueryResult.getResults()); } return firstQueryResult; } /** * Create query for search command. * Based on whichQueryToRun, creates query with user supplied geographic * or query with geograhic set to "ingensteds". * * @see no.schibstedsok.searchportal.mode.command.AbstractSearchCommand#getTransformedQuery */ @Override public String getTransformedQuery() { - originalQuery = super.getTransformedQuery().replaceAll(" ", "").replace("\"","").toLowerCase(); String query = null; String completeQuery = null; if (whichQueryToRun == QueryType.GEO) { query = super.getTransformedQuery().replaceAll(" ", "").replace("\"","") + queryGeoString.replaceAll(" ", ""); } else { query = super.getTransformedQuery().replaceAll(" ", "").replace("\"","") + DOMESTIC_SEARCH; } completeQuery = "iypcfspkeywords5:" + query + " OR iypcfspkeywords4:" + query + " OR iypcfspkeywords3:" + query + " OR iypcfspkeywords2:" + query + " OR iypcfspkeywords1:" + query; return completeQuery; } /** * Overriden methods below, because we dont want to output any FQL * syntax in our query, we just want them to return the terms * in one line with spaces between. */ /** * @see no.schibstedsok.searchportal.mode.command.AbstractAdvancedFastSearchCommand */ @Override protected void visitImpl(AndClause clause) { clause.getFirstClause().accept(this); clause.getSecondClause().accept(this); } /** * @see no.schibstedsok.searchportal.mode.command.AbstractAdvancedFastSearchCommand */ @Override protected void visitImpl(AndNotClause clause) { clause.getFirstClause().accept(this); } /** * @see no.schibstedsok.searchportal.mode.command.AbstractAdvancedFastSearchCommand */ @Override protected void visitImpl(DefaultOperatorClause clause) { clause.getFirstClause().accept(this); clause.getSecondClause().accept(this); } /** * @see no.schibstedsok.searchportal.mode.command.AbstractAdvancedFastSearchCommand */ @Override protected void visitImpl(NotClause clause) { clause.getFirstClause().accept(this); } /** * @see no.schibstedsok.searchportal.mode.command.AbstractAdvancedFastSearchCommand */ @Override protected void visitImpl(OperationClause clause) { clause.getFirstClause().accept(this); } /** * @see no.schibstedsok.searchportal.mode.command.AbstractAdvancedFastSearchCommand */ @Override protected void visitImpl(OrClause clause) { clause.getFirstClause().accept(this); clause.getSecondClause().accept(this); } }

diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/internal/ui/XMLEditorActionDefinitionIds.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/internal/ui/XMLEditorActionDefinitionIds.java index 391183654..a05192e60 100644 --- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/internal/ui/XMLEditorActionDefinitionIds.java +++ b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/internal/ui/XMLEditorActionDefinitionIds.java @@ -1,30 +1,32 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.wst.xml.internal.ui; /** * Defines the definitions ids for the XML editor actions. + * + * @deprecated Use org.eclipse.wst.sse.ui.edit.util.ActionDefinitionIds instead */ public interface XMLEditorActionDefinitionIds { public final static String CLEANUP_DOCUMENT = "org.eclipse.wst.sse.ui.edit.ui.cleanup.document";//$NON-NLS-1$ public final static String FORMAT_DOCUMENT = "org.eclipse.wst.sse.ui.edit.ui.format.document";//$NON-NLS-1$ public final static String FORMAT_ACTIVE_ELEMENTS = "org.eclipse.wst.sse.ui.edit.ui.format.active.elements";//$NON-NLS-1$ public final static String OPEN_FILE = "org.eclipse.wst.sse.ui.edit.ui.open.file.from.source";//$NON-NLS-1$ // public final static String INFORMATION = // "org.eclipse.wst.sse.ui.edit.ui.show.tooltip.information";//$NON-NLS-1$ public final static String INFORMATION = "org.eclipse.jdt.ui.edit.text.java.show.javadoc";//$NON-NLS-1$ public final static String ADD_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.add.breakpoints";//$NON-NLS-1$ public final static String MANAGE_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.manage.breakpoints";//$NON-NLS-1$ public final static String ENABLE_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.enable.breakpoints";//$NON-NLS-1$ public final static String DISABLE_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.disable.breakpoints";//$NON-NLS-1$ } \ No newline at end of file

diff --git a/query-core/src/test/java/test/dataportal/controllers/JPADownloadControllerTest.java b/query-core/src/test/java/test/dataportal/controllers/JPADownloadControllerTest.java index fb17b45..54cecc2 100644 --- a/query-core/src/test/java/test/dataportal/controllers/JPADownloadControllerTest.java +++ b/query-core/src/test/java/test/dataportal/controllers/JPADownloadControllerTest.java @@ -1,145 +1,145 @@ /** * */ package test.dataportal.controllers; import java.util.ArrayList; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; import org.dataportal.controllers.JPADownloadController; import org.dataportal.model.Download; import org.dataportal.model.DownloadItem; import org.dataportal.model.User; import org.dataportal.utils.Utils; import junit.framework.TestCase; /** * @author Micho Garcia * */ public class JPADownloadControllerTest extends TestCase { private JPADownloadController controladorDescarga; private User user = null; /* * (non-Javadoc) * * @see junit.framework.TestCase#setUp() */ protected void setUp() throws Exception { super.setUp(); controladorDescarga = new JPADownloadController(); user = (User) exits("micho.garcia", User.class); } /** * Check if object exits into RDBMS and returns * * @param object * ID * @return object record or null */ @SuppressWarnings("unchecked") private Object exits(String id, Class clase) { EntityManager manager = getEntityManager(); Object objeto = manager.find(clase, id); manager.close(); if (objeto != null) return objeto; else return null; } /** * Create an EntityManager */ public EntityManager getEntityManager() { EntityManagerFactory factoria = Persistence .createEntityManagerFactory("dataportal"); EntityManager manager = factoria.createEntityManager(); return manager; } /** * Test method for * {@link org.dataportal.controllers.JPADownloadController#insert(Download)} * . */ public void testInsert() { String idDownload = "10.4324/4234"; Download download = new Download(idDownload, "micho.garcia_20110509.zip", Utils.extractDateSystemTimeStamp(), user); boolean insertado = controladorDescarga.insert(download); try { - Thread.sleep(3000); + Thread.sleep(9000); } catch (InterruptedException e) { e.printStackTrace(); } Download downloadInsertada = controladorDescarga.exits(download); boolean insertada = false; if (downloadInsertada != null) insertada = true; assertTrue(insertado); assertTrue(insertada); } /** * Test method for * {@link org.dataportal.controllers.JPADownloadController#insert(Download)} * . */ public void testInsertItems() { String idDownload = "10.4324/4235"; Download download = new Download(idDownload, "micho.garcia_20110509.zip", Utils.extractDateSystemTimeStamp(), user); ArrayList<DownloadItem> items = new ArrayList<DownloadItem>(); DownloadItem item1 = new DownloadItem("un nombre de archivo"); items.add(item1); DownloadItem item2 = new DownloadItem("otro nombre de un archivo"); items.add(item2); DownloadItem item3 = new DownloadItem("el ultimo nombre de archivo"); items.add(item3); boolean insertado = controladorDescarga.insertItems(download, items); assertTrue(insertado); Download insertada = (Download) exits(idDownload, Download.class); assertNotSame(insertada, null); controladorDescarga.delete(insertada); insertada = (Download) exits(idDownload, Download.class); assertEquals(insertada, null); } /** * Test method for * {@link org.dataportal.controllers.JPADownloadController#delete(Download)} * . */ public void testDelete() { Download download = new Download("10.4324/4234"); Download downloadToRemove = controladorDescarga.exits(download); boolean borrada = false; if (downloadToRemove != null) borrada = true; controladorDescarga.delete(downloadToRemove); downloadToRemove = controladorDescarga.exits(download); assertTrue(borrada); assertEquals(downloadToRemove, null); } }

diff --git a/jmock2/src/org/jmock/internal/InvocationExpectation.java b/jmock2/src/org/jmock/internal/InvocationExpectation.java index bc03251e..ee3759fc 100644 --- a/jmock2/src/org/jmock/internal/InvocationExpectation.java +++ b/jmock2/src/org/jmock/internal/InvocationExpectation.java @@ -1,180 +1,180 @@ package org.jmock.internal; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.core.IsAnything; import org.jmock.api.Action; import org.jmock.api.Expectation; import org.jmock.api.Invocation; import org.jmock.internal.matcher.MethodMatcher; import org.jmock.lib.action.VoidAction; /** * An expectation of zero or more matching invocations. * * @author npryce * @author smgf */ public class InvocationExpectation implements Expectation { private static ParametersMatcher ANY_PARAMETERS = new AnyParametersMatcher(); private Cardinality cardinality = Cardinality.ALLOWING; private Matcher<?> objectMatcher = IsAnything.anything(); private Matcher<? super Method> methodMatcher = IsAnything.anything("<any method>"); private boolean methodIsKnownToBeVoid = false; private ParametersMatcher parametersMatcher = ANY_PARAMETERS; private Action action = new VoidAction(); private boolean actionIsDefault = true; private List<OrderingConstraint> orderingConstraints = new ArrayList<OrderingConstraint>(); private List<SideEffect> sideEffects = new ArrayList<SideEffect>(); private int invocationCount = 0; public void setCardinality(Cardinality cardinality) { this.cardinality = cardinality; } public void setObjectMatcher(Matcher<?> objectMatcher) { this.objectMatcher = objectMatcher; } public void setMethod(Method method) { this.methodMatcher = new MethodMatcher(method); this.methodIsKnownToBeVoid = method.getReturnType() == void.class; } public void setMethodMatcher(Matcher<? super Method> matcher) { this.methodMatcher = matcher; this.methodIsKnownToBeVoid = false; } public void setParametersMatcher(ParametersMatcher parametersMatcher) { this.parametersMatcher = parametersMatcher; } public void addOrderingConstraint(OrderingConstraint orderingConstraint) { orderingConstraints.add(orderingConstraint); } public void addSideEffect(SideEffect sideEffect) { sideEffects.add(sideEffect); } public void setAction(Action action) { this.action = action; this.actionIsDefault = false; } public void setDefaultAction(Action action) { this.action = action; this.actionIsDefault = true; } public void describeTo(Description description) { if (! isSatisfied()) { - description.appendText("> "); + description.appendText("! "); } describeMethod(description); parametersMatcher.describeTo(description); describeSideEffects(description); } public void describeMismatch(Invocation invocation, Description description) { describeMethod(description); final Object[] parameters = invocation.getParametersAsArray(); parametersMatcher.describeTo(description); if (parametersMatcher.isCompatibleWith(parameters)) { parametersMatcher.describeMismatch(parameters, description); } describeSideEffects(description); } private void describeMethod(Description description) { cardinality.describeTo(description); description.appendText(", "); if (invocationCount == 0) { description.appendText("never invoked"); } else { description.appendText("already invoked "); description.appendText(Formatting.times(invocationCount)); } description.appendText(": "); objectMatcher.describeTo(description); description.appendText("."); methodMatcher.describeTo(description); } private void describeSideEffects(Description description) { for (OrderingConstraint orderingConstraint : orderingConstraints) { description.appendText("; "); orderingConstraint.describeTo(description); } if (!shouldSuppressActionDescription()) { description.appendText("; "); action.describeTo(description); } for (SideEffect sideEffect : sideEffects) { description.appendText("; "); sideEffect.describeTo(description); } } private boolean shouldSuppressActionDescription() { return methodIsKnownToBeVoid && actionIsDefault; } public boolean isSatisfied() { return cardinality.isSatisfied(invocationCount); } public boolean allowsMoreInvocations() { return cardinality.allowsMoreInvocations(invocationCount); } public boolean matches(Invocation invocation) { return allowsMoreInvocations() && objectMatcher.matches(invocation.getInvokedObject()) && methodMatcher.matches(invocation.getInvokedMethod()) && parametersMatcher.matches(invocation.getParametersAsArray()) && isInCorrectOrder(); } private boolean isInCorrectOrder() { for (OrderingConstraint constraint : orderingConstraints) { if (!constraint.allowsInvocationNow()) return false; } return true; } public Object invoke(Invocation invocation) throws Throwable { invocationCount++; performSideEffects(); final Object result = action.invoke(invocation); invocation.checkReturnTypeCompatibility(result); return result; } private void performSideEffects() { for (SideEffect sideEffect : sideEffects) { sideEffect.perform(); } } private static class AnyParametersMatcher extends IsAnything<Object[]> implements ParametersMatcher { public AnyParametersMatcher() { super("(<any parameters>)"); } public boolean isCompatibleWith(Object[] parameters) { return true; } }; }

diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java index 160ecc01d..b612cdf3a 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java @@ -1,207 +1,207 @@ /** * * Copyright (C) 2009 Adrian Cole <[email protected]> * * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you 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 org.jclouds.aws.s3.commands; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import org.jclouds.aws.s3.S3IntegrationTest; import static org.jclouds.aws.s3.commands.options.CopyObjectOptions.Builder.*; import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.domain.acl.CannedAccessPolicy; import org.jclouds.aws.s3.reference.S3Headers; import org.jclouds.aws.s3.util.S3Utils; import org.jclouds.http.HttpResponseException; import org.joda.time.DateTime; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; import java.io.IOException; import java.net.URL; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; /** * Tests integrated functionality of all copyObject commands. * <p/> * Each test uses a different bucket name, so it should be perfectly fine to run * in parallel. * * @author Adrian Cole */ @Test(testName = "s3.CopyObjectIntegrationTest") public class CopyObjectIntegrationTest extends S3IntegrationTest { String sourceKey = "apples"; String destinationKey = "pears"; @Test(groups = {"integration","live"}) void testCopyObject() throws Exception { String destinationBucket = bucketName + "dest"; addToBucketAndValidate(bucketName, sourceKey); createBucketAndEnsureEmpty(destinationBucket); client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey).get(10, TimeUnit.SECONDS); validateContent(destinationBucket, destinationKey); } private void addToBucketAndValidate(String bucketName, String sourceKey) throws InterruptedException, ExecutionException, TimeoutException, IOException { addObjectToBucket(bucketName, sourceKey); validateContent(bucketName, sourceKey); } - @Test(groups = {"integration","live"}) + @Test(enabled= false, groups = {"integration","live"})//TODO: fails on linux and windows void testCopyIfModifiedSince() throws InterruptedException, ExecutionException, TimeoutException, IOException { String destinationBucket = bucketName + "dest"; DateTime before = new DateTime(); addToBucketAndValidate(bucketName, sourceKey); DateTime after = new DateTime().plusSeconds(1); createBucketAndEnsureEmpty(destinationBucket); client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceModifiedSince(before)).get(10, TimeUnit.SECONDS); validateContent(destinationBucket, destinationKey); try { client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceModifiedSince(after)).get(10, TimeUnit.SECONDS); } catch (ExecutionException e) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 412); } } - @Test(groups = {"integration","live"}) + @Test(enabled= false, groups = {"integration","live"})//TODO: fails on linux and windows void testCopyIfUnmodifiedSince() throws InterruptedException, ExecutionException, TimeoutException, IOException { String destinationBucket = bucketName + "dest"; DateTime before = new DateTime(); addToBucketAndValidate(bucketName, sourceKey); DateTime after = new DateTime().plusSeconds(1); createBucketAndEnsureEmpty(destinationBucket); client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceUnmodifiedSince(after)).get(10, TimeUnit.SECONDS); validateContent(destinationBucket, destinationKey); try { client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceModifiedSince(before)).get(10, TimeUnit.SECONDS); } catch (ExecutionException e) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 412); } } @Test(groups = {"integration","live"}) void testCopyIfMatch() throws InterruptedException, ExecutionException, TimeoutException, IOException { String destinationBucket = bucketName + "dest"; addToBucketAndValidate(bucketName, sourceKey); createBucketAndEnsureEmpty(destinationBucket); client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceMd5Matches(goodMd5)).get(10, TimeUnit.SECONDS); validateContent(destinationBucket, destinationKey); try { client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceMd5Matches(badMd5)).get(10, TimeUnit.SECONDS); } catch (ExecutionException e) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 412); } } @Test(groups = {"integration","live"}) void testCopyIfNoneMatch() throws IOException, InterruptedException, ExecutionException, TimeoutException { String destinationBucket = bucketName + "dest"; addToBucketAndValidate(bucketName, sourceKey); createBucketAndEnsureEmpty(destinationBucket); client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceMd5DoesntMatch(badMd5)).get(10, TimeUnit.SECONDS); validateContent(destinationBucket, destinationKey); try { client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, ifSourceMd5DoesntMatch(goodMd5)).get(10, TimeUnit.SECONDS); } catch (ExecutionException e) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 412); } } @Test(groups = {"integration","live"}) void testCopyWithMetadata() throws InterruptedException, ExecutionException, TimeoutException, IOException { String destinationBucket = bucketName + "dest"; addToBucketAndValidate(bucketName, sourceKey); Multimap<String, String> metadata = HashMultimap.create(); metadata.put(S3Headers.USER_METADATA_PREFIX + "adrian", "cole"); createBucketAndEnsureEmpty(destinationBucket); client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, overrideMetadataWith(metadata)).get(10, TimeUnit.SECONDS); validateContent(destinationBucket, destinationKey); S3Object.Metadata objectMeta = client.headObject(destinationBucket, destinationKey).get(10, TimeUnit.SECONDS); assertEquals(objectMeta.getUserMetadata(), metadata); } } \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java index 8ecc00bf4..54dbda887 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java @@ -1,231 +1,231 @@ /** * * Copyright (C) 2009 Adrian Cole <[email protected]> * * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you 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 org.jclouds.aws.s3.commands; import org.jclouds.aws.s3.S3IntegrationTest; import org.jclouds.aws.s3.S3ResponseException; import static org.jclouds.aws.s3.commands.options.GetObjectOptions.Builder.*; import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.util.S3Utils; import org.jclouds.http.HttpResponseException; import org.joda.time.DateTime; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; import java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; /** * Tests integrated functionality of all GetObject commands. * <p/> * Each test uses a different bucket name, so it should be perfectly fine to run * in parallel. * * @author Adrian Cole */ @Test(groups = {"integration", "live"}, testName = "s3.GetObjectIntegrationTest") public class GetObjectIntegrationTest extends S3IntegrationTest { - @Test + @Test(enabled=false )//TODO: fails on linux and windows void testGetIfModifiedSince() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; DateTime before = new DateTime(); addObjectAndValidateContent(bucketName, key); DateTime after = new DateTime().plusSeconds(1); client.getObject(bucketName, key, ifModifiedSince(before)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); try { client.getObject(bucketName, key, ifModifiedSince(after)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); } catch (ExecutionException e) { if (e.getCause() instanceof HttpResponseException) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 304); } else { throw e; } } } - @Test + @Test(enabled=false )//TODO: fails on linux and windows void testGetIfUnmodifiedSince() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; DateTime before = new DateTime(); addObjectAndValidateContent(bucketName, key); DateTime after = new DateTime().plusSeconds(1); client.getObject(bucketName, key, ifUnmodifiedSince(after)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); try { client.getObject(bucketName, key, ifUnmodifiedSince(before)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); } catch (ExecutionException e) { if (e.getCause() instanceof HttpResponseException) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 412); } else { throw e; } } } @Test void testGetIfMatch() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; addObjectAndValidateContent(bucketName, key); client.getObject(bucketName, key, ifMd5Matches(goodMd5)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); try { client.getObject(bucketName, key, ifMd5Matches(badMd5)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); } catch (ExecutionException e) { if (e.getCause() instanceof HttpResponseException) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 412); } else { throw e; } } } @Test void testGetIfNoneMatch() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; addObjectAndValidateContent(bucketName, key); client.getObject(bucketName, key, ifMd5DoesntMatch(badMd5)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); try { client.getObject(bucketName, key, ifMd5DoesntMatch(goodMd5)).get(10, TimeUnit.SECONDS); validateContent(bucketName, key); } catch (ExecutionException e) { if (e.getCause() instanceof HttpResponseException) { HttpResponseException ex = (HttpResponseException) e.getCause(); assertEquals(ex.getResponse().getStatusCode(), 304); } else { throw e; } } } @Test void testGetRange() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; addObjectAndValidateContent(bucketName, key); S3Object object1 = client.getObject(bucketName, key, range(0, 5)).get(10, TimeUnit.SECONDS); assertEquals(S3Utils.getContentAsStringAndClose(object1), TEST_STRING .substring(0, 6)); S3Object object2 = client.getObject(bucketName, key, range(6, TEST_STRING.length())).get(10, TimeUnit.SECONDS); assertEquals(S3Utils.getContentAsStringAndClose(object2), TEST_STRING .substring(6, TEST_STRING.length())); } @Test void testGetTwoRanges() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; addObjectAndValidateContent(bucketName, key); S3Object object = client.getObject(bucketName, key, range(0, 5).range(6, TEST_STRING.length())).get(10, TimeUnit.SECONDS); assertEquals(S3Utils.getContentAsStringAndClose(object), TEST_STRING); } @Test void testGetTail() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; addObjectAndValidateContent(bucketName, key); S3Object object = client.getObject(bucketName, key, tail(5)).get(10, TimeUnit.SECONDS); assertEquals(S3Utils.getContentAsStringAndClose(object), TEST_STRING .substring(TEST_STRING.length() - 5)); assertEquals(object.getContentLength(), 5); assertEquals(object.getMetadata().getSize(), TEST_STRING.length()); } @Test void testGetStartAt() throws InterruptedException, ExecutionException, TimeoutException, IOException { String key = "apples"; addObjectAndValidateContent(bucketName, key); S3Object object = client.getObject(bucketName, key, startAt(5)).get(10, TimeUnit.SECONDS); assertEquals(S3Utils.getContentAsStringAndClose(object), TEST_STRING .substring(5, TEST_STRING.length())); assertEquals(object.getContentLength(), TEST_STRING.length() - 5); assertEquals(object.getMetadata().getSize(), TEST_STRING.length()); } private void addObjectAndValidateContent(String sourcebucketName, String sourceKey) throws InterruptedException, ExecutionException, TimeoutException, IOException { addObjectToBucket(sourcebucketName, sourceKey); validateContent(sourcebucketName, sourceKey); } } \ No newline at end of file

diff --git a/NoteBook.java b/NoteBook.java index 8ec1b83..e48bd50 100644 --- a/NoteBook.java +++ b/NoteBook.java @@ -1,443 +1,444 @@ // Copyright (c) 2011 Martin Ueding <[email protected]> import java.awt.Dimension; import java.awt.event.ActionListener; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.text.Collator; import java.util.Arrays; import java.util.Comparator; import java.util.InvalidPropertiesFormatException; import java.util.LinkedList; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.swing.JOptionPane; /** * A container for several NoteSheet. * * The NoteBook contains at least one NoteSheet and adds new sheets whenever * the forward() function is called. The whole NoteBook can be saved into * individual pictures. * * @author Martin Ueding <[email protected]> */ public class NoteBook { /** * A List with all the NoteSheet this NoteBook contains, */ private LinkedList<NoteSheet> sheets; /** * The currently opened page. */ private int currentSheet = 0; /** * The folder which contains the NoteSheet. */ private File folder; /** * The currently opened page -- actual object. */ private NoteSheet current; /** * Size of the individual NoteSheet. */ private Dimension noteSize; /** * Listener that needs to be notified after the current sheet is changed. */ private ActionListener doneDrawing; /** * Count of pages. Latest page number is pagecount. */ private int pagecount = 1; /** * How many images to cache back and front. */ private int cacheWidth = 10; /** * The name of the NoteBook. This is also used as a prefix for the file * names. */ private String name; public NoteBook() { sheets = new LinkedList<NoteSheet>(); } /** * Creates an empty note book with a single note sheet. * * @param noteSize size of the NoteSheet within the NoteBook * @param folder place to store images * @param name name of the NoteBook */ public NoteBook(Dimension noteSize, File folder, String name) { this(); this.noteSize = noteSize; this.folder = folder; this.name = name; // if a NoteBook should be used if (folder != null && name != null) { loadImagesFromFolder(); } // add an empty sheet if the NoteBook would be empty otherwise if (sheets.size() == 0) { sheets.add(new NoteSheet(noteSize, pagecount, generateNextFilename(pagecount))); pagecount++; } updateCurrrentItem(); } private void loadImagesFromFolder() { if (!folder.exists()) { folder.mkdirs(); } // try to load all images that match the name File[] allImages = folder.listFiles(new NoteSheetFileFilter(name)); if (allImages != null && allImages.length > 0) { Arrays.sort(allImages, new Comparator<File>() { private Collator c = Collator.getInstance(); public int compare(File o1, File o2) { if (o1 == o2) { return 0; } File f1 = (File) o1; File f2 = (File) o2; if (f1.isDirectory() && f2.isFile()) { return -1; } if (f1.isFile() && f2.isDirectory()) { return 1; } return c.compare(f1.getName(), f2.getName()); } }); Pattern p = Pattern.compile("\\D+-(\\d+)\\.png"); for (File file : allImages) { String[] nameparts = file.getName().split(Pattern.quote(File.separator)); String basename = nameparts[nameparts.length-1]; Matcher m = p.matcher(basename); if (m.matches()) { pagecount = Math.max(pagecount, Integer.parseInt(m.group(1))); sheets.add(new NoteSheet(noteSize, Integer.parseInt(m.group(1)), file)); } } pagecount++; } } /** * Draws a line onto the current sheet. */ public void drawLine(int x, int y, int x2, int y2) { current.drawLine(x, y, x2, y2); fireDoneDrawing(); } /** * Flip the pages forward. It creates a new page if needed. If the current * page is a blank page, no new blank page will be added. */ public void goForward() { if (sheets.size() > currentSheet + 1) { currentSheet++; } else if (current.touched()) { sheets.add(new NoteSheet(noteSize, pagecount, generateNextFilename(pagecount))); currentSheet++; pagecount++; } else { return; } if (currentSheet >= cacheWidth) { sheets.get(currentSheet - cacheWidth).saveToFile(); } updateCurrrentItem(); fireDoneDrawing(); } /** * @return The number of pages given out so far. */ public int getPagecount() { return pagecount; } /** * Goes back one sheet. */ public void goBackwards() { if (currentSheet > 0) { if (currentSheet + cacheWidth < sheets.size()) { sheets.get(currentSheet + cacheWidth).saveToFile(); } currentSheet--; updateCurrrentItem(); fireDoneDrawing(); } } /** * Persists the whole NoteBook into individual files. */ public void saveToFiles() { for (NoteSheet s : sheets) { s.saveToFile(); } quitWithWriteoutThread(); } /** * Returns a string representation of the NoteBook, consisting of the name * and pagecount. */ public String toString() { return String.format("%s (%d)", name, getSheetCount()); } /** * Sets an action listener to be called when something new was drawn. * * @param doneDrawing ActionListener to be called after drawing a new line. */ public void setDoneDrawing(ActionListener doneDrawing) { this.doneDrawing = doneDrawing; } /** * Gets the NoteSheet object which the currently open page of the NoteBook. * * @return current NoteSheet */ public NoteSheet getCurrentSheet() { return sheets.get(currentSheet); } /** * @return number of sheets in the NoteBook */ public int getSheetCount() { if (sheets != null) { return sheets.size(); } else { return 0; } } /** * Goes to the first page in the NoteBook. */ public void gotoFirst() { currentSheet = 0; updateCurrrentItem(); fireDoneDrawing(); } /** * Goes to the last page in the NoteBook. */ public void gotoLast() { currentSheet = sheets.size() - 1; updateCurrrentItem(); fireDoneDrawing(); } /** * Returns the name of the NoteBook. * * @return the name */ public String getName() { return name; } /** * Tell the listener (the DrawPanel) that the NoteBook has changed and * needs to be redrawn. */ private void fireDoneDrawing() { if (doneDrawing != null) { doneDrawing.actionPerformed(null); } } /** * If the index of the current item was changed, the object reference needs * to be updated as well. This method does just that. */ private void updateCurrrentItem() { - if (currentSheet >= 0 || currentSheet < sheets.size()) { + if (currentSheet < 0 || currentSheet >= sheets.size()) { + NoteBookProgram.handleError(String.format("Index error with NoteBook \"%s\"", name)); currentSheet = 0; } current = sheets.get(currentSheet); } /** * Tells the WriteoutThread that this NoteBook has no more sheets to save. */ private void quitWithWriteoutThread() { sheets.getFirst().stopWriteoutThread(); } /** * Generates the File for the next NoteSheet. * * @param pagenumber page number to use * @return File object with correct name */ private File generateNextFilename(int pagenumber) { if (folder != null && name != null) { try { return new File(folder.getCanonicalPath() + File.separator + name + "-" + String.format("%06d", pagenumber) + ".png"); } catch (IOException e) { NoteBookProgram.handleError("Could not determine path of NoteBook folder."); e.printStackTrace(); } } return null; } /** * Delete the NoteBook from the file system. */ public void delete() { int answer = JOptionPane.showConfirmDialog(null, String.format("Do you really want to delete \"%s\"?", name), "Really delete?", JOptionPane.YES_NO_OPTION); if (answer == 1) { return; }; if (configFile != null) { configFile.delete(); configFile = null; } } private File configFile; /** * Creates a NoteBook with data read from a configuration file. */ public NoteBook(File configFile) { this(); this.configFile = configFile; Properties p = new Properties(); try { p.loadFromXML(new FileInputStream(configFile)); noteSize = new Dimension(Integer.parseInt(p.getProperty("width")), Integer.parseInt(p.getProperty("height"))); folder = new File(p.getProperty("folder")); name = p.getProperty("name"); } catch (InvalidPropertiesFormatException e) { NoteBookProgram.handleError("The NoteBook config file is malformed."); e.printStackTrace(); } catch (FileNotFoundException e) { NoteBookProgram.handleError("The NoteBook config file could not be found."); e.printStackTrace(); } catch (IOException e) { NoteBookProgram.handleError("IO during NoteBook config file loading."); e.printStackTrace(); } loadImagesFromFolder(); } public void saveToConfig(File configdir) { // persist this NoteBook in the configuration file Properties p = new Properties(); p.setProperty("width", String.valueOf(noteSize.width)); p.setProperty("height", String.valueOf(noteSize.height)); try { p.setProperty("folder", folder.getCanonicalPath()); } catch (IOException e) { NoteBookProgram.handleError("IO error while retrieving the path of the image folder."); e.printStackTrace(); } p.setProperty("name", name); try { p.storeToXML(new FileOutputStream(new File(configdir.getCanonicalPath() + File.separator + name + NoteBookProgram.configFileSuffix)), NoteBookProgram.generatedComment()); } catch (FileNotFoundException e) { NoteBookProgram.handleError("Could not find NoteBook config file for writing."); e.printStackTrace(); } catch (IOException e) { NoteBookProgram.handleError("IO error while writing NoteBook config file."); e.printStackTrace(); } } }

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java index fbd2c0a0b..9eb53f788 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java @@ -1,649 +1,649 @@ /********************************************************************** Copyright (c) 2000, 2002 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html Contributors: IBM Corporation - Initial implementation **********************************************************************/ package org.eclipse.ui.editors.text; import java.lang.reflect.InvocationTargetException; import java.text.MessageFormat; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.text.source.AnnotationRulerColumn; import org.eclipse.jface.text.source.CompositeRuler; import org.eclipse.jface.text.source.IAnnotationAccess; import org.eclipse.jface.text.source.IOverviewRuler; import org.eclipse.jface.text.source.ISharedTextColors; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ISourceViewerExtension; import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.IVerticalRulerColumn; import org.eclipse.jface.text.source.LineNumberRulerColumn; import org.eclipse.jface.text.source.OverviewRuler; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.dialogs.SaveAsDialog; import org.eclipse.ui.internal.editors.text.*; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.AddTaskAction; import org.eclipse.ui.texteditor.ConvertLineDelimitersAction; import org.eclipse.ui.texteditor.DefaultRangeIndicator; import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.ResourceAction; import org.eclipse.ui.texteditor.SourceViewerDecorationSupport; import org.eclipse.ui.texteditor.StatusTextEditor; /** * The standard text editor for file resources (<code>IFile</code>). * <p> * This editor has id <code>"org.eclipse.ui.DefaultTextEditor"</code>. * The editor's context menu has id <code>#TextEditorContext</code>. * The editor's ruler context menu has id <code>#TextRulerContext</code>. * </p> * <p> * The workbench will automatically instantiate this class when the default * editor is needed for a workbench window. * </p> */ public class TextEditor extends StatusTextEditor { /** * The encoding support for the editor. * @since 2.0 */ private DefaultEncodingSupport fEncodingSupport; /** * Creates a new text editor. */ public TextEditor() { super(); initializeEditor(); } /** * Initializes this editor. */ protected void initializeEditor() { setRangeIndicator(new DefaultRangeIndicator()); setEditorContextMenuId("#TextEditorContext"); //$NON-NLS-1$ setRulerContextMenuId("#TextRulerContext"); //$NON-NLS-1$ setHelpContextId(ITextEditorHelpContextIds.TEXT_EDITOR); setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore()); } /* * @see IWorkbenchPart#dispose() * @since 2.0 */ public void dispose() { if (fEncodingSupport != null) { fEncodingSupport.dispose(); fEncodingSupport= null; } if (fSourceViewerDecorationSupport != null) { fSourceViewerDecorationSupport.dispose(); fSourceViewerDecorationSupport= null; } super.dispose(); } /* * @see AbstractTextEditor#doSaveAs * @since 2.1 */ public void doSaveAs() { if (askIfNonWorkbenchEncodingIsOk()) super.doSaveAs(); } /* * @see AbstractTextEditor#doSave(IProgressMonitor) * @since 2.1 */ public void doSave(IProgressMonitor monitor){ if (askIfNonWorkbenchEncodingIsOk()) super.doSave(monitor); else monitor.setCanceled(true); } /** * Asks the user if it is ok to store in non-workbench encoding. * @return <true> if the user wants to continue */ private boolean askIfNonWorkbenchEncodingIsOk() { IDocumentProvider provider= getDocumentProvider(); if (provider instanceof IStorageDocumentProvider) { IEditorInput input= getEditorInput(); IStorageDocumentProvider storageProvider= (IStorageDocumentProvider)provider; String encoding= storageProvider.getEncoding(input); String defaultEncoding= storageProvider.getDefaultEncoding(); if (encoding != null && !encoding.equals(defaultEncoding)) { Shell shell= getSite().getShell(); String title= TextEditorMessages.getString("Editor.warning.save.nonWorkbenchEncoding.title"); //$NON-NLS-1$ String msg; if (input != null) msg= MessageFormat.format(TextEditorMessages.getString("Editor.warning.save.nonWorkbenchEncoding.message1"), new String[] {input.getName(), encoding});//$NON-NLS-1$ else msg= MessageFormat.format(TextEditorMessages.getString("Editor.warning.save.nonWorkbenchEncoding.message2"), new String[] {encoding});//$NON-NLS-1$ return MessageDialog.openQuestion(shell, title, msg); } } return true; } /** * The <code>TextEditor</code> implementation of this <code>AbstractTextEditor</code> * method asks the user for the workspace path of a file resource and saves the document there. * * @param progressMonitor the progress monitor to be used */ protected void performSaveAs(IProgressMonitor progressMonitor) { Shell shell= getSite().getShell(); IEditorInput input = getEditorInput(); SaveAsDialog dialog= new SaveAsDialog(shell); IFile original= (input instanceof IFileEditorInput) ? ((IFileEditorInput) input).getFile() : null; if (original != null) dialog.setOriginalFile(original); dialog.create(); IDocumentProvider provider= getDocumentProvider(); if (provider == null) { // editor has programatically been closed while the dialog was open return; } if (provider.isDeleted(input) && original != null) { String message= MessageFormat.format(TextEditorMessages.getString("Editor.warning.save.delete"), new Object[] { original.getName() }); //$NON-NLS-1$ dialog.setErrorMessage(null); dialog.setMessage(message, IMessageProvider.WARNING); } if (dialog.open() == Dialog.CANCEL) { if (progressMonitor != null) progressMonitor.setCanceled(true); return; } IPath filePath= dialog.getResult(); if (filePath == null) { if (progressMonitor != null) progressMonitor.setCanceled(true); return; } IWorkspace workspace= ResourcesPlugin.getWorkspace(); IFile file= workspace.getRoot().getFile(filePath); final IEditorInput newInput= new FileEditorInput(file); WorkspaceModifyOperation op= new WorkspaceModifyOperation() { public void execute(final IProgressMonitor monitor) throws CoreException { getDocumentProvider().saveDocument(monitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true); } }; boolean success= false; try { provider.aboutToChange(newInput); new ProgressMonitorDialog(shell).run(false, true, op); success= true; } catch (InterruptedException x) { } catch (InvocationTargetException x) { Throwable targetException= x.getTargetException(); String title= TextEditorMessages.getString("Editor.error.save.title"); //$NON-NLS-1$ String msg= MessageFormat.format(TextEditorMessages.getString("Editor.error.save.message"), new Object[] { targetException.getMessage() }); //$NON-NLS-1$ if (targetException instanceof CoreException) { CoreException coreException= (CoreException) targetException; IStatus status= coreException.getStatus(); if (status != null) { switch (status.getSeverity()) { case IStatus.INFO: MessageDialog.openInformation(shell, title, msg); break; case IStatus.WARNING: MessageDialog.openWarning(shell, title, msg); break; default: MessageDialog.openError(shell, title, msg); } } else { MessageDialog.openError(shell, title, msg); } } } finally { provider.changed(newInput); if (success) setInput(newInput); } if (progressMonitor != null) progressMonitor.setCanceled(!success); } /* * @see IEditorPart#isSaveAsAllowed() */ public boolean isSaveAsAllowed() { return true; } /* * @see AbstractTextEditor#createActions() * @since 2.0 */ protected void createActions() { super.createActions(); ResourceAction action= new AddTaskAction(TextEditorMessages.getResourceBundle(), "Editor.AddTask.", this); //$NON-NLS-1$ action.setHelpContextId(IAbstractTextEditorHelpContextIds.ADD_TASK_ACTION); action.setActionDefinitionId(ITextEditorActionDefinitionIds.ADD_TASK); setAction(ITextEditorActionConstants.ADD_TASK, action); action= new ConvertLineDelimitersAction(TextEditorMessages.getResourceBundle(), "Editor.ConvertToWindows.", this, "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$ action.setHelpContextId(IAbstractTextEditorHelpContextIds.CONVERT_LINE_DELIMITERS_TO_WINDOWS); action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_WINDOWS); setAction(ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_WINDOWS, action); action= new ConvertLineDelimitersAction(TextEditorMessages.getResourceBundle(), "Editor.ConvertToUNIX.", this, "\n"); //$NON-NLS-1$ //$NON-NLS-2$ action.setHelpContextId(IAbstractTextEditorHelpContextIds.CONVERT_LINE_DELIMITERS_TO_UNIX); action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_UNIX); setAction(ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_UNIX, action); action= new ConvertLineDelimitersAction(TextEditorMessages.getResourceBundle(), "Editor.ConvertToMac.", this, "\r"); //$NON-NLS-1$ //$NON-NLS-2$ action.setHelpContextId(IAbstractTextEditorHelpContextIds.CONVERT_LINE_DELIMITERS_TO_MAC); action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONVERT_LINE_DELIMITERS_TO_MAC); setAction(ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_MAC, action); // http://dev.eclipse.org/bugs/show_bug.cgi?id=17709 markAsStateDependentAction(ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_WINDOWS, true); markAsStateDependentAction(ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_UNIX, true); markAsStateDependentAction(ITextEditorActionConstants.CONVERT_LINE_DELIMITERS_TO_MAC, true); fEncodingSupport= new DefaultEncodingSupport(); fEncodingSupport.initialize(this); } /* * @see StatusTextEditor#getStatusHeader(IStatus) * @since 2.0 */ protected String getStatusHeader(IStatus status) { if (fEncodingSupport != null) { String message= fEncodingSupport.getStatusHeader(status); if (message != null) return message; } return super.getStatusHeader(status); } /* * @see StatusTextEditor#getStatusBanner(IStatus) * @since 2.0 */ protected String getStatusBanner(IStatus status) { if (fEncodingSupport != null) { String message= fEncodingSupport.getStatusBanner(status); if (message != null) return message; } return super.getStatusBanner(status); } /* * @see StatusTextEditor#getStatusMessage(IStatus) * @since 2.0 */ protected String getStatusMessage(IStatus status) { if (fEncodingSupport != null) { String message= fEncodingSupport.getStatusMessage(status); if (message != null) return message; } return super.getStatusMessage(status); } /* * @see AbstractTextEditor#doSetInput(IEditorInput) * @since 2.0 */ protected void doSetInput(IEditorInput input) throws CoreException { super.doSetInput(input); if (fEncodingSupport != null) fEncodingSupport.reset(); } /* * @see IAdaptable#getAdapter(Class) * @since 2.0 */ public Object getAdapter(Class adapter) { if (IEncodingSupport.class.equals(adapter)) return fEncodingSupport; return super.getAdapter(adapter); } /* * @see AbstractTextEditor#editorContextMenuAboutToShow(IMenuManager) * @since 2.0 */ protected void editorContextMenuAboutToShow(IMenuManager menu) { super.editorContextMenuAboutToShow(menu); addAction(menu, ITextEditorActionConstants.GROUP_EDIT, ITextEditorActionConstants.SHIFT_RIGHT); addAction(menu, ITextEditorActionConstants.GROUP_EDIT, ITextEditorActionConstants.SHIFT_LEFT); } /* * @see org.eclipse.ui.texteditor.AbstractTextEditor#updatePropertyDependentActions() * @since 2.0 */ protected void updatePropertyDependentActions() { super.updatePropertyDependentActions(); if (fEncodingSupport != null) fEncodingSupport.reset(); } /** Preference key for showing the line number ruler */ private final static String LINE_NUMBER_RULER= TextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER; /** Preference key for the foreground color of the line numbers */ private final static String LINE_NUMBER_COLOR= TextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR; /** Preference key for showing the overview ruler */ private final static String OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER; /** Preference key for error indication in overview ruler */ private final static String ERROR_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER; /** Preference key for warning indication in overview ruler */ private final static String WARNING_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER; /** Preference key for info indication in overview ruler */ private final static String INFO_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER; /** Preference key for task indication in overview ruler */ private final static String TASK_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER; /** Preference key for bookmark indication in overview ruler */ private final static String BOOKMARK_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER; /** Preference key for search result indication in overview ruler */ private final static String SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER; /** Preference key for unknown annotation indication in overview ruler */ private final static String UNKNOWN_INDICATION_IN_OVERVIEW_RULER= TextEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER; /** Preference key for error indication */ private final static String ERROR_INDICATION= TextEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION; /** Preference key for error color */ private final static String ERROR_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR; /** Preference key for warning indication */ private final static String WARNING_INDICATION= TextEditorPreferenceConstants.EDITOR_WARNING_INDICATION; /** Preference key for warning color */ private final static String WARNING_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_WARNING_INDICATION_COLOR; /** Preference key for info indication */ private final static String INFO_INDICATION= TextEditorPreferenceConstants.EDITOR_INFO_INDICATION; /** Preference key for info color */ private final static String INFO_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_INFO_INDICATION_COLOR; /** Preference key for task indication */ private final static String TASK_INDICATION= TextEditorPreferenceConstants.EDITOR_TASK_INDICATION; /** Preference key for task color */ private final static String TASK_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_TASK_INDICATION_COLOR; /** Preference key for bookmark indication */ private final static String BOOKMARK_INDICATION= TextEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION; /** Preference key for bookmark color */ private final static String BOOKMARK_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR; /** Preference key for search result indication */ private final static String SEARCH_RESULT_INDICATION= TextEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION; /** Preference key for search result color */ private final static String SEARCH_RESULT_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR; /** Preference key for unknown annotation indication */ private final static String UNKNOWN_INDICATION= TextEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION; /** Preference key for unknown annotation color */ private final static String UNKNOWN_INDICATION_COLOR= TextEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR; /** Preference key for highlighting current line */ private final static String CURRENT_LINE= TextEditorPreferenceConstants.EDITOR_CURRENT_LINE; /** Preference key for highlight color of current line */ private final static String CURRENT_LINE_COLOR= TextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR; /** Preference key for showing print marging ruler */ private final static String PRINT_MARGIN= TextEditorPreferenceConstants.EDITOR_PRINT_MARGIN; /** Preference key for print margin ruler color */ private final static String PRINT_MARGIN_COLOR= TextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR; /** Preference key for print margin ruler column */ private final static String PRINT_MARGIN_COLUMN= TextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN; private IOverviewRuler fOverviewRuler; private IAnnotationAccess fAnnotationAccess= new AnnotationAccess(); private SourceViewerDecorationSupport fSourceViewerDecorationSupport; private LineNumberRulerColumn fLineNumberRulerColumn; /* * @see org.eclipse.ui.texteditor.AbstractTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, int) */ protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { ISharedTextColors sharedColors= EditorsPlugin.getDefault().getSharedTextColors(); fOverviewRuler= new OverviewRuler(fAnnotationAccess, VERTICAL_RULER_WIDTH, sharedColors); fOverviewRuler.addHeaderAnnotationType(AnnotationType.WARNING); fOverviewRuler.addHeaderAnnotationType(AnnotationType.ERROR); ISourceViewer sourceViewer= new SourceViewer(parent, ruler, fOverviewRuler, isOverviewRulerVisible(), styles); fSourceViewerDecorationSupport= new SourceViewerDecorationSupport(sourceViewer, fOverviewRuler, fAnnotationAccess, sharedColors); configureSourceViewerDecorationSupport(); return sourceViewer; } private void configureSourceViewerDecorationSupport() { fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.UNKNOWN, UNKNOWN_INDICATION_COLOR, UNKNOWN_INDICATION, UNKNOWN_INDICATION_IN_OVERVIEW_RULER, 0); fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.BOOKMARK, BOOKMARK_INDICATION_COLOR, BOOKMARK_INDICATION, BOOKMARK_INDICATION_IN_OVERVIEW_RULER, 1); fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.TASK, TASK_INDICATION_COLOR, TASK_INDICATION, TASK_INDICATION_IN_OVERVIEW_RULER, 2); fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.SEARCH, SEARCH_RESULT_INDICATION_COLOR, SEARCH_RESULT_INDICATION, SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, 3); fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.INFO, INFO_INDICATION_COLOR, INFO_INDICATION, INFO_INDICATION_IN_OVERVIEW_RULER, 4); fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.WARNING, WARNING_INDICATION_COLOR, WARNING_INDICATION, WARNING_INDICATION_IN_OVERVIEW_RULER, 5); fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.ERROR, ERROR_INDICATION_COLOR, ERROR_INDICATION, ERROR_INDICATION_IN_OVERVIEW_RULER, 6); fSourceViewerDecorationSupport.setCursorLinePainterPreferenceKeys(CURRENT_LINE, CURRENT_LINE_COLOR); fSourceViewerDecorationSupport.setMarginPainterPreferenceKeys(PRINT_MARGIN, PRINT_MARGIN_COLOR, PRINT_MARGIN_COLUMN); fSourceViewerDecorationSupport.setSymbolicFontName(getFontPropertyPreferenceKey()); } private void showOverviewRuler() { if (fOverviewRuler != null) { if (getSourceViewer() instanceof ISourceViewerExtension) { ((ISourceViewerExtension) getSourceViewer()).showAnnotationsOverview(true); fSourceViewerDecorationSupport.updateOverviewDecorations(); } } } private void hideOverviewRuler() { if (getSourceViewer() instanceof ISourceViewerExtension) { fSourceViewerDecorationSupport.hideAnnotationOverview(); ((ISourceViewerExtension) getSourceViewer()).showAnnotationsOverview(false); } } private boolean isOverviewRulerVisible() { IPreferenceStore store= getPreferenceStore(); - return store.getBoolean(OVERVIEW_RULER); + return store != null ? store.getBoolean(OVERVIEW_RULER) : false; } /** * Shows the line number ruler column. */ private void showLineNumberRuler() { IVerticalRuler v= getVerticalRuler(); if (v instanceof CompositeRuler) { CompositeRuler c= (CompositeRuler) v; c.addDecorator(1, createLineNumberRulerColumn()); } } /** * Hides the line number ruler column. */ private void hideLineNumberRuler() { IVerticalRuler v= getVerticalRuler(); if (v instanceof CompositeRuler) { CompositeRuler c= (CompositeRuler) v; c.removeDecorator(1); } } /** * Return whether the line number ruler column should be * visible according to the preference store settings. * @return <code>true</code> if the line numbers should be visible */ private boolean isLineNumberRulerVisible() { IPreferenceStore store= getPreferenceStore(); - return store.getBoolean(LINE_NUMBER_RULER); + return store != null ? store.getBoolean(LINE_NUMBER_RULER) : false; } /** * Initializes the given line number ruler column from the preference store. * @param rulerColumn the ruler column to be initialized */ protected void initializeLineNumberRulerColumn(LineNumberRulerColumn rulerColumn) { ISharedTextColors sharedColors= EditorsPlugin.getDefault().getSharedTextColors(); IPreferenceStore store= getPreferenceStore(); if (store != null) { RGB rgb= null; // foreground color if (store.contains(LINE_NUMBER_COLOR)) { if (store.isDefault(LINE_NUMBER_COLOR)) rgb= PreferenceConverter.getDefaultColor(store, LINE_NUMBER_COLOR); else rgb= PreferenceConverter.getColor(store, LINE_NUMBER_COLOR); } rulerColumn.setForeground(sharedColors.getColor(rgb)); rgb= null; // background color if (!store.getBoolean(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT)) { if (store.contains(PREFERENCE_COLOR_BACKGROUND)) { if (store.isDefault(PREFERENCE_COLOR_BACKGROUND)) rgb= PreferenceConverter.getDefaultColor(store, PREFERENCE_COLOR_BACKGROUND); else rgb= PreferenceConverter.getColor(store, PREFERENCE_COLOR_BACKGROUND); } } rulerColumn.setBackground(sharedColors.getColor(rgb)); rulerColumn.redraw(); } } /** * Creates a new line number ruler column that is appropriately initialized. */ protected IVerticalRulerColumn createLineNumberRulerColumn() { fLineNumberRulerColumn= new LineNumberRulerColumn(); initializeLineNumberRulerColumn(fLineNumberRulerColumn); return fLineNumberRulerColumn; } /* * @see AbstractTextEditor#createVerticalRuler() */ protected IVerticalRuler createVerticalRuler() { CompositeRuler ruler= new CompositeRuler(); ruler.addDecorator(0, new AnnotationRulerColumn(VERTICAL_RULER_WIDTH)); if (isLineNumberRulerVisible()) ruler.addDecorator(1, createLineNumberRulerColumn()); return ruler; } /* * @see AbstractTextEditor#handlePreferenceStoreChanged(PropertyChangeEvent) */ protected void handlePreferenceStoreChanged(PropertyChangeEvent event) { try { ISourceViewer sourceViewer= getSourceViewer(); if (sourceViewer == null) return; String property= event.getProperty(); if (OVERVIEW_RULER.equals(property)) { if (isOverviewRulerVisible()) showOverviewRuler(); else hideOverviewRuler(); return; } if (LINE_NUMBER_RULER.equals(property)) { if (isLineNumberRulerVisible()) showLineNumberRuler(); else hideLineNumberRuler(); return; } if (fLineNumberRulerColumn != null && (LINE_NUMBER_COLOR.equals(property) || PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT.equals(property) || PREFERENCE_COLOR_BACKGROUND.equals(property))) { initializeLineNumberRulerColumn(fLineNumberRulerColumn); } } finally { super.handlePreferenceStoreChanged(event); } } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ public void createPartControl(Composite parent) { super.createPartControl(parent); fSourceViewerDecorationSupport.install(getPreferenceStore()); } }

diff --git a/src/com/google/caja/render/BufferingRenderer.java b/src/com/google/caja/render/BufferingRenderer.java index 1b85a5bc..365cebe5 100644 --- a/src/com/google/caja/render/BufferingRenderer.java +++ b/src/com/google/caja/render/BufferingRenderer.java @@ -1,170 +1,170 @@ // Copyright (C) 2008 Google Inc. // // 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 com.google.caja.render; import com.google.caja.lexer.FilePosition; import com.google.caja.lexer.JsLexer; import com.google.caja.lexer.TokenConsumer; import com.google.caja.util.Callback; import java.io.Flushable; import java.io.IOException; import java.util.ArrayList; import java.util.List; /** * An abstract renderer for JavaScript tokens that ensures that implementations * don't fall afoul of JavaScript's syntactic quirks. * * @author [email protected] */ abstract class BufferingRenderer implements TokenConsumer { private final List<Object> pending = new ArrayList<Object>(); private final Appendable out; private final Callback<IOException> ioExceptionHandler; /** True if an IOException has been raised. */ private boolean closed; /** * @param out receives the rendered text. * @param ioExceptionHandler receives exceptions thrown by out. */ BufferingRenderer(Appendable out, Callback<IOException> ioExceptionHandler) { this.out = out; this.ioExceptionHandler = ioExceptionHandler; } /** * @throws NullPointerException if out raises an IOException * and ioExceptionHandler is null. */ public final void noMoreTokens() { JsTokenAdjacencyChecker adjChecker = new JsTokenAdjacencyChecker(); try { String lastToken = null; boolean noOutputWritten = true; List<String> outputTokens = splitTokens(pending); pending.clear(); String pendingSpace = null; for (int i = 0, nTokens = outputTokens.size(); i < nTokens; ++i) { String token = outputTokens.get(i); if (token.charAt(0) == '\n' || " ".equals(token)) { pendingSpace = token; continue; } if (TokenClassification.isComment(token)) { // Make sure we don't get into a situation where we have to output // a newline to end a line comment, but can't output a newline because // it would break a restricted production. // When we see a line comment, scan forward until the next non-comment // token. If the canBreakBetween check fails, then remove any // line-breaks by rewriting the comment. // We have to rewrite multi-line block comments, since ES3.1 says that // a multi-line comment is replaced with a newline for the purposes // of semicolon insertion. String nextToken = null; for (int j = i + 1; j < nTokens; ++j) { switch (TokenClassification.classify(outputTokens.get(j))) { case SPACE: case LINEBREAK: case COMMENT: continue; default: break; } nextToken = outputTokens.get(j); break; } if (!JsRenderUtil.canBreakBetween(lastToken, nextToken)) { token = removeLinebreaksFromComment(token); if (pendingSpace != null) { pendingSpace = " "; } } } boolean needSpaceBefore = adjChecker.needSpaceBefore(token); if (pendingSpace == null && needSpaceBefore) { pendingSpace = " "; } if (pendingSpace != null) { if (pendingSpace.charAt(0) == '\n') { if (!JsRenderUtil.canBreakBetween(lastToken, token)) { pendingSpace = " "; } else if (noOutputWritten) { pendingSpace = pendingSpace.substring(1); } } out.append(pendingSpace); pendingSpace = null; } out.append(token); noOutputWritten = false; if (!TokenClassification.isComment(token)) { lastToken = token; } } if (out instanceof Flushable) { ((Flushable) out).flush(); } } catch (IOException ex) { if (!closed) { closed = true; ioExceptionHandler.handle(ex); } } } /** * May receive line-break or comment tokens. Implementations may ignore * comment tokens, but the client is responsible for making sure that comments * are well-formed, do not contain code (e.g. conditional compilation code), * and do not violate any containment requirements, such as not containing the * string {@code </script>}. */ public final void consume(String text) { if ("".equals(text)) { return; } pending.add(text); } public final void mark(FilePosition mark) { - if (mark != null && !FilePosition.UNKNOWN.equals(mark.source())) { + if (mark != null && !FilePosition.UNKNOWN.equals(mark)) { pending.add(mark); } } private static String removeLinebreaksFromComment(String token) { if (TokenClassification.isLineComment(token)) { token = "/*" + token.substring(2) + "*/"; } StringBuilder sb = new StringBuilder(token); // Section 5.1.2 hinges on whether a MultiLineComment contains a // line-terminator char, so make sure it does not. for (int i = sb.length(); --i >= 0;) { if (JsLexer.isJsLineSeparator(sb.charAt(i))) { sb.setCharAt(i, ' '); } } // Make sure that turning a line comment into a MultiLineComment didn't // cause a */ in the line comment to become lexically significant. for (int e = sb.length() - 3, i; (i = sb.lastIndexOf("*/", e)) >= 0;) { sb.setCharAt(i + 1, ' '); } return sb.toString(); } /** * Generates a list of output tokens consisting of non-whitespace tokens, * space tokens ({@code " "}) and newline tokens ({@code '\n'} followed by * any number of spaces). * @param tokens a heterogenous array containing {@code String} tokens and * {@code FilePosition} marks. * @return the strings in tokens in order with newline and space tokens * inserted as appropriate. */ abstract List<String> splitTokens(List<Object> tokens); } diff --git a/src/com/google/caja/reporting/MessagePart.java b/src/com/google/caja/reporting/MessagePart.java index 22ba9aa8..86ce534b 100644 --- a/src/com/google/caja/reporting/MessagePart.java +++ b/src/com/google/caja/reporting/MessagePart.java @@ -1,130 +1,130 @@ // Copyright (C) 2005 Google Inc. // // 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 com.google.caja.reporting; import java.io.IOException; import java.util.Arrays; import java.util.Collection; /** * A part that may substitute for a placeholder in an error or logging message. * * @author [email protected] */ public interface MessagePart { /** * Formats this part to out. * @param out receives the formatted form of this. */ void format(MessageContext context, Appendable out) throws IOException; public static class Factory { private Factory() { // namespace for static methods } public static MessagePart valueOf(String s) { return new MessagePartWrapper(s); } public static MessagePart valueOf(final Number n) { return new MessagePartWrapper(n); } public static MessagePart valueOf(int n) { return new MessagePartWrapper(n); } public static MessagePart valueOf(long n) { return new MessagePartWrapper(n); } public static MessagePart valueOf(double n) { return new MessagePartWrapper(n); } public static MessagePart valueOf(Collection<?> parts) { final MessagePart[] partArr = new MessagePart[parts.size()]; int k = 0; for (Object p : parts) { if (!(p instanceof MessagePart)) { if (p instanceof Number) { p = valueOf((Number) p); } else { p = valueOf(p.toString()); } } partArr[k++] = (MessagePart) p; } return new ArrayPart(partArr); } private static class MessagePartWrapper implements MessagePart { private final Object wrapped; MessagePartWrapper(Object wrapped) { if (wrapped == null) { throw new NullPointerException(); } this.wrapped = wrapped; } public void format(MessageContext context, Appendable out) throws IOException { out.append(wrapped.toString()); } @Override public boolean equals(Object o) { if (!(o instanceof MessagePartWrapper)) { return false; } return this.wrapped.equals(((MessagePartWrapper) o).wrapped); } @Override public int hashCode() { return wrapped.hashCode() ^ 0x2ed53af2; } @Override public String toString() { return wrapped.toString(); } } private static class ArrayPart implements MessagePart { private final MessagePart[] partArr; ArrayPart(MessagePart[] partArr) { this.partArr = partArr; } public void format(MessageContext context, Appendable out) throws IOException { for (int i = 0; i < partArr.length; ++i) { if (0 != i) { out.append(", "); } partArr[i].format(context, out); } } @Override public String toString() { return Arrays.asList(partArr).toString(); } @Override public int hashCode() { return Arrays.hashCode(partArr) ^ 0x78abcd35; } @Override public boolean equals(Object o) { if (!(o instanceof ArrayPart)) { return false; } ArrayPart that = (ArrayPart) o; if (that.partArr.length != this.partArr.length) { return false; } for (int i = partArr.length; --i >= 0;) { - if (!this.partArr[i].equals(that.partArr.length)) { return false; } + if (!this.partArr[i].equals(that.partArr[i])) { return false; } } return true; } } } }

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java index fd7cb0f2f..fef6e625d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java @@ -1,648 +1,649 @@ /******************************************************************************* * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation * Philippe Ombredanne - bug 84808 * William Mitsuda ([email protected]) - Bug 153879 [Wizards] configurable size of cvs commit comment history + * Brock Janiczak <[email protected]> - Bug 161536 Warn user when committing resources with problem markers *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; import com.ibm.icu.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption; import org.eclipse.team.internal.ui.SWTUtils; import org.eclipse.ui.*; /** * CVS Preference Page * * Allows the configuration of CVS specific options. * The currently supported options are: * - Allow loading of CVS administration directory (CVSROOT) * * There are currently a couple of deficiencies: * 1. The Repository view is not refreshed when the show CVSROOT option is changed * 2. There is no help associated with the page */ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage { public static class PerspectiveDescriptorComparator implements Comparator { public int compare(Object o1, Object o2) { if (o1 instanceof IPerspectiveDescriptor && o2 instanceof IPerspectiveDescriptor) { String id1= ((IPerspectiveDescriptor)o1).getLabel(); String id2= ((IPerspectiveDescriptor)o2).getLabel(); return Collator.getInstance().compare(id1, id2); } return 0; } } private abstract class Field { protected final String fKey; public Field(String key) { fFields.add(this); fKey= key; } public abstract void initializeValue(IPreferenceStore store); public abstract void performOk(IPreferenceStore store); public void performDefaults(IPreferenceStore store) { store.setToDefault(fKey); initializeValue(store); } } private class Checkbox extends Field { private final Button fCheckbox; public Checkbox(Composite composite, String key, String label, String helpID) { super(key); fCheckbox= new Button(composite, SWT.CHECK); fCheckbox.setText(label); PlatformUI.getWorkbench().getHelpSystem().setHelp(fCheckbox, helpID); } public void initializeValue(IPreferenceStore store) { fCheckbox.setSelection(store.getBoolean(fKey)); } public void performOk(IPreferenceStore store) { store.setValue(fKey, fCheckbox.getSelection()); } } private abstract class ComboBox extends Field { protected final Combo fCombo; private final String [] fLabels; private final List fValues; public ComboBox(Composite composite, String key, String text, String helpID, String [] labels, Object [] values) { super(key); fLabels= labels; fValues= Arrays.asList(values); final Label label= SWTUtils.createLabel(composite, text); fCombo= new Combo(composite, SWT.READ_ONLY); fCombo.setLayoutData(SWTUtils.createHFillGridData()); fCombo.setItems(labels); if (((GridLayout)composite.getLayout()).numColumns > 1) { label.setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, false, false)); } PlatformUI.getWorkbench().getHelpSystem().setHelp(fCombo, helpID); } public Combo getCombo() { return fCombo; } public void initializeValue(IPreferenceStore store) { final Object value= getValue(store, fKey); final int index= fValues.indexOf(value); if (index >= 0 && index < fLabels.length) fCombo.select(index); else fCombo.select(0); } public void performOk(IPreferenceStore store) { saveValue(store, fKey, fValues.get(fCombo.getSelectionIndex())); } protected abstract void saveValue(IPreferenceStore store, String key, Object object); protected abstract Object getValue(IPreferenceStore store, String key); } private class IntegerComboBox extends ComboBox { public IntegerComboBox(Composite composite, String key, String label, String helpID, String[] labels, Integer [] values) { super(composite, key, label, helpID, labels, values); } protected void saveValue(IPreferenceStore store, String key, Object object) { store.setValue(key, ((Integer)object).intValue()); } protected Object getValue(IPreferenceStore store, String key) { return new Integer(store.getInt(key)); } } private class StringComboBox extends ComboBox { public StringComboBox(Composite composite, String key, String label, String helpID, String [] labels, String [] values) { super(composite, key, label, helpID, labels, values); } protected Object getValue(IPreferenceStore store, String key) { return store.getString(key); } protected void saveValue(IPreferenceStore store, String key, Object object) { store.setValue(key, (String)object); } } private abstract class RadioButtons extends Field { protected final Button [] fButtons; private final String [] fLabels; private final List fValues; private final Group fGroup; public RadioButtons(Composite composite, String key, String label, String helpID, String [] labels, Object [] values) { super(key); fLabels= labels; fValues= Arrays.asList(values); fGroup= SWTUtils.createHFillGroup(composite, label, SWTUtils.MARGINS_DEFAULT, labels.length); fButtons= new Button [labels.length]; for (int i = 0; i < fLabels.length; i++) { fButtons[i]= new Button(fGroup, SWT.RADIO); fButtons[i].setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, false, false)); fButtons[i].setText(labels[i]); } SWTUtils.equalizeControls(SWTUtils.createDialogPixelConverter(composite), fButtons, 0, fButtons.length - 2); PlatformUI.getWorkbench().getHelpSystem().setHelp(fGroup, helpID); } public void initializeValue(IPreferenceStore store) { final Object value= loadValue(store, fKey); final int index= fValues.indexOf(value); for (int i = 0; i < fButtons.length; i++) { Button b = fButtons[i]; b.setSelection(index == i); } } public void performOk(IPreferenceStore store) { for (int i = 0; i < fButtons.length; ++i) { if (fButtons[i].getSelection()) { saveValue(store, fKey, fValues.get(i)); return; } } } public Control getControl() { return fGroup; } protected abstract Object loadValue(IPreferenceStore store, String key); protected abstract void saveValue(IPreferenceStore store, String key, Object value); } private class IntegerRadioButtons extends RadioButtons { public IntegerRadioButtons(Composite composite, String key, String label, String helpID, String[] labels, Integer [] values) { super(composite, key, label, helpID, labels, values); } protected Object loadValue(IPreferenceStore store, String key) { return new Integer(store.getInt(key)); } protected void saveValue(IPreferenceStore store, String key, Object value) { store.setValue(key, ((Integer)value).intValue()); } } private class StringRadioButtons extends RadioButtons { public StringRadioButtons(Composite composite, String key, String label, String helpID, String[] labels, String [] values) { super(composite, key, label, helpID, labels, values); } protected Object loadValue(IPreferenceStore store, String key) { return store.getString(key); } protected void saveValue(IPreferenceStore store, String key, Object value) { store.setValue(key, (String)value); } } private abstract class TextField extends Field implements ModifyListener { protected final Text fText; public TextField(Composite composite, String key, String text, String helpID) { super(key); final Label label= new Label(composite, SWT.WRAP); label.setText(text); label.setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, false, false)); fText= SWTUtils.createText(composite); fText.addModifyListener(this); if (helpID != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(fText, helpID); } public Text getControl() { return fText; } public void initializeValue(IPreferenceStore store) { final String value= store.getString(fKey); fText.setText(value); } public void performOk(IPreferenceStore store) { store.setValue(fKey, fText.getText()); } public void modifyText(ModifyEvent e) { modifyText(fText); } protected abstract void modifyText(Text text); } private final String [] KSUBST_VALUES; private final String [] KSUBST_LABELS; private final String [] COMPRESSION_LABELS; private final Integer [] COMPRESSION_VALUES; protected final ArrayList fFields; private final String [] PERSPECTIVE_VALUES; private final String [] PERSPECTIVE_LABELS; private final String [] YES_NO_PROMPT; public CVSPreferencesPage() { fFields= new ArrayList(); final KSubstOption[] options = KSubstOption.getAllKSubstOptions(); final ArrayList KSUBST_MODES= new ArrayList(); for (int i = 0; i < options.length; i++) { final KSubstOption option = options[i]; if (!option.isBinary()) { KSUBST_MODES.add(option); } } Collections.sort(KSUBST_MODES, new Comparator() { public int compare(Object a, Object b) { final String aKey = ((KSubstOption) a).getLongDisplayText(); final String bKey = ((KSubstOption) b).getLongDisplayText(); return aKey.compareTo(bKey); } }); KSUBST_LABELS= new String[KSUBST_MODES.size()]; KSUBST_VALUES= new String[KSUBST_MODES.size()]; int index= 0; for (Iterator iter = KSUBST_MODES.iterator(); iter.hasNext();) { KSubstOption mod = (KSubstOption) iter.next(); KSUBST_LABELS[index]= mod.getLongDisplayText(); final String mode= mod.toMode().trim(); KSUBST_VALUES[index]= mode.length() != 0 ? mode : "-kkv"; //$NON-NLS-1$ ++index; } COMPRESSION_LABELS = new String[] { CVSUIMessages.CVSPreferencesPage_0, CVSUIMessages.CVSPreferencesPage_1, CVSUIMessages.CVSPreferencesPage_2, CVSUIMessages.CVSPreferencesPage_3, CVSUIMessages.CVSPreferencesPage_4, CVSUIMessages.CVSPreferencesPage_5, /* CVSUIMessages.CVSPreferencesPage_6, // Disallow 6 through 9 due to server bug (see bug 15724) CVSUIMessages.CVSPreferencesPage_7, CVSUIMessages.CVSPreferencesPage_8, CVSUIMessages.CVSPreferencesPage_9 */}; COMPRESSION_VALUES= new Integer [COMPRESSION_LABELS.length]; for (int i = 0; i < COMPRESSION_VALUES.length; i++) { COMPRESSION_VALUES[i]= new Integer(i); } final IPerspectiveDescriptor [] perspectives= PlatformUI.getWorkbench().getPerspectiveRegistry().getPerspectives(); PERSPECTIVE_VALUES= new String[perspectives.length + 1]; PERSPECTIVE_LABELS= new String [perspectives.length + 1]; Arrays.sort(perspectives, new PerspectiveDescriptorComparator()); PERSPECTIVE_VALUES[0]= ICVSUIConstants.OPTION_NO_PERSPECTIVE; PERSPECTIVE_LABELS[0]= CVSUIMessages.CVSPreferencesPage_10; for (int i = 0; i < perspectives.length; i++) { PERSPECTIVE_VALUES[i + 1]= perspectives[i].getId(); PERSPECTIVE_LABELS[i + 1]= perspectives[i].getLabel(); } YES_NO_PROMPT= new String [] { CVSUIMessages.CVSPreferencesPage_11, CVSUIMessages.CVSPreferencesPage_12, CVSUIMessages.CVSPreferencesPage_13 }; // /** * Handle deleted perspectives */ final IPreferenceStore store= CVSUIPlugin.getPlugin().getPreferenceStore(); final String id= store.getString(ICVSUIConstants.PREF_DEFAULT_PERSPECTIVE_FOR_SHOW_ANNOTATIONS); if (PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(id) == null) { store.putValue(ICVSUIConstants.PREF_DEFAULT_PERSPECTIVE_FOR_SHOW_ANNOTATIONS, ICVSUIConstants.OPTION_NO_PERSPECTIVE); } } protected Control createContents(Composite parent) { // create a tab folder for the page final TabFolder tabFolder = new TabFolder(parent, SWT.NONE); tabFolder.setLayoutData(SWTUtils.createHFillGridData()); createGeneralTab(tabFolder); createFilesFoldersTab(tabFolder); createConnectionTab(tabFolder); createPromptingTab(tabFolder); initializeValues(); Dialog.applyDialogFont(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.GENERAL_PREFERENCE_PAGE); return tabFolder; } private Composite createGeneralTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT); final TabItem tab= new TabItem(tabFolder, SWT.NONE); tab.setText(CVSUIMessages.CVSPreferencesPage_14); tab.setControl(composite); new Checkbox(composite, ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION, CVSUIMessages.CVSPreferencesPage_15, IHelpContextIds.PREF_DETERMINE_SERVER_VERSION); new Checkbox(composite, ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, CVSUIMessages.CVSPreferencesPage_16, IHelpContextIds.PREF_CONFIRM_MOVE_TAG); new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, CVSUIMessages.CVSPreferencesPage_17, IHelpContextIds.PREF_DEBUG_PROTOCOL); new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, CVSUIMessages.CVSPreferencesPage_18, IHelpContextIds.PREF_AUTOREFRESH_TAG); new Checkbox(composite, ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, CVSUIMessages.CVSPreferencesPage_44, null); new Checkbox(composite, ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT, CVSUIMessages.CVSPreferencesPage_45, null); final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2); new TextField( textComposite, ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, CVSUIMessages.CVSPreferencesPage_20, null) { protected void modifyText(Text text) { // Parse the timeout value try { final int x = Integer.parseInt(text.getText()); if (x >= 0) { setErrorMessage(null); setValid(true); } else { setErrorMessage(CVSUIMessages.CVSPreferencesPage_21); setValid(false); } } catch (NumberFormatException ex) { setErrorMessage(CVSUIMessages.CVSPreferencesPage_22); setValid(false); } } }; new TextField( textComposite, ICVSUIConstants.PREF_COMMIT_COMMENTS_MAX_HISTORY, "Maximum number of comments on &history:", null) { protected void modifyText(Text text) { try { final int x = Integer.parseInt(text.getText()); if (x > 0) { setErrorMessage(null); setValid(true); } else { setErrorMessage("Maximum number of comments must be positive"); setValid(false); } } catch (NumberFormatException ex) { setErrorMessage("Maximum number of comments must be a number"); setValid(false); } } }; return composite; } private Composite createConnectionTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT); final TabItem tab= new TabItem(tabFolder, SWT.NONE); tab.setText(CVSUIMessages.CVSPreferencesPage_19); tab.setControl(composite); final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2); new TextField( textComposite, ICVSUIConstants.PREF_TIMEOUT, CVSUIMessages.CVSPreferencesPage_23, IHelpContextIds.PREF_COMMS_TIMEOUT) { protected void modifyText(Text text) { // Parse the timeout value try { final int x = Integer.parseInt(text.getText()); if (x >= 0) { setErrorMessage(null); setValid(true); } else { setErrorMessage(CVSUIMessages.CVSPreferencesPage_24); setValid(false); } } catch (NumberFormatException ex) { setErrorMessage(CVSUIMessages.CVSPreferencesPage_25); setValid(false); } } }; final ComboBox quietnessCombo = new IntegerComboBox( textComposite, ICVSUIConstants.PREF_QUIETNESS, CVSUIMessages.CVSPreferencesPage_26, IHelpContextIds.PREF_QUIET, new String [] { CVSUIMessages.CVSPreferencesPage_27, CVSUIMessages.CVSPreferencesPage_28, CVSUIMessages.CVSPreferencesPage_29 }, // new Integer [] { new Integer(0), new Integer(1), new Integer(2)}); quietnessCombo.getCombo().addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { if (getQuietnessOptionFor(quietnessCombo.getCombo().getSelectionIndex()).equals(Command.SILENT)) { MessageDialog.openWarning(getShell(), CVSUIMessages.CVSPreferencesPage_30, CVSUIMessages.CVSPreferencesPage_31); // } } public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } }); new IntegerComboBox( textComposite, ICVSUIConstants.PREF_COMPRESSION_LEVEL, CVSUIMessages.CVSPreferencesPage_32, IHelpContextIds.PREF_COMPRESSION, COMPRESSION_LABELS, COMPRESSION_VALUES); return composite; } private Composite createFilesFoldersTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT); final TabItem tab= new TabItem(tabFolder, SWT.NONE); tab.setText(CVSUIMessages.CVSPreferencesPage_33); tab.setControl(composite); new Checkbox(composite, ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY, CVSUIMessages.CVSPreferencesPage_34, IHelpContextIds.PREF_TREAT_NEW_FILE_AS_BINARY); new Checkbox(composite, ICVSUIConstants.PREF_USE_PLATFORM_LINEEND, CVSUIMessages.CVSPreferencesPage_35, IHelpContextIds.PREF_LINEEND); new Checkbox(composite, ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, CVSUIMessages.CVSPreferencesPage_36, IHelpContextIds.PREF_PRUNE); new Checkbox(composite, ICVSUIConstants.PREF_REPLACE_UNMANAGED, CVSUIMessages.CVSPreferencesPage_37, IHelpContextIds.PREF_REPLACE_DELETE_UNMANAGED); SWTUtils.createPlaceholder(composite, 1); final Composite bottom= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2); new StringComboBox( bottom, ICVSUIConstants.PREF_TEXT_KSUBST, CVSUIMessages.CVSPreferencesPage_38, IHelpContextIds.PREF_KEYWORDMODE, KSUBST_LABELS, KSUBST_VALUES); return composite; } private Composite createPromptingTab(final TabFolder tabFolder) { final Composite composite = SWTUtils.createHFillComposite(tabFolder, SWTUtils.MARGINS_DEFAULT, 1); final TabItem tab= new TabItem(tabFolder, SWT.NONE); tab.setText(CVSUIMessages.CVSPreferencesPage_39); tab.setControl(composite); new StringRadioButtons( composite, ICVSUIConstants.PREF_ALLOW_EMPTY_COMMIT_COMMENTS, CVSUIMessages.CVSPreferencesPage_40, IHelpContextIds.PREF_ALLOW_EMPTY_COMMIT_COMMENTS, YES_NO_PROMPT, new String [] { MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER, MessageDialogWithToggle.PROMPT }); new IntegerRadioButtons(composite, ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, CVSUIMessages.CVSPreferencesPage_41, IHelpContextIds.PREF_SAVE_DIRTY_EDITORS, YES_NO_PROMPT, new Integer [] { new Integer(ICVSUIConstants.OPTION_AUTOMATIC), new Integer(ICVSUIConstants.OPTION_NEVER), new Integer(ICVSUIConstants.OPTION_PROMPT)}); new StringRadioButtons( composite, ICVSUIConstants.PREF_INCLUDE_CHANGE_SETS_IN_COMMIT, CVSUIMessages.CVSPreferencesPage_46, IHelpContextIds.PREF_INCLUDE_CHANGE_SETS_IN_COMMIT, YES_NO_PROMPT, new String [] { MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER, MessageDialogWithToggle.PROMPT } ); new StringRadioButtons( composite, ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_WARNINGS, "Commit resources with warnings", IHelpContextIds.PREF_INCLUDE_CHANGE_SETS_IN_COMMIT, YES_NO_PROMPT, new String [] { MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER, MessageDialogWithToggle.PROMPT } ); new StringRadioButtons( composite, ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_ERRORS, "Commit resources with errors", IHelpContextIds.PREF_INCLUDE_CHANGE_SETS_IN_COMMIT, YES_NO_PROMPT, new String [] { MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER, MessageDialogWithToggle.PROMPT } ); SWTUtils.createPlaceholder(composite, 1); return composite; } /** * Initializes states of the controls from the preference store. */ private void initializeValues() { final IPreferenceStore store = getPreferenceStore(); for (Iterator iter = fFields.iterator(); iter.hasNext();) { ((Field)iter.next()).initializeValue(store); } } public void init(IWorkbench workbench) { } public boolean performOk() { final IPreferenceStore store = getPreferenceStore(); for (Iterator iter = fFields.iterator(); iter.hasNext();) { ((Field) iter.next()).performOk(store); } CVSProviderPlugin.getPlugin().setReplaceUnmanaged(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED)); CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES)); CVSProviderPlugin.getPlugin().setTimeout(store.getInt(ICVSUIConstants.PREF_TIMEOUT)); CVSProviderPlugin.getPlugin().setQuietness(getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS))); CVSProviderPlugin.getPlugin().setCompressionLevel(store.getInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL)); CVSProviderPlugin.getPlugin().setDebugProtocol(store.getBoolean(ICVSUIConstants.PREF_DEBUG_PROTOCOL)); CVSProviderPlugin.getPlugin().setRepositoriesAreBinary(store.getBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY)); KSubstOption oldKSubst = CVSProviderPlugin.getPlugin().getDefaultTextKSubstOption(); KSubstOption newKSubst = KSubstOption.fromMode(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST)); CVSProviderPlugin.getPlugin().setDefaultTextKSubstOption(newKSubst); CVSProviderPlugin.getPlugin().setUsePlatformLineend(store.getBoolean(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND)); CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION)); CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT)); // changing the default keyword substitution mode for text files may affect // information displayed in the decorators if (! oldKSubst.equals(newKSubst)) { CVSUIPlugin.broadcastPropertyChange(new PropertyChangeEvent(this, CVSUIPlugin.P_DECORATORS_CHANGED, null, null)); } CVSUIPlugin.getPlugin().savePluginPreferences(); return true; } protected void performDefaults() { super.performDefaults(); final IPreferenceStore store = getPreferenceStore(); for (Iterator iter = fFields.iterator(); iter.hasNext();) { ((Field) iter.next()).performDefaults(store); } } /** * Returns preference store that belongs to the our plugin. * This is important because we want to store * our preferences separately from the desktop. * * @return the preference store for this plugin */ protected IPreferenceStore doGetPreferenceStore() { return CVSUIPlugin.getPlugin().getPreferenceStore(); } protected static QuietOption getQuietnessOptionFor(int option) { switch (option) { case 0: return Command.VERBOSE; case 1: return Command.PARTLY_QUIET; case 2: return Command.SILENT; } return null; } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java index b5d2d3928..38c33c176 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java @@ -1,750 +1,751 @@ /******************************************************************************* * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation * Philippe Ombredanne - bug 84808 * William Mitsuda ([email protected]) - Bug 153879 [Wizards] configurable size of cvs commit comment history + * Brock Janiczak <[email protected]> - Bug 161536 Warn user when committing resources with problem markers *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceStatus; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; import org.eclipse.team.internal.ccvs.ui.console.CVSOutputConsole; import org.eclipse.team.internal.ccvs.ui.model.CVSAdapterFactory; import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager; import org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot; import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager; import org.eclipse.team.internal.ui.*; import org.eclipse.ui.*; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; /** * UI Plugin for CVS provider-specific workbench functionality. */ public class CVSUIPlugin extends AbstractUIPlugin { /** * The id of the CVS plug-in */ public static final String ID = "org.eclipse.team.cvs.ui"; //$NON-NLS-1$ public static final String DECORATOR_ID = "org.eclipse.team.cvs.ui.decorator"; //$NON-NLS-1$ /** * Property constant indicating the decorator configuration has changed. */ public static final String P_DECORATORS_CHANGED = CVSUIPlugin.ID + ".P_DECORATORS_CHANGED"; //$NON-NLS-1$ private Hashtable imageDescriptors = new Hashtable(20); private static List propertyChangeListeners = new ArrayList(5); /** * The singleton plug-in instance */ private static CVSUIPlugin plugin; /** * The CVS console */ private CVSOutputConsole console; /** * The repository manager */ private RepositoryManager repositoryManager; /** * CVSUIPlugin constructor * * @param descriptor the plugin descriptor */ public CVSUIPlugin() { super(); plugin = this; } /** * Returns the standard display to be used. The method first checks, if * the thread calling this method has an associated display. If so, this * display is returned. Otherwise the method returns the default display. */ public static Display getStandardDisplay() { Display display= Display.getCurrent(); if (display == null) { display= Display.getDefault(); } return display; } /** * Creates an image and places it in the image registry. */ protected void createImageDescriptor(String id) { URL url = FileLocator.find(CVSUIPlugin.getPlugin().getBundle(), new Path(ICVSUIConstants.ICON_PATH + id), null); ImageDescriptor desc = ImageDescriptor.createFromURL(url); imageDescriptors.put(id, desc); } /** * Returns the active workbench page. Note that the active page may not be * the one that the user perceives as active in some situations so this * method of obtaining the activate page should only be used if no other * method is available. * * @return the active workbench page */ public static IWorkbenchPage getActivePage() { return TeamUIPlugin.getActivePage(); } /** * Register for changes made to Team properties. */ public static void addPropertyChangeListener(IPropertyChangeListener listener) { propertyChangeListeners.add(listener); } /** * Remove a Team property changes. */ public static void removePropertyChangeListener(IPropertyChangeListener listener) { propertyChangeListeners.remove(listener); } /** * Broadcast a Team property change. */ public static void broadcastPropertyChange(PropertyChangeEvent event) { for (Iterator it = propertyChangeListeners.iterator(); it.hasNext();) { IPropertyChangeListener listener = (IPropertyChangeListener)it.next(); listener.propertyChange(event); } } /** * Run an operation involving the given resource. If an exception is thrown * and the code on the status is IResourceStatus.OUT_OF_SYNC_LOCAL then * the user will be prompted to refresh and try again. If they agree, then the * supplied operation will be run again. */ public static void runWithRefresh(Shell parent, IResource[] resources, IRunnableWithProgress runnable, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { boolean firstTime = true; while(true) { try { runnable.run(monitor); return; } catch (InvocationTargetException e) { if (! firstTime) throw e; IStatus status = null; if (e.getTargetException() instanceof CoreException) { status = ((CoreException)e.getTargetException()).getStatus(); } else if (e.getTargetException() instanceof TeamException) { status = ((TeamException)e.getTargetException()).getStatus(); } else { throw e; } if (status.getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) { if (promptToRefresh(parent, resources, status)) { try { for (int i = 0; i < resources.length; i++) { resources[i].refreshLocal(IResource.DEPTH_INFINITE, null); } } catch (CoreException coreEx) { // Throw the original exception to the caller log(coreEx); throw e; } firstTime = false; // Fall through and the operation will be tried again } else { // User chose not to continue. Treat it as a cancel. throw new InterruptedException(); } } else { throw e; } } } } private static boolean promptToRefresh(final Shell shell, final IResource[] resources, final IStatus status) { final boolean[] result = new boolean[] { false}; Runnable runnable = new Runnable() { public void run() { Shell shellToUse = shell; if (shell == null) { shellToUse = new Shell(Display.getCurrent()); } String question; if (resources.length == 1) { question = NLS.bind(CVSUIMessages.CVSUIPlugin_refreshQuestion, new String[] { status.getMessage(), resources[0].getFullPath().toString() }); } else { question = NLS.bind(CVSUIMessages.CVSUIPlugin_refreshMultipleQuestion, new String[] { status.getMessage() }); } result[0] = MessageDialog.openQuestion(shellToUse, CVSUIMessages.CVSUIPlugin_refreshTitle, question); } }; Display.getDefault().syncExec(runnable); return result[0]; } /** * Creates a busy cursor and runs the specified runnable. * May be called from a non-UI thread. * * @param parent the parent Shell for the dialog * @param cancelable if true, the dialog will support cancelation * @param runnable the runnable * * @exception InvocationTargetException when an exception is thrown from the runnable * @exception InterruptedException when the progress monitor is canceled */ public static void runWithProgress(Shell parent, boolean cancelable, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { Utils.runWithProgress(parent, cancelable, runnable); } /** * Returns the image descriptor for the given image ID. * Returns null if there is no such image. */ public ImageDescriptor getImageDescriptor(String id) { return (ImageDescriptor)imageDescriptors.get(id); } /** * Returns the singleton plug-in instance. * * @return the plugin instance */ public static CVSUIPlugin getPlugin() { return plugin; } /** * Returns the repository manager * * @return the repository manager */ public synchronized RepositoryManager getRepositoryManager() { if (repositoryManager == null) { repositoryManager = new RepositoryManager(); repositoryManager.startup(); } return repositoryManager; } /** * Initializes the table of images used in this plugin. */ private void initializeImages() { // objects createImageDescriptor(ICVSUIConstants.IMG_REPOSITORY); createImageDescriptor(ICVSUIConstants.IMG_REFRESH); createImageDescriptor(ICVSUIConstants.IMG_REFRESH_ENABLED); createImageDescriptor(ICVSUIConstants.IMG_REFRESH_DISABLED); createImageDescriptor(ICVSUIConstants.IMG_LINK_WITH_EDITOR); createImageDescriptor(ICVSUIConstants.IMG_LINK_WITH_EDITOR_ENABLED); createImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL); createImageDescriptor(ICVSUIConstants.IMG_COLLAPSE_ALL_ENABLED); createImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION); createImageDescriptor(ICVSUIConstants.IMG_CVSLOGO); createImageDescriptor(ICVSUIConstants.IMG_TAG); createImageDescriptor(ICVSUIConstants.IMG_MODULE); createImageDescriptor(ICVSUIConstants.IMG_CLEAR); createImageDescriptor(ICVSUIConstants.IMG_CLEAR_ENABLED); createImageDescriptor(ICVSUIConstants.IMG_CLEAR_DISABLED); createImageDescriptor(ICVSUIConstants.IMG_BRANCHES_CATEGORY); createImageDescriptor(ICVSUIConstants.IMG_VERSIONS_CATEGORY); createImageDescriptor(ICVSUIConstants.IMG_DATES_CATEGORY); createImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION); createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE); createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE); createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF); createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD); createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION); createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_IMPORT); createImageDescriptor(ICVSUIConstants.IMG_MERGEABLE_CONFLICT); createImageDescriptor(ICVSUIConstants.IMG_QUESTIONABLE); createImageDescriptor(ICVSUIConstants.IMG_MERGED); createImageDescriptor(ICVSUIConstants.IMG_EDITED); createImageDescriptor(ICVSUIConstants.IMG_NO_REMOTEDIR); createImageDescriptor(ICVSUIConstants.IMG_CVS_CONSOLE); createImageDescriptor(ICVSUIConstants.IMG_DATE); createImageDescriptor(ICVSUIConstants.IMG_CHANGELOG); createImageDescriptor(ICVSUIConstants.IMG_FILTER_HISTORY); createImageDescriptor(ICVSUIConstants.IMG_LOCALMODE); createImageDescriptor(ICVSUIConstants.IMG_LOCALREMOTE_MODE); createImageDescriptor(ICVSUIConstants.IMG_REMOTEMODE); createImageDescriptor(ICVSUIConstants.IMG_LOCALMODE_DISABLED); createImageDescriptor(ICVSUIConstants.IMG_LOCALREMOTE_MODE_DISABLED); createImageDescriptor(ICVSUIConstants.IMG_REMOTEMODE_DISABLED); createImageDescriptor(ICVSUIConstants.IMG_LOCALREVISION_TABLE); createImageDescriptor(ICVSUIConstants.IMG_REMOTEREVISION_TABLE); createImageDescriptor(ICVSUIConstants.IMG_COMPARE_VIEW); // special createImageDescriptor("glyphs/glyph1.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph2.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph3.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph4.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph5.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph6.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph7.gif"); //$NON-NLS-1$ createImageDescriptor("glyphs/glyph8.gif"); //$NON-NLS-1$ } /** * Convenience method for logging statuses to the plugin log * * @param status the status to log */ public static void log(IStatus status) { getPlugin().getLog().log(status); } public static void log(CoreException e) { log(e.getStatus().getSeverity(), CVSUIMessages.simpleInternal, e); } /** * Log the given exception along with the provided message and severity indicator */ public static void log(int severity, String message, Throwable e) { log(new Status(severity, ID, 0, message, e)); } // flags to tailor error reporting public static final int PERFORM_SYNC_EXEC = 1; public static final int LOG_TEAM_EXCEPTIONS = 2; public static final int LOG_CORE_EXCEPTIONS = 4; public static final int LOG_OTHER_EXCEPTIONS = 8; public static final int LOG_NONTEAM_EXCEPTIONS = LOG_CORE_EXCEPTIONS | LOG_OTHER_EXCEPTIONS; /** * Convenience method for showing an error dialog * @param shell a valid shell or null * @param exception the exception to be report * @param title the title to be displayed * @return IStatus the status that was displayed to the user */ public static IStatus openError(Shell shell, String title, String message, Throwable exception) { return openError(shell, title, message, exception, LOG_OTHER_EXCEPTIONS); } /** * Convenience method for showing an error dialog * @param shell a valid shell or null * @param exception the exception to be report * @param title the title to be displayed * @param flags customized attributes for the error handling * @return IStatus the status that was displayed to the user */ public static IStatus openError(Shell providedShell, String title, String message, Throwable exception, int flags) { // Unwrap InvocationTargetExceptions if (exception instanceof InvocationTargetException) { Throwable target = ((InvocationTargetException)exception).getTargetException(); // re-throw any runtime exceptions or errors so they can be handled by the workbench if (target instanceof RuntimeException) { throw (RuntimeException)target; } if (target instanceof Error) { throw (Error)target; } return openError(providedShell, title, message, target, flags); } // Determine the status to be displayed (and possibly logged) IStatus status = null; boolean log = false; if (exception instanceof CoreException) { status = ((CoreException)exception).getStatus(); log = ((flags & LOG_CORE_EXCEPTIONS) > 0); } else if (exception instanceof TeamException) { status = ((TeamException)exception).getStatus(); log = ((flags & LOG_TEAM_EXCEPTIONS) > 0); } else if (exception instanceof InterruptedException) { return new CVSStatus(IStatus.OK, CVSUIMessages.ok); } else if (exception != null) { status = new CVSStatus(IStatus.ERROR, CVSUIMessages.internal, exception); log = ((flags & LOG_OTHER_EXCEPTIONS) > 0); if (title == null) title = CVSUIMessages.internal; } // Check for a build error and report it differently if (status.getCode() == IResourceStatus.BUILD_FAILED) { message = CVSUIMessages.buildError; log = true; } // Check for multi-status with only one child if (status.isMultiStatus() && status.getChildren().length == 1) { status = status.getChildren()[0]; } if (status.isOK()) return status; // Log if the user requested it if (log) CVSUIPlugin.log(status.getSeverity(), status.getMessage(), exception); // Create a runnable that will display the error status final String displayTitle = title; final String displayMessage = message; final IStatus displayStatus = status; final IOpenableInShell openable = new IOpenableInShell() { public void open(Shell shell) { if (displayStatus.getSeverity() == IStatus.INFO && !displayStatus.isMultiStatus()) { MessageDialog.openInformation(shell, CVSUIMessages.information, displayStatus.getMessage()); } else { ErrorDialog.openError(shell, displayTitle, displayMessage, displayStatus); } } }; openDialog(providedShell, openable, flags); // return the status we display return status; } /** * Interface that allows a shell to be passed to an open method. The * provided shell can be used without sync-execing, etc. */ public interface IOpenableInShell { public void open(Shell shell); } /** * Open the dialog code provided in the IOpenableInShell, ensuring that * the provided shell is valid. This method will provide a shell to the * IOpenableInShell if one is not provided to the method. * * @param providedShell * @param openable * @param flags */ public static void openDialog(Shell providedShell, final IOpenableInShell openable, int flags) { // If no shell was provided, try to get one from the active window if (providedShell == null) { IWorkbenchWindow window = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow(); if (window != null) { providedShell = window.getShell(); // sync-exec when we do this just in case flags = flags | PERFORM_SYNC_EXEC; } } // Create a runnable that will display the error status final Shell shell = providedShell; Runnable outerRunnable = new Runnable() { public void run() { Shell displayShell; if (shell == null) { Display display = Display.getCurrent(); displayShell = new Shell(display); } else { displayShell = shell; } openable.open(displayShell); if (shell == null) { displayShell.dispose(); } } }; // Execute the above runnable as determined by the parameters if (shell == null || (flags & PERFORM_SYNC_EXEC) > 0) { Display display; if (shell == null) { display = Display.getCurrent(); if (display == null) { display = Display.getDefault(); } } else { display = shell.getDisplay(); } display.syncExec(outerRunnable); } else { outerRunnable.run(); } } /** * Initializes the preferences for this plugin if necessary. */ protected void initializeDefaultPluginPreferences() { IPreferenceStore store = getPreferenceStore(); // Get the plugin preferences for CVS Core Preferences corePrefs = CVSProviderPlugin.getPlugin().getPluginPreferences(); store.setDefault(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY, false); store.setDefault(ICVSUIConstants.PREF_SHOW_COMMENTS, true); store.setDefault(ICVSUIConstants.PREF_WRAP_COMMENTS, true); store.setDefault(ICVSUIConstants.PREF_SHOW_TAGS, true); store.setDefault(ICVSUIConstants.PREF_SHOW_SEARCH, false); store.setDefault(ICVSUIConstants.PREF_REVISION_MODE, 0); store.setDefault(ICVSUIConstants.PREF_GROUPBYDATE_MODE, true); store.setDefault(ICVSUIConstants.PREF_HISTORY_VIEW_EDITOR_LINKING, false); store.setDefault(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES, CVSProviderPlugin.DEFAULT_PRUNE); store.setDefault(ICVSUIConstants.PREF_TIMEOUT, CVSProviderPlugin.DEFAULT_TIMEOUT); store.setDefault(ICVSUIConstants.PREF_CONSIDER_CONTENTS, true); store.setDefault(ICVSUIConstants.PREF_COMPRESSION_LEVEL, CVSProviderPlugin.DEFAULT_COMPRESSION_LEVEL); store.setDefault(ICVSUIConstants.PREF_TEXT_KSUBST, CVSProviderPlugin.DEFAULT_TEXT_KSUBST_OPTION.toMode()); store.setDefault(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND, true); store.setDefault(ICVSUIConstants.PREF_REPLACE_UNMANAGED, true); store.setDefault(ICVSUIConstants.PREF_CVS_RSH, CVSProviderPlugin.DEFAULT_CVS_RSH); store.setDefault(ICVSUIConstants.PREF_CVS_RSH_PARAMETERS, CVSProviderPlugin.DEFAULT_CVS_RSH_PARAMETERS); store.setDefault(ICVSUIConstants.PREF_CVS_SERVER, CVSProviderPlugin.DEFAULT_CVS_SERVER); store.setDefault(ICVSUIConstants.PREF_EXT_CONNECTION_METHOD_PROXY, "ext"); //$NON-NLS-1$ store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_CHANGE_GRANULARITY, true); store.setDefault(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION, true); store.setDefault(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, CVSProviderPlugin.DEFAULT_CONFIRM_MOVE_TAG); store.setDefault(ICVSUIConstants.PREF_DEBUG_PROTOCOL, false); store.setDefault(ICVSUIConstants.PREF_WARN_REMEMBERING_MERGES, true); store.setDefault(ICVSUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG, false); store.setDefault(ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false); store.setDefault(ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, false); store.setDefault(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, true); store.setDefault(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, false); store.setDefault(ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT, false); store.setDefault(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, 1000); store.setDefault(ICVSUIConstants.PREF_COMMIT_COMMENTS_MAX_HISTORY, RepositoryManager.DEFAULT_MAX_COMMENTS); PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0)); PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_MESSAGE_COLOR, new RGB(0, 0, 255)); PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_ERROR_COLOR, new RGB(255, 0, 0)); store.setDefault(ICVSUIConstants.PREF_CONSOLE_SHOW_ON_MESSAGE, false); store.setDefault(ICVSUIConstants.PREF_CONSOLE_LIMIT_OUTPUT, true); store.setDefault(ICVSUIConstants.PREF_CONSOLE_HIGH_WATER_MARK, 500000); store.setDefault(ICVSUIConstants.PREF_CONSOLE_WRAP, false); store.setDefault(ICVSUIConstants.PREF_CONSOLE_WIDTH, 80); store.setDefault(ICVSUIConstants.PREF_FILETEXT_DECORATION, CVSDecoratorConfiguration.DEFAULT_FILETEXTFORMAT); store.setDefault(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION, CVSDecoratorConfiguration.DEFAULT_FOLDERTEXTFORMAT); store.setDefault(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION, CVSDecoratorConfiguration.DEFAULT_PROJECTTEXTFORMAT); store.setDefault(ICVSUIConstants.PREF_FIRST_STARTUP, true); store.setDefault(ICVSUIConstants.PREF_ADDED_FLAG, CVSDecoratorConfiguration.DEFAULT_ADDED_FLAG); store.setDefault(ICVSUIConstants.PREF_DIRTY_FLAG, CVSDecoratorConfiguration.DEFAULT_DIRTY_FLAG); store.setDefault(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, true); store.setDefault(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION, true); store.setDefault(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, false); store.setDefault(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, true); store.setDefault(ICVSUIConstants.PREF_CALCULATE_DIRTY, true); store.setDefault(ICVSUIConstants.PREF_USE_FONT_DECORATORS, false); store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_MIXED_TAGS, true); store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_SAVING_IN_SYNC, true); store.setDefault(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, ICVSUIConstants.OPTION_PROMPT); store.setDefault(ICVSUIConstants.PREF_DEFAULT_PERSPECTIVE_FOR_SHOW_ANNOTATIONS, CVSPerspective.ID); store.setDefault(ICVSUIConstants.PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS, MessageDialogWithToggle.PROMPT); store.setDefault(ICVSUIConstants.PREF_USE_QUICKDIFFANNOTATE, MessageDialogWithToggle.PROMPT); store.setDefault(ICVSUIConstants.PREF_ANNOTATE_PROMPTFORBINARY, MessageDialogWithToggle.PROMPT); store.setDefault(ICVSUIConstants.PREF_ALLOW_EMPTY_COMMIT_COMMENTS, MessageDialogWithToggle.PROMPT); store.setDefault(ICVSUIConstants.PREF_INCLUDE_CHANGE_SETS_IN_COMMIT, MessageDialogWithToggle.NEVER); store.setDefault(ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_WARNINGS, MessageDialogWithToggle.ALWAYS); store.setDefault(ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_ERRORS, MessageDialogWithToggle.PROMPT); store.setDefault(ICVSUIConstants.PREF_UPDATE_HANDLING, ICVSUIConstants.PREF_UPDATE_HANDLING_PERFORM); store.setDefault(ICVSUIConstants.PREF_UPDATE_PREVIEW, ICVSUIConstants.PREF_UPDATE_PREVIEW_IN_SYNCVIEW); store.setDefault(ICVSUIConstants.PREF_ENABLE_MODEL_SYNC, true); // Set the watch/edit preferences defaults and values store.setDefault(ICVSUIConstants.PREF_CHECKOUT_READ_ONLY, corePrefs.getDefaultBoolean(CVSProviderPlugin.READ_ONLY)); store.setDefault(ICVSUIConstants.PREF_EDIT_ACTION, ICVSUIConstants.PREF_EDIT_IN_BACKGROUND); store.setDefault(ICVSUIConstants.PREF_EDIT_PROMPT, ICVSUIConstants.PREF_EDIT_PROMPT_IF_EDITORS); store.setDefault(ICVSUIConstants.PREF_UPDATE_PROMPT, ICVSUIConstants.PREF_UPDATE_PROMPT_NEVER); // Ensure that the preference values in UI match Core store.setValue(ICVSUIConstants.PREF_CHECKOUT_READ_ONLY, corePrefs.getBoolean(CVSProviderPlugin.READ_ONLY)); // Forward the values to the CVS plugin CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES)); CVSProviderPlugin.getPlugin().setTimeout(store.getInt(ICVSUIConstants.PREF_TIMEOUT)); CVSProviderPlugin.getPlugin().setCvsRshCommand(store.getString(ICVSUIConstants.PREF_CVS_RSH)); CVSProviderPlugin.getPlugin().setCvsRshParameters(store.getString(ICVSUIConstants.PREF_CVS_RSH_PARAMETERS)); CVSProviderPlugin.getPlugin().setCvsServer(store.getString(ICVSUIConstants.PREF_CVS_SERVER)); CVSRepositoryLocation.setExtConnectionMethodProxy(store.getString(ICVSUIConstants.PREF_EXT_CONNECTION_METHOD_PROXY)); CVSProviderPlugin.getPlugin().setQuietness(CVSPreferencesPage.getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS))); CVSProviderPlugin.getPlugin().setCompressionLevel(store.getInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL)); CVSProviderPlugin.getPlugin().setReplaceUnmanaged(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED)); CVSProviderPlugin.getPlugin().setDefaultTextKSubstOption(KSubstOption.fromMode(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST))); CVSProviderPlugin.getPlugin().setUsePlatformLineend(store.getBoolean(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND)); CVSProviderPlugin.getPlugin().setRepositoriesAreBinary(store.getBoolean(ICVSUIConstants.PREF_REPOSITORIES_ARE_BINARY)); CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION)); CVSProviderPlugin.getPlugin().setDebugProtocol(CVSProviderPlugin.getPlugin().isDebugProtocol() || store.getBoolean(ICVSUIConstants.PREF_DEBUG_PROTOCOL)); CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT)); // proxy configuration store.setDefault(ICVSUIConstants.PREF_USE_PROXY, false); store.setDefault(ICVSUIConstants.PREF_PROXY_TYPE, CVSProviderPlugin.PROXY_TYPE_HTTP); store.setDefault(ICVSUIConstants.PREF_PROXY_HOST, ""); //$NON-NLS-1$ store.setDefault(ICVSUIConstants.PREF_PROXY_PORT, CVSProviderPlugin.HTTP_DEFAULT_PORT); store.setDefault(ICVSUIConstants.PREF_PROXY_AUTH, false); CVSProviderPlugin.getPlugin().setUseProxy(store.getBoolean(ICVSUIConstants.PREF_USE_PROXY)); CVSProviderPlugin.getPlugin().setProxyType(store.getString(ICVSUIConstants.PREF_PROXY_TYPE)); CVSProviderPlugin.getPlugin().setProxyHost(store.getString(ICVSUIConstants.PREF_PROXY_HOST)); CVSProviderPlugin.getPlugin().setProxyPort(store.getString(ICVSUIConstants.PREF_PROXY_PORT)); CVSProviderPlugin.getPlugin().setUseProxyAuth(store.getBoolean(ICVSUIConstants.PREF_PROXY_AUTH)); // code to transfer CVS preference to Team preference if (store.getBoolean(ICVSUIConstants.PREF_SHOW_AUTHOR_IN_EDITOR)) { store.setValue(ICVSUIConstants.PREF_SHOW_AUTHOR_IN_EDITOR, false); IPreferenceStore teamStore = TeamUIPlugin.getPlugin().getPreferenceStore(); if (teamStore.isDefault(IPreferenceIds.SHOW_AUTHOR_IN_COMPARE_EDITOR)) teamStore.setValue(IPreferenceIds.SHOW_AUTHOR_IN_COMPARE_EDITOR, true); } } /** * @see Plugin#start(BundleContext) */ public void start(BundleContext context) throws Exception { super.start(context); initializeImages(); CVSAdapterFactory factory = new CVSAdapterFactory(); Platform.getAdapterManager().registerAdapters(factory, ICVSRemoteFile.class); Platform.getAdapterManager().registerAdapters(factory, ICVSRemoteFolder.class); Platform.getAdapterManager().registerAdapters(factory, ICVSRepositoryLocation.class); Platform.getAdapterManager().registerAdapters(factory, RepositoryRoot.class); try { console = new CVSOutputConsole(); } catch (RuntimeException e) { // Don't let the console bring down the CVS UI log(IStatus.ERROR, "Errors occurred starting the CVS console", e); //$NON-NLS-1$ } IPreferenceStore store = getPreferenceStore(); if (store.getBoolean(ICVSUIConstants.PREF_FIRST_STARTUP)) { // If we enable the decorator in the XML, the CVS plugin will be loaded // on startup even if the user never uses CVS. Therefore, we enable the // decorator on the first start of the CVS plugin since this indicates that // the user has done something with CVS. Subsequent startups will load // the CVS plugin unless the user disables the decorator. In this case, // we will not re-enable since we only enable automatically on the first startup. PlatformUI.getWorkbench().getDecoratorManager().setEnabled(CVSLightweightDecorator.ID, true); store.setValue(ICVSUIConstants.PREF_FIRST_STARTUP, false); } } /** * @see Plugin#stop(BundleContext) */ public void stop(BundleContext context) throws Exception { try { try { if (repositoryManager != null) repositoryManager.shutdown(); } catch (TeamException e) { throw new CoreException(e.getStatus()); } if (console != null) console.shutdown(); } finally { super.stop(context); } } /** * @return the CVS console */ public CVSOutputConsole getConsole() { return console; } public void openEditor(ICVSRemoteFile file, IProgressMonitor monitor) throws InvocationTargetException { IWorkbench workbench = getWorkbench(); IEditorRegistry registry = workbench.getEditorRegistry(); IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); String filename = file.getName(); InputStream contents = null; try { contents = file.getContents(monitor); } catch (TeamException e) { CVSUIPlugin.log(new CVSStatus(IStatus.ERROR, NLS.bind("An error occurred fetching the contents of file {0}", new String[] { file.getRepositoryRelativePath()}, e))); //$NON-NLS-1$ } IContentType type = null; if (contents != null) { try { type = Platform.getContentTypeManager().findContentTypeFor(contents, filename); } catch (IOException e) { CVSUIPlugin.log(new CVSStatus(IStatus.ERROR, NLS.bind("An error occurred reading the contents of file {0}", new String[] { file.getRepositoryRelativePath()}, e))); //$NON-NLS-1$ } } if (type == null) { type = Platform.getContentTypeManager().findContentTypeFor(filename); } IEditorDescriptor descriptor = registry.getDefaultEditor(filename, type); String id; if (descriptor == null) { id = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$ } else { id = descriptor.getId(); } try { try { page.openEditor(new RemoteFileEditorInput(file, monitor), id); } catch (PartInitException e) { if (id.equals("org.eclipse.ui.DefaultTextEditor")) { //$NON-NLS-1$ throw e; } else { page.openEditor(new RemoteFileEditorInput(file, monitor), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$ } } } catch (PartInitException e) { throw new InvocationTargetException(e); } } /** * Helper method which access the preference store to determine if the * project name from the project description file (.project) should be used * as the project name on checkout. */ public boolean isUseProjectNameOnCheckout() { return getPreferenceStore().getBoolean(ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT); } public ActiveChangeSetManager getChangeSetManager() { return CVSProviderPlugin.getPlugin().getChangeSetManager(); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java index 39cee0f42..1f9085542 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java @@ -1,245 +1,246 @@ /******************************************************************************* * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation * Philippe Ombredanne - bug 84808 * William Mitsuda ([email protected]) - Bug 153879 [Wizards] configurable size of cvs commit comment history + * Brock Janiczak <[email protected]> - Bug 161536 Warn user when committing resources with problem markers *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; public interface ICVSUIConstants { public final String PREFIX = CVSUIPlugin.ID + "."; //$NON-NLS-1$ // image path public final String ICON_PATH = "$nl$/icons/full/"; //$NON-NLS-1$ // images public final String IMG_CVS_CONSOLE = "eview16/console_view.gif"; //$NON-NLS-1$ public final String IMG_CVS_PERSPECTIVE = "eview16/cvs_persp.gif"; //$NON-NLS-1$ public final String IMG_COMPARE_VIEW = "eview16/compare_view.gif"; //$NON-NLS-1$ // overlays public final String IMG_MERGEABLE_CONFLICT = "ovr16/confauto_ov.gif"; //$NON-NLS-1$ public final String IMG_QUESTIONABLE = "ovr16/question_ov.gif"; //$NON-NLS-1$ public final String IMG_MERGED = "ovr16/merged_ov.gif"; //$NON-NLS-1$ public final String IMG_EDITED = "ovr16/edited_ov.gif"; //$NON-NLS-1$ public final String IMG_NO_REMOTEDIR = "ovr16/no_remotedir_ov.gif"; //$NON-NLS-1$ // objects public final String IMG_REPOSITORY = "obj16/repository_rep.gif"; //$NON-NLS-1$ public final String IMG_TAG = "obj16/tag.gif"; //$NON-NLS-1$ public final String IMG_BRANCHES_CATEGORY = "obj16/branches_rep.gif"; //$NON-NLS-1$ public final String IMG_VERSIONS_CATEGORY = "obj16/versions_rep.gif"; //$NON-NLS-1$ public final String IMG_DATES_CATEGORY = "obj16/dates.gif"; //$NON-NLS-1$ public final String IMG_MODULE = "obj16/module_rep.gif"; //$NON-NLS-1$ public final String IMG_PROJECT_VERSION = "obj16/prjversions_rep.gif"; //$NON-NLS-1$ public final String IMG_DATE = "obj16/date.gif"; //$NON-NLS-1$ public final String IMG_CHANGELOG = "obj16/changelog_obj.gif"; //$NON-NLS-1$ public final String IMG_LOCALREVISION_TABLE = "obj16/local_entry_tbl.gif"; //$NON-NLS-1$ public final String IMG_REMOTEREVISION_TABLE = "obj16/remote_entry_tbl.gif"; //$NON-NLS-1$ // toolbar public final String IMG_REFRESH = "elcl16/refresh.gif"; //$NON-NLS-1$ public final String IMG_CLEAR = "elcl16/clear_co.gif"; //$NON-NLS-1$ public final String IMG_COLLAPSE_ALL = "elcl16/collapseall.gif"; //$NON-NLS-1$ public final String IMG_LINK_WITH_EDITOR = "elcl16/synced.gif"; //$NON-NLS-1$ public final String IMG_REMOVE_CONSOLE = "elcl16/console_rem.gif"; //$NON-NLS-1$ public final String IMG_REMOTEMODE = "elcl16/remote_history_mode.gif"; //$NON-NLS-1$ public final String IMG_LOCALMODE = "elcl16/local_history_mode.gif"; //$NON-NLS-1$ public final String IMG_LOCALREMOTE_MODE = "elcl16/all_history_mode.gif"; //$NON-NLS-1$ // toolbar (disabled) public final String IMG_REFRESH_DISABLED = "dlcl16/refresh.gif"; //$NON-NLS-1$ public final String IMG_CLEAR_DISABLED = "dlcl16/clear_co.gif"; //$NON-NLS-1$ public final String IMG_REMOVE_CONSOLE_DISABLED = "dlcl16/console_rem.gif"; //$NON-NLS-1$ public final String IMG_REMOTEMODE_DISABLED = "dlcl16/remote_history_mode.gif"; //$NON-NLS-1$ public final String IMG_LOCALMODE_DISABLED = "dlcl16/local_history_mode.gif"; //$NON-NLS-1$ public final String IMG_LOCALREMOTE_MODE_DISABLED = "dlcl16/all_history_mode.gif"; //$NON-NLS-1$ // toolbar (enabled) public final String IMG_REFRESH_ENABLED = "elcl16/refresh.gif"; //$NON-NLS-1$ public final String IMG_CLEAR_ENABLED = "elcl16/clear_co.gif"; //$NON-NLS-1$ public final String IMG_COLLAPSE_ALL_ENABLED = "elcl16/collapseall.gif"; //$NON-NLS-1$ public final String IMG_LINK_WITH_EDITOR_ENABLED = "elcl16/synced.gif"; //$NON-NLS-1$ //history page toolbar public final String IMG_FILTER_HISTORY = "elcl16/filter_history.gif"; //$NON-NLS-1$ // wizards public final String IMG_NEWLOCATION = "etool16/newlocation_wiz.gif"; //$NON-NLS-1$ public final String IMG_CVSLOGO = "etool16/newconnect_wiz.gif"; //$NON-NLS-1$ // preferences public final String PREF_REVISION_MODE = "pref_revision_mode"; //$NON-NLS-1$ public final String PREF_GROUPBYDATE_MODE = "pref_groupbydate_mode"; //$NON-NLS-1$ public final String PREF_SHOW_COMMENTS = "pref_show_comments"; //$NON-NLS-1$ public final String PREF_WRAP_COMMENTS = "pref_wrap_comments"; //$NON-NLS-1$ public final String PREF_SHOW_TAGS = "pref_show_tags"; //$NON-NLS-1$ public final String PREF_SHOW_SEARCH = "pref_show_search"; //$NON-NLS-1$ public final String PREF_HISTORY_VIEW_EDITOR_LINKING = "pref_history_view_linking"; //$NON-NLS-1$ public final String PREF_PRUNE_EMPTY_DIRECTORIES = "pref_prune_empty_directories"; //$NON-NLS-1$ public final String PREF_TIMEOUT = "pref_timeout"; //$NON-NLS-1$ public final String PREF_QUIETNESS = "pref_quietness"; //$NON-NLS-1$ public final String PREF_CVS_RSH = "pref_cvs_rsh"; //$NON-NLS-1$ public final String PREF_CVS_RSH_PARAMETERS = "pref_cvs_rsh_parameters"; //$NON-NLS-1$ public final String PREF_CVS_SERVER = "pref_cvs_server"; //$NON-NLS-1$ public final String PREF_CONSIDER_CONTENTS = "pref_consider_contents"; //$NON-NLS-1$ public final String PREF_REPLACE_UNMANAGED = "pref_replace_unmanaged"; //$NON-NLS-1$ public final String PREF_COMPRESSION_LEVEL = "pref_compression_level"; //$NON-NLS-1$ public final String PREF_TEXT_KSUBST = "pref_text_ksubst"; //$NON-NLS-1$ public final String PREF_USE_PLATFORM_LINEEND = "pref_lineend"; //$NON-NLS-1$ public final String PREF_PROMPT_ON_MIXED_TAGS = "pref_prompt_on_mixed_tags"; //$NON-NLS-1$ public final String PREF_PROMPT_ON_SAVING_IN_SYNC = "pref_prompt_on_saving_in_sync"; //$NON-NLS-1$ public final String PREF_SAVE_DIRTY_EDITORS = "pref_save_dirty_editors"; //$NON-NLS-1$ public final String PREF_PROMPT_ON_CHANGE_GRANULARITY = "pref_prompt_on_change_granularity"; //$NON-NLS-1$ public final String PREF_REPOSITORIES_ARE_BINARY = "pref_repositories_are_binary"; //$NON-NLS-1$ public final String PREF_DETERMINE_SERVER_VERSION = "pref_determine_server_version"; //$NON-NLS-1$ public final String PREF_CONFIRM_MOVE_TAG = "pref_confirm_move_tag"; //$NON-NLS-1$ public final String PREF_DEBUG_PROTOCOL = "pref_debug_protocol"; //$NON-NLS-1$ public final String PREF_WARN_REMEMBERING_MERGES = "pref_remember_merges"; //$NON-NLS-1$ public final String PREF_FIRST_STARTUP = "pref_first_startup"; //$NON-NLS-1$ public final String PREF_EXT_CONNECTION_METHOD_PROXY = "pref_ext_connection_method_proxy"; //$NON-NLS-1$ public final String PREF_SHOW_COMPARE_REVISION_IN_DIALOG = "pref_show_compare_revision_in_dialog"; //$NON-NLS-1$ public final String PREF_SHOW_AUTHOR_IN_EDITOR = "pref_show_author_in_editor"; //$NON-NLS-1$ public final String PREF_COMMIT_SET_DEFAULT_ENABLEMENT = "pref_enable_commit_sets"; //$NON-NLS-1$ public final String PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG = "pref_auto_refresh_tags_in_tag_selection_dialog"; //$NON-NLS-1$ public final String PREF_COMMIT_FILES_DISPLAY_THRESHOLD = "pref_commit_files_display_threshold"; //$NON-NLS-1$ public final String PREF_COMMIT_COMMENTS_MAX_HISTORY = "pref_commit_comments_max_history"; //$NON-NLS-1$ public final String PREF_AUTO_SHARE_ON_IMPORT = "pref_auto_share_on_import"; //$NON-NLS-1$ public final String PREF_ENABLE_WATCH_ON_EDIT = "pref_enable_watch_on_edit"; //$NON-NLS-1$ public final String PREF_USE_PROJECT_NAME_ON_CHECKOUT = "pref_use_project_name_on_checkout"; //$NON-NLS-1$ public final String PREF_USE_QUICKDIFFANNOTATE = "pref_use_quickdiffannotate"; //$NON-NLS-1$ public final String PREF_INCLUDE_CHANGE_SETS_IN_COMMIT = "pref_include_change_sets"; //$NON-NLS-1$ public final String PREF_ANNOTATE_PROMPTFORBINARY = "pref_annotate_promptforbinary"; //$NON-NLS-1$ public final String PREF_ALLOW_COMMIT_WITH_WARNINGS = "pref_commit_with_warning"; //$NON-NLS-1$ public final String PREF_ALLOW_COMMIT_WITH_ERRORS = "pref_commit_with_errors"; //$NON-NLS-1$ // console preferences public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$ public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$ public final String PREF_CONSOLE_ERROR_COLOR = "pref_console_error_color"; //$NON-NLS-1$ public final String PREF_CONSOLE_FONT = "pref_console_font"; //$NON-NLS-1$ public final String PREF_CONSOLE_SHOW_ON_MESSAGE = "pref_console_show_on_message"; //$NON-NLS-1$ public final String PREF_CONSOLE_LIMIT_OUTPUT = "pref_console_limit_output"; //$NON-NLS-1$ public final String PREF_CONSOLE_HIGH_WATER_MARK = "pref_console_high_water_mark"; //$NON-NLS-1$ public final String PREF_CONSOLE_WRAP = "pref_console_wrap"; //$NON-NLS-1$ public final String PREF_CONSOLE_WIDTH = "pref_console_width"; //$NON-NLS-1$ // decorator preferences public final String PREF_FILETEXT_DECORATION = "pref_filetext_decoration"; //$NON-NLS-1$ public final String PREF_FOLDERTEXT_DECORATION = "pref_foldertext_decoration"; //$NON-NLS-1$ public final String PREF_PROJECTTEXT_DECORATION = "pref_projecttext_decoration"; //$NON-NLS-1$ public final String PREF_SHOW_DIRTY_DECORATION = "pref_show_overlaydirty"; //$NON-NLS-1$ public final String PREF_SHOW_ADDED_DECORATION = "pref_show_added"; //$NON-NLS-1$ public final String PREF_SHOW_HASREMOTE_DECORATION = "pref_show_hasremote"; //$NON-NLS-1$ public final String PREF_SHOW_NEWRESOURCE_DECORATION = "pref_show_newresource"; //$NON-NLS-1$ public final String PREF_DIRTY_FLAG = "pref_dirty_flag"; //$NON-NLS-1$ public final String PREF_ADDED_FLAG = "pref_added_flag"; //$NON-NLS-1$ public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty"; //$NON-NLS-1$ public final String PREF_USE_FONT_DECORATORS= "pref_use_font_decorators"; //$NON-NLS-1$ // watch/edit preferences public final String PREF_CHECKOUT_READ_ONLY = "pref_checkout_read_only"; //$NON-NLS-1$ public final String PREF_EDIT_ACTION = "pref_edit_action"; //$NON-NLS-1$ public final String PREF_EDIT_PROMPT_EDIT = "edit"; //$NON-NLS-1$ public final String PREF_EDIT_PROMPT_HIGHJACK = "highjack"; //$NON-NLS-1$ public final String PREF_EDIT_IN_BACKGROUND = "editInBackground"; //$NON-NLS-1$ public final String PREF_EDIT_PROMPT = "pref_edit_prompt"; //$NON-NLS-1$ public final String PREF_EDIT_PROMPT_NEVER = "never"; //$NON-NLS-1$ public final String PREF_EDIT_PROMPT_ALWAYS = "always"; //$NON-NLS-1$ public final String PREF_EDIT_PROMPT_IF_EDITORS = "only"; //$NON-NLS-1$ // update preferences public final String PREF_UPDATE_PROMPT = "pref_update_prompt"; //$NON-NLS-1$ public final String PREF_UPDATE_PROMPT_NEVER = "never"; //$NON-NLS-1$ public final String PREF_UPDATE_PROMPT_AUTO = "auto"; //$NON-NLS-1$ public final String PREF_UPDATE_PROMPT_IF_OUTDATED = "only"; //$NON-NLS-1$ // Repositories view preferences public final String PREF_GROUP_VERSIONS_BY_PROJECT = "pref_group_versions_by_project"; //$NON-NLS-1$ // Perspective changing preferences public final String PREF_CHANGE_PERSPECTIVE_ON_NEW_REPOSITORY_LOCATION = "pref_change_perspective_on_new_location"; //$NON-NLS-1$ public final String PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS= "pref_change_perspective_on_show_annotations"; //$NON-NLS-1$ public final String PREF_DEFAULT_PERSPECTIVE_FOR_SHOW_ANNOTATIONS= "pref_default_perspective_for_show_annotations"; //$NON-NLS-1$ public final String PREF_ALLOW_EMPTY_COMMIT_COMMENTS= "pref_allow_empty_commit_comment"; //$NON-NLS-1$ public final String PREF_UPDATE_HANDLING = "pref_team_update_handling"; //$NON-NLS-1$ public final String PREF_UPDATE_HANDLING_PREVIEW = "previewUpdate"; //$NON-NLS-1$ public final String PREF_UPDATE_HANDLING_PERFORM = "performUpdate"; //$NON-NLS-1$ public final String PREF_UPDATE_HANDLING_TRADITIONAL = "traditionalUpdate"; //$NON-NLS-1$ public final String PREF_UPDATE_PREVIEW = "pref_update_preview"; //$NON-NLS-1$ public final String PREF_UPDATE_PREVIEW_IN_DIALOG = "dialog"; //$NON-NLS-1$ public final String PREF_UPDATE_PREVIEW_IN_SYNCVIEW = "syncView"; //$NON-NLS-1$ public final String PREF_ENABLE_MODEL_SYNC = "enableModelSync"; //$NON-NLS-1$ public final String PREF_USE_PROXY = "proxyEnabled"; //$NON-NLS-1$ public final String PREF_PROXY_TYPE = "proxyType"; //$NON-NLS-1$ public final String PREF_PROXY_HOST = "proxyHost"; //$NON-NLS-1$ public final String PREF_PROXY_PORT = "proxyPort"; //$NON-NLS-1$ public final String PREF_PROXY_AUTH = "proxyAuth"; //$NON-NLS-1$ // Wizard banners public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.png"; //$NON-NLS-1$ public final String IMG_WIZBAN_MERGE = "wizban/mergestream_wizban.png"; //$NON-NLS-1$ public final String IMG_WIZBAN_DIFF = "wizban/createpatch_wizban.png"; //$NON-NLS-1$ public final String IMG_WIZBAN_KEYWORD = "wizban/keywordsub_wizban.png"; //$NON-NLS-1$ public final String IMG_WIZBAN_NEW_LOCATION = "wizban/newlocation_wizban.png"; //$NON-NLS-1$ public final String IMG_WIZBAN_CHECKOUT = "wizban/newconnect_wizban.png"; //$NON-NLS-1$ public final String IMG_WIZBAN_IMPORT = "wizban/import_wiz.png"; //$NON-NLS-1$ // Properties public final String PROP_NAME = "cvs.name"; //$NON-NLS-1$ public final String PROP_REVISION = "cvs.revision"; //$NON-NLS-1$ public final String PROP_AUTHOR = "cvs.author"; //$NON-NLS-1$ public final String PROP_COMMENT = "cvs.comment"; //$NON-NLS-1$ public final String PROP_DATE = "cvs.date"; //$NON-NLS-1$ public final String PROP_DIRTY = "cvs.dirty"; //$NON-NLS-1$ public final String PROP_MODIFIED = "cvs.modified"; //$NON-NLS-1$ public final String PROP_KEYWORD = "cvs.date"; //$NON-NLS-1$ public final String PROP_TAG = "cvs.tag"; //$NON-NLS-1$ public final String PROP_PERMISSIONS = "cvs.permissions"; //$NON-NLS-1$ public final String PROP_HOST = "cvs.host"; //$NON-NLS-1$ public final String PROP_USER = "cvs.user"; //$NON-NLS-1$ public final String PROP_METHOD = "cvs.method"; //$NON-NLS-1$ public final String PROP_PORT = "cvs.port"; //$NON-NLS-1$ public final String PROP_ROOT = "cvs.root"; //$NON-NLS-1$ // preference options public final int OPTION_NEVER = 1; public final int OPTION_PROMPT = 2; public final int OPTION_AUTOMATIC = 3; public final String OPTION_NO_PERSPECTIVE= "none"; //$NON-NLS-1$ // Command Ids public final String CMD_COMMIT = "org.eclipse.team.cvs.ui.commit"; //$NON-NLS-1$ public final String CMD_SYNCHRONIZE = "org.eclipse.team.ui.synchronizeLast"; //$NON-NLS-1$ public final String CMD_UPDATE = "org.eclipse.team.cvs.ui.update"; //$NON-NLS-1$ public final String CMD_CREATEPATCH = "org.eclipse.team.cvs.ui.GenerateDiff"; //$NON-NLS-1$ public final String CMD_TAGASVERSION = "org.eclipse.team.cvs.ui.tag"; //$NON-NLS-1$ public final String CMD_BRANCH = "org.eclipse.team.cvs.ui.branch"; //$NON-NLS-1$ public final String CMD_MERGE = "org.eclipse.team.cvs.ui.merge"; //$NON-NLS-1$ public final String CMD_UPDATESWITCH = "org.eclipse.team.cvs.ui.updateSwitch"; //$NON-NLS-1$ public final String CMD_SETFILETYPE = "org.eclipse.team.cvs.ui.setKeywordSubstitution"; //$NON-NLS-1$ public final String CMD_ANNOTATE = "org.eclipse.team.cvs.ui.showAnnotation"; //$NON-NLS-1$ public final String CMD_HISTORY = "org.eclipse.team.cvs.ui.showHistory"; //$NON-NLS-1$ public final String CMD_ADD = "org.eclipse.team.cvs.ui.add"; //$NON-NLS-1$ public final String CMD_IGNORE = "org.eclipse.team.cvs.ui.ignore"; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java index 74a7c9ecd..9121cbf6d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java @@ -1,491 +1,492 @@ /******************************************************************************* * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation + * Brock Janiczak <[email protected]> - Bug 161536 Warn user when committing resources with problem markers *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.wizards; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import org.eclipse.core.resources.*; import org.eclipse.core.resources.mapping.ResourceTraversal; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.core.IFileContentManager; import org.eclipse.team.core.Team; import org.eclipse.team.core.synchronize.*; import org.eclipse.team.internal.ccvs.core.*; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.*; import org.eclipse.team.internal.ccvs.ui.operations.*; import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector; import org.eclipse.team.internal.ui.Policy; import org.eclipse.team.ui.synchronize.ResourceScope; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; /** * A wizard to commit the resources whose synchronization state is given in form * of a set of <code>SyncInfo</code>. */ public class CommitWizard extends ResizableWizard { /** * An operation to add and commit resources to a CVS repository. */ public static class AddAndCommitOperation extends CVSOperation { private final IResource[] fAllResources; private final String fComment; private Map fModesForExtensionsForOneTime; private Map fModesForNamesForOneTime; private IResource[] fNewResources; private IJobChangeListener jobListener; public AddAndCommitOperation(IWorkbenchPart part, IResource[] allResources, IResource[] newResources, String comment) { super(part); fAllResources = allResources; fNewResources = newResources; fModesForExtensionsForOneTime = Collections.EMPTY_MAP; fModesForNamesForOneTime= Collections.EMPTY_MAP; fComment = comment; } public void setModesForExtensionsForOneTime(Map modes) { if (modes != null) fModesForExtensionsForOneTime= modes; } public void setModesForNamesForOneTime(Map modes) { if (modes != null) fModesForNamesForOneTime= modes; } protected void execute(IProgressMonitor monitor) throws CVSException, InterruptedException { try { monitor.beginTask(null, (fNewResources.length + fAllResources.length) * 100); if (fNewResources.length > 0) { final AddOperation op= new AddOperation(getPart(), RepositoryProviderOperation.asResourceMappers(fNewResources)); op.addModesForExtensions(fModesForExtensionsForOneTime); op.addModesForNames(fModesForNamesForOneTime); op.run(Policy.subMonitorFor(monitor, fNewResources.length * 100)); } if (fAllResources.length > 0) { CommitOperation commitOperation = new CommitOperation(getPart(), RepositoryProviderOperation.asResourceMappers(fAllResources), new Command.LocalOption[0], fComment) { public boolean consultModelsForMappings() { // Do not consult models from the commit wizard return false; } }; commitOperation.run(Policy.subMonitorFor(monitor, fAllResources.length * 100)); } } catch (InvocationTargetException e) { throw CVSException.wrapException(e); } finally { monitor.done(); } } protected String getJobName() { return CVSUIMessages.CommitWizard_0; } protected String getTaskName() { return CVSUIMessages.CommitWizard_1; } /* * Set the job listener. It will only recieve scheduled and done * events as these are what are used by a sync model operation * to show busy state in the sync view. */ protected void setJobChangeListener(IJobChangeListener jobListener) { this.jobListener = jobListener; } /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.IJobChangeListener#done(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ public void done(IJobChangeEvent event) { super.done(event); if (jobListener != null) jobListener.done(event); } /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.IJobChangeListener#scheduled(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ public void scheduled(IJobChangeEvent event) { super.scheduled(event); if (jobListener != null) jobListener.scheduled(event); } } private final IResource[] fResources; private final SyncInfoSet fOutOfSyncInfos; private final SyncInfoSet fUnaddedInfos; private final CommitWizardParticipant fParticipant; private CommitWizardFileTypePage fFileTypePage; private CommitWizardCommitPage fCommitPage; private IJobChangeListener jobListener; private IWorkbenchPart part; public CommitWizard(SyncInfoSet infos) throws CVSException { this(infos.getResources()); } public CommitWizard(final IResource [] resources) throws CVSException { super(CVSUIMessages.CommitWizard_3, CVSUIPlugin.getPlugin().getDialogSettings()); setWindowTitle(CVSUIMessages.CommitWizard_2); setDefaultPageImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); fResources= resources; fParticipant= new CommitWizardParticipant(new ResourceScope(fResources), this); SyncInfoSet infos = getAllOutOfSync(); fOutOfSyncInfos= new SyncInfoSet(infos.getNodes(new FastSyncInfoFilter.SyncInfoDirectionFilter(new int [] { SyncInfo.OUTGOING, SyncInfo.CONFLICTING }))); fUnaddedInfos= getUnaddedInfos(fOutOfSyncInfos); } public CommitWizard(SyncInfoSet infos, IJobChangeListener jobListener) throws CVSException { this(infos); this.jobListener = jobListener; } private SyncInfoSet getAllOutOfSync() throws CVSException { final SubscriberSyncInfoCollector syncInfoCollector = fParticipant.getSubscriberSyncInfoCollector(); try { PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { monitor.beginTask(CVSUIMessages.CommitWizard_4, IProgressMonitor.UNKNOWN); syncInfoCollector.waitForCollector(monitor); monitor.done(); } }); } catch (InvocationTargetException e) { throw CVSException.wrapException(e); } catch (InterruptedException e) { throw new OperationCanceledException(); } return fParticipant.getSyncInfoSet(); } public boolean hasOutgoingChanges() { return fOutOfSyncInfos.size() > 0; } public int getHighestProblemSeverity() { IResource[] resources = fOutOfSyncInfos.getResources(); int mostSeriousSeverity = -1; for (int i = 0; i < resources.length; i++) { IResource resource = resources[i]; try { IMarker[] problems = resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO); for (int j = 0; j < problems.length; j++) { IMarker problem = problems[j]; int severity = problem.getAttribute(IMarker.SEVERITY, 0); if (severity > mostSeriousSeverity) { mostSeriousSeverity = severity; } } } catch (CoreException e) { } } return mostSeriousSeverity; } public CommitWizardFileTypePage getFileTypePage() { return fFileTypePage; } public CommitWizardCommitPage getCommitPage() { return fCommitPage; } public CommitWizardParticipant getParticipant() { return fParticipant; } public boolean canFinish() { final IWizardPage current= getContainer().getCurrentPage(); if (current == fFileTypePage && fCommitPage != null) return false; return super.canFinish(); } public boolean performFinish() { final String comment= fCommitPage.getComment(getShell()); if (comment == null) return false; final SyncInfoSet infos= fCommitPage.getInfosToCommit(); if (infos.size() == 0) return true; final SyncInfoSet unadded; try { unadded = getUnaddedInfos(infos); } catch (CVSException e1) { return false; } final SyncInfoSet files; try { files = getFiles(infos); } catch (CVSException e1) { return false; } final AddAndCommitOperation operation= new AddAndCommitOperation(getPart(), files.getResources(), unadded.getResources(), comment); if (jobListener != null) operation.setJobChangeListener(jobListener); if (fFileTypePage != null) { final Map extensionsToSave= new HashMap(); final Map extensionsNotToSave= new HashMap(); fFileTypePage.getModesForExtensions(extensionsToSave, extensionsNotToSave); CommitWizardFileTypePage.saveExtensionMappings(extensionsToSave); operation.setModesForExtensionsForOneTime(extensionsNotToSave); final Map namesToSave= new HashMap(); final Map namesNotToSave= new HashMap(); fFileTypePage.getModesForNames(namesToSave, namesNotToSave); CommitWizardFileTypePage.saveNameMappings(namesToSave); operation.setModesForNamesForOneTime(namesNotToSave); } try { operation.run(); } catch (InvocationTargetException e) { return false; } catch (InterruptedException e) { return false; } return super.performFinish(); } public void addPages() { final Collection names= new HashSet(); final Collection extensions= new HashSet(); getUnknownNamesAndExtension(fUnaddedInfos, names, extensions); if (names.size() + extensions.size() > 0) { fFileTypePage= new CommitWizardFileTypePage(extensions, names); addPage(fFileTypePage); } fCommitPage= new CommitWizardCommitPage(fResources, this); addPage(fCommitPage); super.addPages(); } public void dispose() { fParticipant.dispose(); super.dispose(); } public static void run(IWorkbenchPart part, Shell shell, IResource [] resources) throws CVSException { try { CommitWizard commitWizard = new CommitWizard(resources); commitWizard.setPart(part); run(shell, commitWizard); } catch (OperationCanceledException e) { // Ignore } } private void setPart(IWorkbenchPart part) { this.part = part; } public static void run(Shell shell, SyncInfoSet infos, IJobChangeListener jobListener) throws CVSException { try { run(shell, new CommitWizard(infos, jobListener)); } catch (OperationCanceledException e) { // Ignore } } public static void run(IWorkbenchPart part, Shell shell, final ResourceTraversal[] traversals) throws CVSException { try { final IResource [][] resources = new IResource[][] { null }; PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { resources[0] = getDeepResourcesToCommit(traversals, monitor); } catch (CoreException e) { throw new InvocationTargetException(e); } } }); run(part, shell, resources[0]); } catch (OperationCanceledException e) { // Ignore } catch (InvocationTargetException e) { throw CVSException.wrapException(e); } catch (InterruptedException e) { // Ignore } } private IWorkbenchPart getPart() { if (part != null) return part; return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().getActivePart(); } private static void run(Shell shell, CommitWizard wizard) { if (!wizard.hasOutgoingChanges()) { MessageDialog.openInformation(shell, CVSUIMessages.CommitWizard_6, CVSUIMessages.CommitWizard_7); // } else { int highestProblemSeverity = wizard.getHighestProblemSeverity(); IPreferenceStore preferenceStore = CVSUIPlugin.getPlugin().getPreferenceStore(); switch (highestProblemSeverity) { case IMarker.SEVERITY_WARNING: String allowCommitsWithWarnings = preferenceStore.getString(ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_WARNINGS); if (MessageDialogWithToggle.PROMPT.equals(allowCommitsWithWarnings) || MessageDialogWithToggle.NEVER.equals(allowCommitsWithWarnings)) { MessageDialogWithToggle warningDialog = MessageDialogWithToggle.openYesNoQuestion(shell, CVSUIMessages.CommitWizard_8, CVSUIMessages.CommitWizard_9, CVSUIMessages.CommitWizard_10, false, preferenceStore, ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_WARNINGS); if (IDialogConstants.YES_ID != warningDialog.getReturnCode()) { return; } } break; case IMarker.SEVERITY_ERROR: String allowCommitsWithErrors = preferenceStore.getString(ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_ERRORS); if (MessageDialogWithToggle.PROMPT.equals(allowCommitsWithErrors) || MessageDialogWithToggle.NEVER.equals(allowCommitsWithErrors)) { MessageDialogWithToggle errorDialog = MessageDialogWithToggle.openYesNoQuestion(shell, CVSUIMessages.CommitWizard_11, CVSUIMessages.CommitWizard_12, CVSUIMessages.CommitWizard_13, false, preferenceStore, ICVSUIConstants.PREF_ALLOW_COMMIT_WITH_ERRORS); if (IDialogConstants.YES_ID != errorDialog.getReturnCode()) { return; } } break; } open(shell, wizard); } } private static void getUnknownNamesAndExtension(SyncInfoSet infos, Collection names, Collection extensions) { final IFileContentManager manager= Team.getFileContentManager(); for (final Iterator iter = infos.iterator(); iter.hasNext();) { final SyncInfo info = (SyncInfo)iter.next(); IResource local = info.getLocal(); if (local instanceof IFile && manager.getType((IFile)local) == Team.UNKNOWN) { final String extension= local.getFileExtension(); if (extension != null && !manager.isKnownExtension(extension)) { extensions.add(extension); } final String name= local.getName(); if (extension == null && name != null && !manager.isKnownFilename(name)) names.add(name); } } } private static SyncInfoSet getUnaddedInfos(SyncInfoSet infos) throws CVSException { final SyncInfoSet unadded= new SyncInfoSet(); for (final Iterator iter = infos.iterator(); iter.hasNext();) { final SyncInfo info = (SyncInfo) iter.next(); final IResource resource= info.getLocal(); if (!isAdded(resource)) unadded.add(info); } return unadded; } private static SyncInfoSet getFiles(SyncInfoSet infos) throws CVSException { final SyncInfoSet files= new SyncInfoSet(); for (final Iterator iter = infos.iterator(); iter.hasNext();) { final SyncInfo info = (SyncInfo) iter.next(); final IResource resource= info.getLocal(); if (resource.getType() == IResource.FILE) files.add(info); } return files; } private static boolean isAdded(IResource resource) throws CVSException { final ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); if (cvsResource.isFolder()) { return ((ICVSFolder)cvsResource).isCVSFolder(); } return cvsResource.isManaged(); } private static IResource[] getDeepResourcesToCommit(ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException { List roots = new ArrayList(); for (int j = 0; j < traversals.length; j++) { ResourceTraversal traversal = traversals[j]; IResource[] resources = traversal.getResources(); if (traversal.getDepth() == IResource.DEPTH_INFINITE) { roots.addAll(Arrays.asList(resources)); } else if (traversal.getDepth() == IResource.DEPTH_ZERO) { collectShallowFiles(resources, roots); } else if (traversal.getDepth() == IResource.DEPTH_ONE) { collectShallowFiles(resources, roots); for (int k = 0; k < resources.length; k++) { IResource resource = resources[k]; if (resource.getType() != IResource.FILE) { collectShallowFiles(members(resource), roots); } } } } return (IResource[]) roots.toArray(new IResource[roots.size()]); } private static IResource[] members(IResource resource) throws CoreException { return CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().members(resource); } private static void collectShallowFiles(IResource[] resources, List roots) { for (int k = 0; k < resources.length; k++) { IResource resource = resources[k]; if (resource.getType() == IResource.FILE) roots.add(resource); } } }

diff --git a/src/java/org/xins/server/TransactionLogger.java b/src/java/org/xins/server/TransactionLogger.java index ff3fc34..1e8b9bc 100644 --- a/src/java/org/xins/server/TransactionLogger.java +++ b/src/java/org/xins/server/TransactionLogger.java @@ -1,137 +1,137 @@ /* * $Id$ * * Copyright 2003-2007 Orange Nederland Breedband B.V. * See the COPYRIGHT file for redistribution and use restrictions. */ package org.xins.server; import org.xins.common.FormattedParameters; import org.xins.common.collections.PropertyReader; import org.xins.common.text.DateConverter; import org.xins.common.xml.Element; /** * Transaction logger. Responsible for logging transactions. * * @since XINS 3.0 * * @version $Revision$ $Date$ * @author <a href="mailto:[email protected]">Ernst de Haan</a> */ public class TransactionLogger { /** * Converter for transforming dates to text. */ private static final DateConverter DATE_CONVERTER = new DateConverter(true); /** * Constructs a new <code>TransactionLogger</code> object. */ protected TransactionLogger() { // empty } /** * Logs the specified transaction. This is the main entry point for this * class. * * <p>This method determines the function name, the request and result data * and then delegates the call to * {@linkplain #logTransaction(String,PropertyReader,Element,String,PropertyReader,Element,String,long,long) logTransaction(functionName, requestParams, requestDataElement, resultCode, resultParams, resultDataElement, ip, start, duration}. * * @param request * the {@link FunctionRequest}, should not be <code>null</code>. * * @param result * the {@link FunctionResult}, should not be <code>null</code>. * * @param ip * the client IP address, should not be <code>null</code>. * * @param start * the start of the call, a timestamp as milliseconds since the Epoch. * * @param duration * the duration of the call, in milliseconds. * * @throws NullPointerException * if <code>request == null || result == null</code>. */ protected void logTransaction(FunctionRequest request, FunctionResult result, String ip, long start, long duration) throws NullPointerException { // Determine the result code, fallback is the zero digit String resultCode = result.getErrorCode(); if (resultCode == null || resultCode.length() < 1) { resultCode = "0"; } // Delegate to lower-level method logTransaction(request.getFunctionName(), request.getParameters(), request.getDataElement(), resultCode, result.getParameters(), result.getDataElement(), ip, start, duration); } /** * Log a single transaction after a function was invoked. * * @param functionName * the name of the function that was invoked, * cannot be <code>null</code>. * * @param requestParams * the incoming request parameters, or <code>null</code> if none. * * @param requestDataElement * the input data section, or <code>null</code> if none. * * @param resultCode * the result error code, or <code>null</code> on success. * * @param resultParams * the outgoing result parameters, or <code>null</code> if none. * - * @param requestDataElement + * @param resultDataElement * the output data section, or <code>null</code> if none. * * @param ip * the IP address of the caller, cannot be <code>null</code>. * * @param start * the time of the incoming call, in milliseconds since January 1, 1970. * * @param duration * the duration of the call in milliseconds. */ protected void logTransaction(String functionName, PropertyReader requestParams, Element requestDataElement, String resultCode, PropertyReader resultParams, Element resultDataElement, String ip, long start, long duration) { // Serialize the start date and the input and output data String serStart = DATE_CONVERTER.format(start); Object inParams = new FormattedParameters(requestParams, requestDataElement); Object outParams = new FormattedParameters(resultParams, resultDataElement ); // Actually log the transaction Log.log_3540(serStart, ip, functionName, duration, resultCode, inParams, outParams); Log.log_3541(serStart, ip, functionName, duration, resultCode); } }

diff --git a/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java b/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java index 7d7026384..e0b2561bd 100644 --- a/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java +++ b/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java @@ -1,450 +1,458 @@ /* -*-Java-*- ******************************************************************************** * * File: BasicCytoShapeEntity.java * RCS: $Header: $ * Description: * Author: Allan Kuchinsky * Created: Sun May 29 11:22:33 2005 * Modified: Sun Dec 17 05:29:24 2006 (Michael L. Creech) creech@w235krbza760 * Language: Java * Package: /* Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and documentation provided hereunder is on an "as is" basis, and the Institute for Systems Biology and the Whitehead Institute have no obligations to provide maintenance, support, updates, enhancements or modifications. In no event shall the Institute for Systems Biology and the Whitehead Institute be liable to any party for direct, indirect, special, incidental or consequential damages, including lost profits, arising out of the use of this software and its documentation, even if the Institute for Systems Biology and the Whitehead Institute have been advised of the possibility of such damage. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ******************************************************************************** * * Revisions: * * Sat Dec 16 14:50:40 2006 (Michael L. Creech) creech@w235krbza760 * Completely rewrote TestDragSourceListener (now is EntityDragSourceListener) to * allow for intelligent setting of the drag cursor. Changed constructor to * take a DragSourceContextCursorSetter. * Changed all instance variables to be private. * Tue Dec 05 04:39:09 2006 (Michael L. Creech) creech@w235krbza760 * Changed computation of BasicCytoShapeEntity size to allow for * larger CytoShapeIcons. * Sun Aug 06 11:22:50 2006 (Michael L. Creech) creech@w235krbza760 * Added generated serial version UUID for serializable classes. ******************************************************************************** */ package cytoscape.editor.impl; import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.GridLayout; import java.awt.Image; import java.awt.Point; import java.awt.dnd.DnDConstants; import java.awt.dnd.DragGestureEvent; import java.awt.dnd.DragGestureListener; import java.awt.dnd.DragSource; import java.awt.dnd.DragSourceAdapter; import java.awt.dnd.DragSourceContext; import java.awt.dnd.DragSourceDragEvent; import java.awt.dnd.DragSourceEvent; import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import cytoscape.Cytoscape; import cytoscape.editor.DragSourceContextCursorSetter; import cytoscape.editor.GraphicalEntity; import cytoscape.editor.event.BasicCytoShapeTransferHandler; import cytoscape.view.CyNetworkView; /** * * The <b>BasicCytoShapeEntity</b> class defines draggable/droppable visual components in the * Cytoscape editor framework. The framework provides for dragging and dropping graphical * entities from palette onto the canvas. BasicCytoShapeEntity objects are associated with * semantic objects, i.e. nodes and edges, that are created when the graphical entities * are dropped onto the canvas. * @author Allan Kuchinsky * @version 1.0 * */ public class BasicCytoShapeEntity extends JComponent implements DragGestureListener, GraphicalEntity { // MLC 07/27/06: private static final long serialVersionUID = -5229827235046946347L; // MLC 12/16/06 BEGIN: private static DragSourceContextCursorSetter _defaultCursorSetter = new DragSourceContextCursorSetter() { // The default shows that a drop is possible anywhere on the netView: public Cursor computeCursor(CyNetworkView netView, Point netViewLoc, DragSourceDragEvent dsde) { return DragSource.DefaultCopyDrop; } }; /** * used for setting tooltip text */ // MLC 12/16/06: // JLabel _cytoShape; // MLC 12/16/06: private JLabel _cytoShape; /** * the title of the shape */ // MLC 12/16/06: // String title; // MLC 12/16/06: private String title; /** * attribute name for the shape * should be one of "NodeType" or "EdgeType" */ // MLC 12/16/06: // String attributeName; // MLC 12/16/06: private String attributeName; /** * value for the attribute assigned to the shape * for example a "NodeType" of "protein" */ // MLC 12/16/06: // String attributeValue; // MLC 12/16/06: private String attributeValue; /** * the icon associated with the shape */ // MLC 12/16/06: // Icon _image; // MLC 12/16/06: private Icon _image; /** * the source of a drag event */ // MLC 12/16/06 BEGIN: // DragSource myDragSource; private DragSource myDragSource; // DragGestureRecognizer myDragGestureRecognizer; // BasicCytoShapeTransferHandler handler; private BasicCytoShapeTransferHandler handler; // MLC 12/16/06 END. /** * the image associated with the Icon for the shape */ // MLC 12/16/06: // Image _img; // MLC 12/16/06: private Image _img; // A possibly null method to determine the dragSourceContext cursor to show // users what can and cannot be dropped on. private DragSourceContextCursorSetter _cursorSetter = _defaultCursorSetter; // MLC 12/16/06 END. /** * * @param attributeName attribute name for the shape, should be one of "NodeType" or "EdgeType" * @param attributeValue value for the attribute assigned to the shape, for example a "NodeType" of "protein" * @param image the icon for the shape * @param title the title of the shape * @param cursorSetter a possibly null DragSourceContextCursorSetter used to specify * the cursor so show when dragging over the current network view. * If null, a default cursor setter is used shows its ok * to drop anywhere on the network view. */ // MLC 12/16/06 BEGIN: // public BasicCytoShapeEntity(String attributeName, String attributeValue, // Icon image, String title) { public BasicCytoShapeEntity(String attributeName, String attributeValue, Icon image, String title, DragSourceContextCursorSetter cursorSetter) { // MLC 12/16/06 END. super(); this.setTitle(title); _image = image; // MLC 12/16/06 BEGIN: if (cursorSetter != null) { // use the default: _cursorSetter = cursorSetter; } // MLC 12/16/06 END. this.attributeName = attributeName; this.attributeValue = attributeValue; if (image instanceof ImageIcon) { _img = ((ImageIcon) image).getImage(); } _cytoShape = new JLabel(image); if (this.attributeName != null) { if (this.attributeName.equals("NODE_TYPE")) { _cytoShape.setToolTipText("<html>To add a node to a network,<br>" + "drag and drop a shape<br>" + "from the palette onto the canvas<br>" + "OR<br>" + "simply CTRL-click on the canvas.</html>"); } else if (this.attributeName.equals("EDGE_TYPE")) { _cytoShape.setToolTipText("<html>To connect two nodes with an edge<br>" + "drag and drop the arrow onto a node<br>" + "on the canvas, then move the cursor<br>" + "over a second node and click the mouse.<br>" + "OR<br>" + "CTRL-click on the first node and then<br>" + "click on the second node. </html>"); } else if (this.attributeName.equals("NETWORK_TYPE")) { _cytoShape.setToolTipText("<html>To create a nested network<br>" + "drag and drop the network onto a node<br>" + "to assign a nested network,<br>" + "or on the canvas to create a new node and<br>" + "assign a nested network. </html>"); } } this.setLayout(new GridLayout(1, 1)); TitledBorder t2 = BorderFactory.createTitledBorder(title); this.add(_cytoShape); this.setBorder(t2); myDragSource = new DragSource(); // MLC 12/16/06 BEGIN: // myDragSource.addDragSourceListener(new TestDragSourceListener()); myDragSource.addDragSourceListener(new EntityDragSourceListener()); // myDragGestureRecognizer = myDragSource.createDefaultDragGestureRecognizer(_cytoShape, // DnDConstants.ACTION_COPY, // this); myDragSource.createDefaultDragGestureRecognizer(_cytoShape, DnDConstants.ACTION_COPY, this); // MLC 12/16/06 END. handler = (new BasicCytoShapeTransferHandler(this, null)); this.setTransferHandler(handler); // MLC 12/04/06 BEGIN: // force height to be at least // CytoscapeShapeIcon.DEFAULT_HEIGHT but larger if needed: + /* Dimension mySize = new Dimension(((JPanel) Cytoscape.getDesktop() .getCytoPanel(SwingConstants.WEST)) .getSize().width - 5, Math.max(_image.getIconHeight(), CytoShapeIcon.DEFAULT_HEIGHT) + CytoShapeIcon.DEFAULT_HEIGHT); + */ + Dimension mySize = new Dimension(32767, + Math.max(_image.getIconHeight(), CytoShapeIcon.DEFAULT_HEIGHT) + +(int)((double)CytoShapeIcon.DEFAULT_HEIGHT/.75)); this.setMaximumSize(mySize); - this.setMinimumSize(mySize); + + mySize = new Dimension(300, + Math.max(_image.getIconHeight(), CytoShapeIcon.DEFAULT_HEIGHT) + +(int)((double)CytoShapeIcon.DEFAULT_HEIGHT/.75)); this.setPreferredSize(mySize); } /** * @return Returns the title. */ public String getTitle() { return title; } /** * @param title The title to set. * */ public void setTitle(String title) { this.title = title; } /** * @return Returns the DragSource. */ public DragSource getMyDragSource() { return myDragSource; } /** * @param myDragSource The DragSource to set. */ public void setMyDragSource(DragSource myDragSource) { this.myDragSource = myDragSource; } /** * @return Returns the icon associated with the shape */ public Icon getIcon() { return _image; } /** * @param _image the icon to set for the shape * */ public void setIcon(Icon _image) { this._image = _image; } /** * @return Returns the image associated with the shape's icon */ public Image get_image() { return _img; } /** * @param _img The _img to set. */ public void set_image(Image _img) { this._img = _img; } /** * @return Returns the attributeName. */ public String getAttributeName() { return attributeName; } /** * @param attributeName The attributeName to set. */ public void setAttributeName(String attributeName) { this.attributeName = attributeName; } /** * @return Returns the attributeValue. */ public String getAttributeValue() { return attributeValue; } /** * @param attributeValue The attributeValue to set. */ public void setAttributeValue(String attributeValue) { this.attributeValue = attributeValue; } /** * DOCUMENT ME! * * @param e DOCUMENT ME! */ public void dragGestureRecognized(DragGestureEvent e) { e.startDrag(DragSource.DefaultCopyDrop, handler.createTransferable(this)); } // MLC 12/16/06 BEGIN: // private class TestDragSourceListener extends DragSourceAdapter { private class EntityDragSourceListener extends DragSourceAdapter { public void dragEnter(DragSourceDragEvent dsde) { determineCursor(dsde); // dsde.getDragSourceContext().setCursor(DragSource.DefaultCopyDrop); } public void dragOver(DragSourceDragEvent dsde) { determineCursor(dsde); // DragSourceContext dsc = (DragSourceContext) dsde.getSource(); // Component comp = dsc.getComponent(); // CytoscapeEditorManager.log("dragOver = " + comp); } private void determineCursor(DragSourceDragEvent dsde) { DragSourceContext dsc = dsde.getDragSourceContext(); Point compLoc = getLocationInsideComponent(Cytoscape.getCurrentNetworkView() .getComponent(), dsde.getLocation()); if (compLoc != null) { Cursor newCursor = _cursorSetter.computeCursor(Cytoscape.getCurrentNetworkView(), compLoc, dsde); if (newCursor == null) { newCursor = DragSource.DefaultCopyNoDrop; } dsc.setCursor(newCursor); } else { // check if on the drag source. We want to show ok cursor // for it: // sourceLoc now now in source component coordinates: Point paletteLoc = getLocationInsideComponent(dsc.getComponent(), dsde.getLocation()); if (paletteLoc != null) { dsc.setCursor(DragSource.DefaultCopyDrop); } else { dsc.setCursor(DragSource.DefaultCopyNoDrop); } } } // return the point in component coordinates of a given point // in screen ccordinates only if the point is within the component. // Otherwise return null; private Point getLocationInsideComponent(Component desiredComp, Point screenLoc) { // loc now component location Point compLoc = new Point(screenLoc); SwingUtilities.convertPointFromScreen(compLoc, desiredComp); if (desiredComp.contains(compLoc)) { // the point is in desiredComp: return compLoc; } return null; } // MLC 12/16/06 END. public void dragExit(DragSourceEvent dse) { dse.getDragSourceContext().setCursor(DragSource.DefaultCopyNoDrop); } } } diff --git a/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java b/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java index 6f0603c1b..6c6dffd2d 100644 --- a/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java +++ b/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java @@ -1,346 +1,346 @@ /* -*-Java-*- ******************************************************************************** * * File: ShapePalette.java * RCS: $Header: $ * Description: * Author: Allan Kuchinsky * Created: Sun May 29 11:18:17 2005 * Modified: Sun Dec 17 05:33:30 2006 (Michael L. Creech) creech@w235krbza760 * Language: Java * Package: /* Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and documentation provided hereunder is on an "as is" basis, and the Institute for Systems Biology and the Whitehead Institute have no obligations to provide maintenance, support, updates, enhancements or modifications. In no event shall the Institute for Systems Biology and the Whitehead Institute be liable to any party for direct, indirect, special, incidental or consequential damages, including lost profits, arising out of the use of this software and its documentation, even if the Institute for Systems Biology and the Whitehead Institute have been advised of the possibility of such damage. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ******************************************************************************** * * Revisions: * * Sun Dec 17 05:30:11 2006 (Michael L. Creech) creech@w235krbza760 * Added DragSourceContextCursorSetter parameter to addShape(). * Mon Dec 04 11:57:11 2006 (Michael L. Creech) creech@w235krbza760 * Changed the JList to no longer use * setFixedCellHeight() since BasicCytoShapeEntitys can now have * different sizes. * Sun Aug 06 11:19:38 2006 (Michael L. Creech) creech@w235krbza760 * Added generated serial version UUID for serializable classes. ******************************************************************************** */ package cytoscape.editor.impl; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.Color; import java.util.HashMap; import java.util.Map; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.DefaultListModel; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JEditorPane; import javax.swing.ListCellRenderer; import javax.swing.border.TitledBorder; import cytoscape.Cytoscape; import cytoscape.editor.CytoscapeEditorManager; import cytoscape.editor.DragSourceContextCursorSetter; import cytoscape.editor.event.BasicCytoShapeTransferHandler; import cytoscape.view.CyNetworkView; import ding.view.DGraphView; /** * * The <b>ShapePalette</b> class implements a palette from which the user drags and drops shapes onto the canvas * The dropping of shapes onto the canvas results in the addition of nodes and edges to the current Cytoscape * network, as defined by the behavior of the event handler that responds to the drop events. For example, in the * simple "BioPAX-like" editor, there are node types for proteins, catalysis, small molecules, and biochemical * reactions, as well as a directed edge type. * <p> * The user interface for the ShapePalette is built upon the JList class. * * @author Allan Kuchinsky * @version 1.0 * */ public class ShapePalette extends JPanel { // MLC 08/06/06: private static final long serialVersionUID = -4018789452330887392L; /** * mapping of shapes to their titles */ static Map<String, BasicCytoShapeEntity> _shapeMap = new HashMap<String, BasicCytoShapeEntity>(); /** * the user interface for the ShapePalette */ protected JList dataList; protected DefaultListModel listModel; private JPanel _controlPane; protected JScrollPane scrollPane; protected JPanel _shapePane; /** * Creates a new ShapePalette object. */ public ShapePalette() { super(); _controlPane = new JPanel(); _controlPane.setLayout(new BoxLayout(_controlPane, BoxLayout.Y_AXIS)); TitledBorder t2 = BorderFactory.createTitledBorder("Instructions:"); _controlPane.setBorder(t2); String instructions = "<html><style type='text/css'>body{ font-family: sans-serif; font-size: 11pt; }</style><b>Drag and Drop:</b> <ul> <li>A node shape onto the network view. <li>An edge shape onto the source node, then click on the target node. </ul> <b>Double-click:</b> <ul> <li>To add nodes and edges specified in SIF format </ul>" + (System.getProperty("os.name").startsWith("Mac") ? "<b>CMD-click:</b>" : "<b>CTRL-click:</b>") + "<ul> <li>On empty space to create a node. <li>On a node to begin an edge and specify the source node. Then click on the target node to finish the edge. </ul></html>"; JEditorPane instructionsArea = new JEditorPane("text/html",instructions); // 32767 ???? - instructionsArea.setPreferredSize(new java.awt.Dimension(300, 400)); + instructionsArea.setPreferredSize(new java.awt.Dimension(300, 300)); instructionsArea.setBackground(Cytoscape.getDesktop().getBackground()); _controlPane.add(instructionsArea); _controlPane.setBackground(Cytoscape.getDesktop().getBackground()); JPanel pnlSpecifyIdentifier = new JPanel(); // 32767 ???? pnlSpecifyIdentifier.setMaximumSize(new java.awt.Dimension(32767, 100)); JLabel chkSpecifyLabel = new JLabel("Specify Identifier:"); chkSpecifyIdentifier = new javax.swing.JCheckBox(); chkSpecifyIdentifier.setToolTipText("Checking the box will allow you to choose the identifier for added nodes and edges."); pnlSpecifyIdentifier.setLayout(new java.awt.GridBagLayout()); pnlSpecifyIdentifier.setBorder(BorderFactory.createTitledBorder("")); chkSpecifyIdentifier.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { CheckBoxSpecifyIdentifierStateChanged(evt); } }); pnlSpecifyIdentifier.add(chkSpecifyLabel); pnlSpecifyIdentifier.add(chkSpecifyIdentifier); chkSpecifyIdentifier.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); chkSpecifyIdentifier.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); chkSpecifyIdentifier.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT); chkSpecifyIdentifier.setMargin(new java.awt.Insets(0, 0, 0, 0)); java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 1.0; pnlSpecifyIdentifier.add(chkSpecifyIdentifier, gridBagConstraints); listModel = new DefaultListModel(); dataList = new JList(listModel); dataList.setCellRenderer(new MyCellRenderer()); dataList.setDragEnabled(true); dataList.setTransferHandler(new PaletteListTransferHandler()); _shapePane = new JPanel(); _shapePane.setLayout(new BoxLayout(_shapePane, BoxLayout.Y_AXIS)); scrollPane = new JScrollPane(_shapePane); scrollPane.setBorder(BorderFactory.createEtchedBorder()); dataList.setBackground(Cytoscape.getDesktop().getBackground()); scrollPane.setBackground(Cytoscape.getDesktop().getBackground()); scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); this.setLayout(new java.awt.GridBagLayout()); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; add(_controlPane, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; add(pnlSpecifyIdentifier, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; this.add(scrollPane, gridBagConstraints); CytoscapeEditorManager.setCurrentShapePalette(this); CyNetworkView view = Cytoscape.getCurrentNetworkView(); CytoscapeEditorManager.setShapePaletteForView(view, this); this.setBackground(Cytoscape.getDesktop().getBackground()); this.setVisible(true); } private javax.swing.JCheckBox chkSpecifyIdentifier; public void CheckBoxSpecifyIdentifierStateChanged(javax.swing.event.ChangeEvent evt){ if (chkSpecifyIdentifier.isSelected()){ specifyIdentifier = true; } else { specifyIdentifier = false; } } public static boolean specifyIdentifier = false; /** * clear the ShapePalette by removing all its shape components * */ public void clear() { _shapePane.removeAll(); } /** * add a shape to the palette * @param attributeName attribute name for the shape, should be one of "NodeType" or "EdgeType" * @param attributeValue value for the attribute assigned to the shape, for example a "NodeType" of "protein" * @param img the icon for the shape * @param name the title of the shape * @param cursorSetter a possibly null DragSourceContextCursorSetter used to specify * the cursor so show when dragging over the current network view. */ // MLC 12/16/06 BEGIN: public void addShape(String attributeName, String attributeValue, Icon img, String name, DragSourceContextCursorSetter cursorSetter) { BasicCytoShapeEntity cytoShape = new BasicCytoShapeEntity(attributeName, attributeValue, img, name, cursorSetter); cytoShape.setTransferHandler(new BasicCytoShapeTransferHandler(cytoShape, null)); _shapeMap.put(cytoShape.getTitle(), cytoShape); if (attributeName.equals(CytoscapeEditorManager.EDGE_TYPE)) { CytoscapeEditorManager.addEdgeTypeForVisualStyle(Cytoscape.getCurrentNetworkView() .getVisualStyle(), attributeValue); } _shapePane.add(cytoShape); } /** * show the palette in the WEST cytopanel * */ public void showPalette() { CyNetworkView view = Cytoscape.getCurrentNetworkView(); CytoscapeEditorManager.setShapePaletteForView(view, this); this.setVisible(true); } /** * * @param key the name of the shape to be returned * @return return the BasicCytoShapeEntity associated with the input shape name */ public static BasicCytoShapeEntity getBasicCytoShapeEntity(String key) { Object val = _shapeMap.get(key); if (val instanceof BasicCytoShapeEntity) { return ((BasicCytoShapeEntity) val); } else { return null; } } /** * renders each cell of the ShapePalette * @author Allan Kuchinsky * @version 1.0 * */ class MyCellRenderer extends JLabel implements ListCellRenderer { // This is the only method defined by ListCellRenderer. // We just reconfigure the JLabel each time we're called. // MLC 08/06/06: private static final long serialVersionUID = -4704405703871398609L; public Component getListCellRendererComponent(JList list, Object value, // value to display int index, // cell index boolean isSelected, // is the cell selected boolean cellHasFocus) // the list and the cell have the focus { if (value instanceof BasicCytoShapeEntity) { BasicCytoShapeEntity cytoShape = (BasicCytoShapeEntity) value; setText(cytoShape.getTitle()); setIcon(cytoShape.getIcon()); setToolTipText(cytoShape.getToolTipText()); } if (isSelected) { setBackground(list.getSelectionBackground()); setForeground(list.getSelectionForeground()); } else { setBackground(list.getBackground()); setForeground(list.getForeground()); } setEnabled(list.isEnabled()); setFont(list.getFont()); setOpaque(true); return this; } } /** * bundles up the name of the BasicCytoShapeEntity for export via drag/drop from the palette * @author Allan Kuchinsky * @version 1.0 * */ class PaletteListTransferHandler extends StringTransferHandler { // MLC 08/06/06: private static final long serialVersionUID = -3858539899491771525L; protected void cleanup(JComponent c, boolean remove) { } protected void importString(JComponent c, String str) { } //Bundle up the selected items in the list //as a single string, for export. protected String exportString(JComponent c) { JList list = (JList) c; Object val = list.getSelectedValue(); if (val instanceof BasicCytoShapeEntity) { return ((BasicCytoShapeEntity) val).getTitle(); } else { return null; } } } }

diff --git a/yangAndroid/src_android/yang/android/graphics/YangActivity.java b/yangAndroid/src_android/yang/android/graphics/YangActivity.java index 0b206b1d..a69d8296 100644 --- a/yangAndroid/src_android/yang/android/graphics/YangActivity.java +++ b/yangAndroid/src_android/yang/android/graphics/YangActivity.java @@ -1,122 +1,121 @@ package yang.android.graphics; import yang.android.AndroidSensor; import yang.model.App; import yang.model.DebugYang; import yang.model.callback.ExitCallback; import yang.surface.YangSurface; import android.app.Activity; import android.content.res.Configuration; import android.media.AudioManager; import android.os.Bundle; public abstract class YangActivity extends Activity implements ExitCallback { public static boolean PRINT_ACTIVITY_DEBUG = true; public YangActivity() { } protected static YangTouchSurface mGLView; public void defaultInit(YangTouchSurface androidSurface) { //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); activityOut("INIT"); setVolumeControlStream(AudioManager.STREAM_MUSIC); mGLView = androidSurface; - - setContentView(mGLView); + if (mGLView.getParent() == null) setContentView(mGLView); } protected void activityOut(Object msg) { if(PRINT_ACTIVITY_DEBUG) DebugYang.println("--------------------------("+(""+this).split("@")[1]+") "+msg+"---------------------------",1); } protected void setSurface(YangSurface yangSurface) { App.sensor = new AndroidSensor(this); if(DebugYang.PLAY_MACRO_FILENAME!=null) yangSurface.setMacroFilename(DebugYang.PLAY_MACRO_FILENAME); mGLView.setSurface(yangSurface); } public void defaultInit() { if(mGLView!=null) defaultInit(mGLView); else defaultInit(new YangTouchSurface(this)); } public void defaultInit(boolean useDebugEditText) { if(mGLView==null && useDebugEditText) defaultInit(new YangKeyTouchSurface(this)); else defaultInit(); } @Override protected void onPause() { super.onPause(); activityOut("PAUSED"); mGLView.onPause(); } @Override protected void onStop() { super.onStop(); mGLView.mSceneRenderer.mSurface.stop(); activityOut("STOP"); } @Override protected void onResume() { super.onResume(); activityOut("RESUME"); mGLView.onResume(); } @Override protected void onStart() { super.onStart(); activityOut("START"); } @Override protected void onDestroy() { super.onDestroy(); activityOut("DESTROY"); System.exit(0); } @Override protected void onRestoreInstanceState (Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); activityOut("RESTORE INSTANCE STATE"); } @Override protected void onSaveInstanceState (Bundle outState) { super.onSaveInstanceState(outState); activityOut("SAVED INSTANCE STATE"); } @Override public void onBackPressed() { mGLView.onBackPressed(); } @Override public void exit() { activityOut("EXIT"); finish(); } @Override public void onConfigurationChanged(Configuration config) { super.onConfigurationChanged(config); activityOut("CONFIG_CHANGED: "+config); } } \ No newline at end of file

diff --git a/src/org/cyanogenmod/nemesis/CameraManager.java b/src/org/cyanogenmod/nemesis/CameraManager.java index c01d515..225553d 100644 --- a/src/org/cyanogenmod/nemesis/CameraManager.java +++ b/src/org/cyanogenmod/nemesis/CameraManager.java @@ -1,970 +1,971 @@ /** * Copyright (C) 2013 The CyanogenMod Project * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ package org.cyanogenmod.nemesis; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; import android.graphics.SurfaceTexture; import android.hardware.Camera; import android.hardware.Camera.AutoFocusCallback; import android.hardware.Camera.AutoFocusMoveCallback; import android.media.CamcorderProfile; import android.media.MediaRecorder; import android.os.Handler; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; import java.io.IOException; import java.util.ArrayList; import java.util.List; /** * This class is responsible for interacting with the Camera HAL. * It provides easy open/close, helper methods to set parameters or * toggle features, etc. in an asynchronous fashion. */ public class CameraManager { private final static String TAG = "CameraManager"; private final static int FOCUS_WIDTH = 80; private final static int FOCUS_HEIGHT = 80; private CameraPreview mPreview; private Camera mCamera; private boolean mCameraReady; private int mCurrentFacing; private Point mTargetSize; private AutoFocusMoveCallback mAutoFocusMoveCallback; private Camera.Parameters mParameters; private int mOrientation; private MediaRecorder mMediaRecorder; private PreviewPauseListener mPreviewPauseListener; private CameraReadyListener mCameraReadyListener; private Handler mHandler; private Context mContext; private long mLastPreviewFrameTime; private boolean mIsModeSwitching; private List<NameValuePair> mPendingParameters; public interface PreviewPauseListener { /** * This method is called when the preview is about to pause. * This allows the CameraActivity to display an animation when the preview * has to stop. */ public void onPreviewPause(); /** * This method is called when the preview resumes */ public void onPreviewResume(); } public interface CameraReadyListener { /** * Called when a camera has been successfully opened. This allows the * main activity to continue setup operations while the camera * sets up in a different thread. */ public void onCameraReady(); /** * Called when the camera failed to initialize */ public void onCameraFailed(); } Thread mParametersThread = new Thread() { public void run() { while (true) { synchronized (this) { try { wait(); } catch (InterruptedException e) { // do nothing } List<NameValuePair> copy = new ArrayList<NameValuePair>(mPendingParameters); mPendingParameters.clear(); for (NameValuePair pair : copy) { String key = pair.getName(); String val = pair.getValue(); Log.v(TAG, "Asynchronously setting parameter " + key+ " to " + val); Camera.Parameters params = getParameters(); String workingValue = params.get(key); params.set(key, val); try { mCamera.setParameters(params); } catch (RuntimeException e) { Log.e(TAG, "Could not set parameter " + key + " to '" + val + "', restoring '" + workingValue + "'", e); // Reset the parameter back in storage SettingsStorage.storeCameraSetting(mContext, mCurrentFacing, key, workingValue); // Reset the camera as it likely crashed if we reached here open(mCurrentFacing); } } // Read them from sensor mParameters = null;// getParameters(); } } } }; public CameraManager(Context context) { mPreview = new CameraPreview(context); mMediaRecorder = new MediaRecorder(); mCameraReady = true; mHandler = new Handler(); mIsModeSwitching = false; mContext = context; mPendingParameters = new ArrayList<NameValuePair>(); mParametersThread.start(); } /** * Opens the camera and show its preview in the preview * * @param cameraId * @return true if the operation succeeded, false otherwise */ public boolean open(final int cameraId) { if (mCamera != null) { if (mPreviewPauseListener != null) { mPreviewPauseListener.onPreviewPause(); } // Close the previous camera releaseCamera(); } mCameraReady = false; // Try to open the camera new Thread() { public void run() { try { if (mCamera != null) { Log.e(TAG, "Previous camera not closed! Not opening"); return; } mCamera = Camera.open(cameraId); mCamera.enableShutterSound(false); mCamera.setPreviewCallback(mPreview); mCurrentFacing = cameraId; mParameters = mCamera.getParameters(); String params = mCamera.getParameters().flatten(); final int step = params.length() > 256 ? 256 : params.length(); for (int i = 0; i < params.length(); i += step) { Log.d(TAG, params); params = params.substring(step); } if (mTargetSize != null) setPreviewSize(mTargetSize.x, mTargetSize.y); if (mAutoFocusMoveCallback != null) mCamera.setAutoFocusMoveCallback(mAutoFocusMoveCallback); // Default focus mode to continuous } catch (Exception e) { Log.e(TAG, "Error while opening cameras: " + e.getMessage(), e); if (mCameraReadyListener != null) { mCameraReadyListener.onCameraFailed(); } return; } if (mCameraReadyListener != null) { mCameraReadyListener.onCameraReady(); } // Update the preview surface holder with the new opened camera mPreview.notifyCameraChanged(); if (mPreviewPauseListener != null) { mPreviewPauseListener.onPreviewResume(); } mCameraReady = true; } }.start(); return true; } public void setPreviewPauseListener(PreviewPauseListener listener) { mPreviewPauseListener = listener; } public void setCameraReadyListener(CameraReadyListener listener) { mCameraReadyListener = listener; } /** * Returns the preview surface used to display the Camera's preview * * @return CameraPreview */ public CameraPreview getPreviewSurface() { return mPreview; } /** * @return The facing of the current open camera */ public int getCurrentFacing() { return mCurrentFacing; } /** * Returns the parameters structure of the current running camera * * @return Camera.Parameters */ public Camera.Parameters getParameters() { if (mCamera == null) { Log.w(TAG, "getParameters when camera is null"); return null; } synchronized (mParametersThread) { if (mParameters == null) { try { mParameters = mCamera.getParameters(); } catch (RuntimeException e) { Log.e(TAG, "Error while getting parameters: ", e); return null; } } } return mParameters; } public void pause() { releaseCamera(); //mParametersThread.interrupt(); } public void resume() { reconnectToCamera(); //mParametersThread.start(); } private void releaseCamera() { if (mCamera != null && mCameraReady) { Log.v(TAG, "Releasing camera facing " + mCurrentFacing); mCamera.release(); mCamera = null; mParameters = null; mPreview.notifyCameraChanged(); mCameraReady = true; } } private void reconnectToCamera() { if (mCameraReady) { open(mCurrentFacing); } } public void setPreviewSize(int width, int height) { mTargetSize = new Point(width, height); if (mCamera != null) { Camera.Parameters params = getParameters(); params.setPreviewSize(width, height); Log.v(TAG, "Preview size is " + width + "x" + height); if (!mIsModeSwitching) { try { mCamera.stopPreview(); mParameters = params; mCamera.setParameters(mParameters); mPreview.notifyPreviewSize(width, height); mCamera.startPreview(); } catch (RuntimeException ex) { Log.e(TAG, "Unable to set Preview Size", ex); } } } } public void setParameterAsync(String key, String value) { synchronized (mParametersThread) { mPendingParameters.add(new BasicNameValuePair(key, value)); mParametersThread.notifyAll(); } } /** * Sets a parameters class in a synchronous way. Use with caution, prefer setParameterAsync. * @param params */ public void setParameters(Camera.Parameters params) { synchronized (mParametersThread) { mCamera.setParameters(params); } } /** * Locks the automatic settings of the camera device, like White balance and * exposure. * * @param lock true to lock, false to unlock */ public void setLockSetup(boolean lock) { Camera.Parameters params = getParameters(); if (params == null) { // Params might be null if we pressed or swipe the shutter button // while the camera is not ready return; } if (params.isAutoExposureLockSupported()) { params.setAutoExposureLock(lock); } if (params.isAutoWhiteBalanceLockSupported()) { params.setAutoWhiteBalanceLock(lock); } try { mCamera.setParameters(params); } catch (RuntimeException e) { } } /** * Returns the last frame of the preview surface * * @return Bitmap */ public Bitmap getLastPreviewFrame() { // Decode the last frame bytes byte[] data = mPreview.getLastFrameBytes(); Camera.Parameters params = getParameters(); if (params == null) { return null; } Camera.Size previewSize = params.getPreviewSize(); if (previewSize == null) { return null; } int previewWidth = previewSize.width; int previewHeight = previewSize.height; // Convert YUV420SP preview data to RGB if (data != null) { Bitmap bitmap = Util.decodeYUV420SP(mContext, data, previewWidth, previewHeight); if (mCurrentFacing == Camera.CameraInfo.CAMERA_FACING_FRONT) { // Frontcam has the image flipped, flip it back to not look weird in portrait Matrix m = new Matrix(); m.preScale(-1, 1); Bitmap dst = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), m, false); bitmap.recycle(); bitmap = dst; } return bitmap; } else { return null; } } /** * Returns the system time of when the last preview frame was received * * @return long */ public long getLastPreviewFrameTime() { return mLastPreviewFrameTime; } public Context getContext() { return mContext; } /** * Defines a new size for the recorded picture * XXX: Should it update preview size?! * * @param sz The new picture size */ public void setPictureSize(Camera.Size sz) { Camera.Parameters params = getParameters(); params.setPictureSize(sz.width, sz.height); mCamera.setParameters(params); } /** * Defines a new size for the recorded picture * @param sz The size string in format widthxheight */ public void setPictureSize(String sz) { String[] splat = sz.split("x"); int width = Integer.parseInt(splat[0]); int height = Integer.parseInt(splat[1]); setParameterAsync("picture-size", Integer.toString(width) + "x" + Integer.toString(height)); } /** * Takes a snapshot */ public void takeSnapshot(Camera.ShutterCallback shutterCallback, Camera.PictureCallback raw, Camera.PictureCallback jpeg) { Log.v(TAG, "takePicture"); SoundManager.getSingleton().play(SoundManager.SOUND_SHUTTER); mCamera.takePicture(shutterCallback, raw, jpeg); } /** * Prepares the MediaRecorder to record a video. This must be called before * startVideoRecording to setup the recording environment. * * @param fileName Target file path * @param profile Target profile (quality) */ public void prepareVideoRecording(String fileName, CamcorderProfile profile) { // Unlock the camera for use with MediaRecorder mCamera.unlock(); mMediaRecorder.setCamera(mCamera); mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER); mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); mMediaRecorder.setProfile(profile); mMediaRecorder.setOutputFile(fileName); // Set maximum file size. long maxFileSize = Storage.getStorage().getAvailableSpace() - Storage.LOW_STORAGE_THRESHOLD; mMediaRecorder.setMaxFileSize(maxFileSize); mMediaRecorder.setMaxDuration(0); // infinite mMediaRecorder.setPreviewDisplay(mPreview.getSurfaceHolder().getSurface()); try { mMediaRecorder.prepare(); } catch (IllegalStateException e) { Log.e(TAG, "Cannot prepare MediaRecorder", e); } catch (IOException e) { Log.e(TAG, "Cannot prepare MediaRecorder", e); } mPreview.postCallbackBuffer(); } public void startVideoRecording() { Log.v(TAG, "startVideoRecording"); mMediaRecorder.start(); mPreview.postCallbackBuffer(); } public void stopVideoRecording() { Log.v(TAG, "stopVideoRecording"); mMediaRecorder.stop(); mCamera.lock(); mMediaRecorder.reset(); mPreview.postCallbackBuffer(); } /** * Returns the orientation of the device * * @return */ public int getOrientation() { return mOrientation; } public void setOrientation(int orientation) { mOrientation = orientation; } public void restartPreviewIfNeeded() { new Thread() { public void run() { try { mCamera.startPreview(); } catch (Exception e) { // ignore } } }.start(); } public void setCameraMode(final int mode) { if (mPreviewPauseListener != null) { mPreviewPauseListener.onPreviewPause(); } // Unlock any exposure/stab lock that was caused by // swiping the ring setLockSetup(false); new Thread() { public void run() { // We voluntarily sleep the thread here for the animation being done // in the CameraActivity try { Thread.sleep(200); } catch (InterruptedException e) { e.printStackTrace(); } Camera.Parameters params = getParameters(); if (mode == CameraActivity.CAMERA_MODE_VIDEO) { params.setRecordingHint(true); } else { params.setRecordingHint(false); } mIsModeSwitching = true; synchronized (mParametersThread) { mCamera.stopPreview(); if (mode == CameraActivity.CAMERA_MODE_PANO) { // Apply special settings for panorama mode initializePanoramaMode(); } else { // Make sure the Infinity mode from panorama is gone params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO); } if (mode == CameraActivity.CAMERA_MODE_PICSPHERE) { // If we are in PicSphere mode, set pic size to 640x480 to avoid using // all the phone's resources when rendering, as well as not take 15 min // to render. Eventually, we could put up a setting somewhere to let users // rendering super high quality pictures. params.setPictureSize(640, 480); params.setPreviewSize(640, 480); // Set focus mode to infinity setInfinityFocus(params); } else { params.setPreviewSize(mTargetSize.x, mTargetSize.y); } mCamera.setParameters(params); mParameters = mCamera.getParameters(); try { mCamera.startPreview(); mPreview.notifyPreviewSize(mTargetSize.x, mTargetSize.y); } catch (RuntimeException e) { Log.e(TAG, "Unable to start preview", e); } } mPreview.postCallbackBuffer(); mIsModeSwitching = false; if (mPreviewPauseListener != null) { mPreviewPauseListener.onPreviewResume(); } } }.start(); } /** * Initializes the Panorama (mosaic) mode */ private void initializePanoramaMode() { Camera.Parameters parameters = getParameters(); int pixels = mContext.getResources().getInteger(R.integer.config_panoramaDefaultWidth) * mContext.getResources().getInteger(R.integer.config_panoramaDefaultHeight); List<Camera.Size> supportedSizes = parameters.getSupportedPreviewSizes(); Point previewSize = Util.findBestPanoPreviewSize(supportedSizes, false, false, pixels); Log.v(TAG, "preview h = " + previewSize.y + " , w = " + previewSize.x); parameters.setPreviewSize(previewSize.x, previewSize.y); mTargetSize = previewSize; List<Camera.Size> supportedPicSizes = parameters.getSupportedPictureSizes(); - Point pictureSize = Util.findBestPanoPreviewSize(supportedPicSizes, false, false, pixels); - parameters.setPictureSize(pictureSize.x, pictureSize.y); + if (supportedPicSizes.contains(mTargetSize)) { + parameters.setPictureSize(mTargetSize.x, mTargetSize.y); + } List<int[]> frameRates = parameters.getSupportedPreviewFpsRange(); int last = frameRates.size() - 1; int minFps = (frameRates.get(last))[Camera.Parameters.PREVIEW_FPS_MIN_INDEX]; int maxFps = (frameRates.get(last))[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]; parameters.setPreviewFpsRange(minFps, maxFps); Log.v(TAG, "preview fps: " + minFps + ", " + maxFps); setInfinityFocus(parameters); parameters.set("recording-hint", "false"); mParameters = parameters; } private void setInfinityFocus(Camera.Parameters parameters) { List<String> supportedFocusModes = parameters.getSupportedFocusModes(); if (supportedFocusModes.indexOf(Camera.Parameters.FOCUS_MODE_INFINITY) >= 0) { parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY); } else { // Use the default focus mode and log a message Log.w(TAG, "Cannot set the focus mode to " + Camera.Parameters.FOCUS_MODE_INFINITY + " because the mode is not supported."); } } /** * Trigger the autofocus function of the device * * @param cb The AF callback * @return true if we could start the AF, false otherwise */ public boolean doAutofocus(final AutoFocusCallback cb) { if (mCamera != null) { try { // make sure our auto settings aren't locked setLockSetup(false); // trigger af mCamera.cancelAutoFocus(); mHandler.post(new Runnable() { public void run() { try { mCamera.autoFocus(cb); } catch (Exception e) { } } }); } catch (Exception e) { return false; } return true; } else { return false; } } /** * Returns whether or not the current open camera device supports * focus area (focus ring) * * @return true if supported */ public boolean isFocusAreaSupported() { if (mCamera != null) { try { return (getParameters().getMaxNumFocusAreas() > 0); } catch (Exception e) { return false; } } else { return false; } } /** * Returns whether or not the current open camera device supports * exposure metering area (exposure ring) * * @return true if supported */ public boolean isExposureAreaSupported() { if (mCamera != null) { try { return (getParameters().getMaxNumMeteringAreas() > 0); } catch (Exception e) { return false; } } else { return false; } } /** * Defines the main focus point of the camera to the provided x and y values. * Those values must between -1000 and 1000, where -1000 is the top/left, and 1000 the bottom/right * * @param x The X position of the focus point * @param y The Y position of the focus point */ public void setFocusPoint(int x, int y) { Camera.Parameters params = getParameters(); if (params.getMaxNumFocusAreas() > 0) { List<Camera.Area> focusArea = new ArrayList<Camera.Area>(); focusArea.add(new Camera.Area(new Rect(x, y, x + FOCUS_WIDTH, y + FOCUS_HEIGHT), 1000)); params.setFocusAreas(focusArea); try { mCamera.setParameters(params); } catch (Exception e) { // ignore, we might be setting it too fast since previous attempt } } } /** * Defines the exposure metering point of the camera to the provided x and y values. * Those values must between -1000 and 1000, where -1000 is the top/left, and 1000 the bottom/right * * @param x The X position of the exposure metering point * @param y The Y position of the exposure metering point */ public void setExposurePoint(int x, int y) { Camera.Parameters params = getParameters(); if (params != null && params.getMaxNumMeteringAreas() > 0) { List<Camera.Area> exposureArea = new ArrayList<Camera.Area>(); exposureArea.add(new Camera.Area(new Rect(x, y, x + FOCUS_WIDTH, y + FOCUS_HEIGHT), 1000)); params.setMeteringAreas(exposureArea); try { mCamera.setParameters(params); } catch (Exception e) { // ignore, we might be setting it too fast since previous attempt } } } public void setAutoFocusMoveCallback(AutoFocusMoveCallback cb) { mAutoFocusMoveCallback = cb; if (mCamera != null) mCamera.setAutoFocusMoveCallback(cb); } /** * Enable the device image stabilization system. * @param enabled */ public void setStabilization(boolean enabled) { Camera.Parameters params = getParameters(); if (params == null) return; if (CameraActivity.getCameraMode() == CameraActivity.CAMERA_MODE_PHOTO) { // In wrappers: sony has sony-is, HTC has ois_mode, etc. if (params.get("image-stabilization") != null) { params.set("image-stabilization", enabled ? "on" : "off"); } } else if (CameraActivity.getCameraMode() == CameraActivity.CAMERA_MODE_VIDEO) { if (params.isVideoStabilizationSupported()) { params.setVideoStabilization(enabled); } } mCamera.setParameters(params); } /** * Sets the camera device to render to a texture rather than a SurfaceHolder * @param texture The texture to which render */ public void setRenderToTexture(SurfaceTexture texture) { mPreview.setRenderToTexture(texture); Log.i(TAG, "Needs to render to texture, rebooting preview"); mPreview.notifyCameraChanged(); } /** * Redirect the camera preview callbacks to the specified preview callback rather than the * default preview callback. * @param cb The callback */ public void deviatePreviewCallbackWithBuffer(Camera.PreviewCallback cb) { mCamera.setPreviewCallbackWithBuffer(cb); } /** * The CameraPreview class handles the Camera preview feed * and setting the surface holder. */ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback, Camera.PreviewCallback { private final static String TAG = "CameraManager.CameraPreview"; private SurfaceHolder mHolder; private SurfaceTexture mTexture; private byte[] mLastFrameBytes; public CameraPreview(Context context) { super(context); // Install a SurfaceHolder.Callback so we get notified when the // underlying surface is created and destroyed. mHolder = getHolder(); mHolder.addCallback(this); } /** * Sets that the camera preview should rather render to a texture than the default * SurfaceHolder. * Note that you have to restart camera preview manually after setting this. * Set to null to reset render to the SurfaceHolder. * * @param texture */ public void setRenderToTexture(SurfaceTexture texture) { mTexture = texture; } public SurfaceTexture getSurfaceTexture() { return mTexture; } public void notifyPreviewSize(int width, int height) { mLastFrameBytes = new byte[(int) (width * height * 1.5 + 0.5)]; } public byte[] getLastFrameBytes() { return mLastFrameBytes; } public SurfaceHolder getSurfaceHolder() { return mHolder; } public void notifyCameraChanged() { if (mCamera != null) { mCamera.stopPreview(); setupCamera(); try { if (mTexture != null) { Log.e(TAG, "Using texture"); mCamera.setPreviewTexture(mTexture); } else { Log.e(TAG, "Using holder"); mCamera.setPreviewDisplay(mHolder); } mCamera.startPreview(); mPreview.postCallbackBuffer(); } catch (IOException e) { Log.e(TAG, "Error setting camera preview: " + e.getMessage()); } } } public void surfaceCreated(SurfaceHolder holder) { // The Surface has been created, now tell the camera where to draw the preview. if (mCamera == null) return; try { if (mTexture != null) { mCamera.setPreviewTexture(mTexture); } else { mCamera.setPreviewDisplay(mHolder); } mCamera.startPreview(); mPreview.postCallbackBuffer(); } catch (IOException e) { Log.e(TAG, "Error setting camera preview: " + e.getMessage()); } } public void surfaceDestroyed(SurfaceHolder holder) { // empty. Take care of releasing the Camera preview in your activity. } public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { if (mHolder.getSurface() == null) { // preview surface does not exist return; } // stop preview before making changes try { mCamera.stopPreview(); } catch (Exception e) { // ignore: tried to stop a non-existent preview } setupCamera(); // start preview with new settings try { if (mTexture != null) { mCamera.setPreviewTexture(mTexture); } else { mCamera.setPreviewDisplay(mHolder); } mCamera.startPreview(); mParameters = mCamera.getParameters(); } catch (Exception e) { Log.d(TAG, "Error starting camera preview: " + e.getMessage()); } } public void postCallbackBuffer() { mCamera.addCallbackBuffer(mLastFrameBytes); mCamera.setPreviewCallbackWithBuffer(this); } private void setupCamera() { // Set device-specifics here try { Camera.Parameters params = mCamera.getParameters(); if (getResources().getBoolean(R.bool.config_qualcommZslCameraMode)) { params.set("camera-mode", 1); } mCamera.setParameters(params); postCallbackBuffer(); } catch (Exception e) { Log.e(TAG, "Could not set device specifics"); } } @Override public void onPreviewFrame(byte[] data, Camera camera) { mLastPreviewFrameTime = System.currentTimeMillis(); if (mCamera != null) { mCamera.addCallbackBuffer(mLastFrameBytes); } } } }

diff --git a/polly.reminds/src/commands/AbstractRemindCommand.java b/polly.reminds/src/commands/AbstractRemindCommand.java index 22586900..bdb73fe7 100644 --- a/polly.reminds/src/commands/AbstractRemindCommand.java +++ b/polly.reminds/src/commands/AbstractRemindCommand.java @@ -1,49 +1,51 @@ package commands; import core.RemindFormatter; import core.RemindManager; import de.skuzzle.polly.sdk.Command; import de.skuzzle.polly.sdk.FormatManager; import de.skuzzle.polly.sdk.MyPolly; import entities.RemindEntity; public class AbstractRemindCommand extends Command { protected RemindManager remindManager; protected final static RemindFormatter FORMATTER = new RemindFormatter() { @Override protected String formatRemind(RemindEntity remind, FormatManager formatter) { - return "Erinnerung f�r " + remind.getForUser() + " gespeichert."; + // ISSUE: 0000032, fixed + return "Erinnerung f�r " + remind.getForUser() + " gespeichert. (F�llig: " + + formatter.formatDate(remind.getDueDate()) + ")"; } @Override protected String formatMessage(RemindEntity remind, FormatManager formatter) { return "Nachricht f�r " + remind.getForUser() + " hinterlassen."; } }; public AbstractRemindCommand(MyPolly polly, RemindManager manager, String commandName) { super(polly, commandName); this.remindManager = manager; } protected RemindEntity addRemind(RemindEntity remind, boolean schedule) { this.remindManager.addRemind(remind); if (schedule) { this.remindManager.scheduleRemind(remind, remind.getDueDate()); } return remind; } } \ No newline at end of file

diff --git a/java/bypshttp/src/byps/http/HWireClientR.java b/java/bypshttp/src/byps/http/HWireClientR.java index 665972be..62cdc095 100644 --- a/java/bypshttp/src/byps/http/HWireClientR.java +++ b/java/bypshttp/src/byps/http/HWireClientR.java @@ -1,390 +1,394 @@ package byps.http; /* USE THIS FILE ACCORDING TO THE COPYRIGHT RULES IN LICENSE.TXT WHICH IS PART OF THE SOURCE CODE PACKAGE */ import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.LinkedBlockingQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import byps.BAsyncResult; import byps.BContentStream; import byps.BException; import byps.BExceptionC; import byps.BMessage; import byps.BMessageHeader; import byps.BStreamRequest; import byps.BWire; public class HWireClientR extends BWire { public HWireClientR(BWire wireServer) { super(wireServer.getFlags()); this.wireServer = wireServer; } @Override public synchronized void cancelAllRequests() { if (log.isDebugEnabled()) log.debug("cancelAllRequests("); canceled = true; BException bex = new BException(BExceptionC.CANCELLED, "Longpoll canceled"); // Notify the threads inside the server waiting for results that the // their calls are canceled. for (BAsyncResult<BMessage> asyncResult : mapAsyncResults.values()) { // Gib iBuf an den Thread weiter, der auf das Resultat wartet. synchronized (asyncResult) { if (log.isDebugEnabled()) log.debug("pass cancel message to asyncResult, notify thread waiting in send()"); - asyncResult.setAsyncResult(null, bex); + try { + asyncResult.setAsyncResult(null, bex); + } catch (Throwable ex) { + // just make sure, that all results are handled. + } asyncResult.notifyAll(); } } // Notify the client that the long-poll has finished. for (AsyncRequestFromLongpoll lrequest : lonpollRequests) { try { lrequest.request.setAsyncResult(null, bex); } catch (Throwable ignored) { // happens, if the HTTP session has already been invalidated } } lonpollRequests.clear(); if (log.isDebugEnabled()) log.debug(")cancelAllRequests"); } /** * Receive a long poll (reverse HTTP) request. * * The HTTP request body (stored in ibuf) contains the response from the * client. The send() function is waiting for this response. As send() has * started the request, it has put an BAsyncResult object into the map * asyncResults_access_sync associated with the key messageId. This object is * found by the messageId and ibuf is passed to it by a call to * setAsyncResult. * * The HTTP response has been encapsulated in parameter asyncRequest by the * caller. It will receive the next call when the server has to invoke the * client. Until the server needs the asyncRequest, it is stored in the map * asyncRequests_access_sync. The send() function takes the asyncRequest from * there and writes the request bytes into it. * * @param messageId * @param ibuf * @param asyncRequest * @throws IOException */ public void recvLongPoll(BMessage ibuf, final BAsyncResult<BMessage> nextRequest) throws IOException { if (log.isDebugEnabled()) log.debug("recvLongPoll(messageId=" + ibuf.header.messageId); if (log.isDebugEnabled()) log.debug("message buffer=" + ibuf); // Function send() has stored its parameter BAsyncResult mapped under the messageId. BAsyncResult<BMessage> asyncResult = mapAsyncResults.remove(ibuf.header.messageId); if (log.isDebugEnabled()) log.debug("asyncResult for messageId: " + asyncResult); // If a BAsyncResult object is found ... if (asyncResult != null) { // ... pass ibuf as result. if (log.isDebugEnabled()) log.debug("pass message buffer to asyncResult"); asyncResult.setAsyncResult(ibuf, null); } else { // Function send() has not been called before. } // If function send() could not find a pending long-poll, it pushed // the message into the queue of pending messages. PendingMessage pendingMessage = pendingMessages.poll(); // Pending message available? ... if (pendingMessage != null) { // ... send the pending message immediately to the client. nextRequest.setAsyncResult(pendingMessage.msg, null); } else { // ... push the long-poll into the queue. lonpollRequests.add(new AsyncRequestFromLongpoll(nextRequest, ibuf.header)); if (log.isDebugEnabled()) log.debug("add longpoll to list, #polls=" + lonpollRequests.size()); } if (log.isDebugEnabled()) log.debug(")recvLongPoll"); } @Override public void send(BMessage msg, BAsyncResult<BMessage> asyncResult) { if (log.isDebugEnabled()) log.debug("send(" + msg + ", asyncResult=" + asyncResult); try { final long messageId = msg.header.messageId; // Save result object for next long-poll if (log.isDebugEnabled()) log.debug("map messageId=" + messageId + " to asyncResult=" + asyncResult); mapAsyncResults.put(messageId, asyncResult); for (int i = 0; i < 2; i++) { // If canceled, set BExceptionC.CLIENT_DIED to asyncResult if (canceled) { terminateMessage(messageId, null); break; } // Find valid long-poll request object BAsyncResult<BMessage> asyncRequest = getNextLongpollRequestOrPushMessage(msg); // No long-poll found? if (asyncRequest == null) { // The message was pushed into pendingMessages_access_sync. // It will be sent in the next call to recvLongPoll. break; } // Send the message try { asyncRequest.setAsyncResult(msg, null); break; } catch (Throwable e) { if (e.toString().indexOf("ClientAbortException") >= 0) { terminateMessage(messageId, e); break; } else { // The underlying long-poll request has already timed out. // Maybe there is another connection available. // -> retry } } } } catch (Throwable e) { if (log.isWarnEnabled()) log.warn("Failed to send reverse message.", e); asyncResult.setAsyncResult(null, e); } if (log.isDebugEnabled()) log.debug(")send"); } protected BAsyncResult<BMessage> getNextLongpollRequestOrPushMessage(BMessage msg) { // Get next long-poll request from queue. AsyncRequestFromLongpoll longpollRequest = lonpollRequests.poll(); // long-poll active? ... if (longpollRequest != null) return longpollRequest.request; // Push message into the queue of pending messages. // This message will be immediately sent at the next time recvLongPoll is called. if (!pendingMessages.offer(new PendingMessage(msg))) { // Queue is full, terminate message with error. if (log.isDebugEnabled()) log.debug("Failed to add pending msg=" + msg); BException ex = new BException(BExceptionC.TOO_MANY_REQUESTS, "Failed to add pending message."); terminateMessage(msg.header.messageId, ex); } return null; } @Override public void putStreams(List<BStreamRequest> streamRequests, BAsyncResult<BMessage> asyncResult) { wireServer.putStreams(streamRequests, asyncResult); }; @Override public BContentStream getStream(long messageId, long strmId) throws IOException { return wireServer.getStream(messageId, strmId); } /** * Terminate the message to be sent to the client. * The caller receives a {@link BExceptionC#CLIENT_DIED}. * @param messageId * @param e Exception used for BException detail. */ protected void terminateMessage(final long messageId, Throwable e) { BException bex = null; // Get the asyncResult pushed from the send() method into the // asyncResults_access_sync map. BAsyncResult<BMessage> asyncResult = mapAsyncResults.remove(messageId); if (asyncResult != null) { if (e instanceof BException) { bex = (BException)e; } else { // Find the innermost exception cause Throwable innerException = e; while (e != null) { innerException = e; e = e.getCause(); } // Notify the caller of send() with an exception. bex = new BException(BExceptionC.CLIENT_DIED, "", innerException); } } asyncResult.setAsyncResult(null, bex); } /** * This function releases expired long-polls and messages. * The client application receives a status code 204 for a long-poll. */ public void cleanup() { ArrayList<AsyncRequestFromLongpoll> lpolls = removeExpiredLongpolls(); ArrayList<PendingMessage> msgs = getExpiredMessages(); if (lpolls.size() != 0) { // The client should send a new long-poll. // HWriteResponseHelper will return HTTP status cod 204 BException ex = new BException(BExceptionC.RESEND_LONG_POLL, ""); for (AsyncRequestFromLongpoll lrequest : lpolls) { try { lrequest.request.setAsyncResult(null, ex); } catch (Throwable e) { // catch "Response already written" if (log.isDebugEnabled()) log.debug("Failed to respond to longpoll=" + lrequest, e); } } } if (msgs.size() != 0) { BException ex = new BException(BExceptionC.TIMEOUT, "Timeout while waiting for reverse request."); for (PendingMessage msg : msgs) { try { terminateMessage(msg.msg.header.messageId, ex); } catch (Throwable e) { // just make sure that cleanup runs over all messages. if (log.isDebugEnabled()) log.debug("Failed to terminate pending message=" + msg, e); } } } } /** * Remove expired long-poll requests from internal list. * @return Removed long-poll requests. */ protected ArrayList<AsyncRequestFromLongpoll> removeExpiredLongpolls() { ArrayList<AsyncRequestFromLongpoll> ret = new ArrayList<AsyncRequestFromLongpoll>(); boolean found = true; while (found) { found = false; for (Iterator<AsyncRequestFromLongpoll> it = lonpollRequests.iterator(); it.hasNext(); ) { AsyncRequestFromLongpoll lrequest = it.next(); if (lrequest.isExpired()) { ret.add(lrequest); it.remove(); found = true; break; } } } return ret; } /** * Remove expired messages. * A message is terminated, if it has been waiting more than {@link HConstants#MAX_WAIT_FOR_LONGPOLL_MILLIS} * for a long-poll. */ protected ArrayList<PendingMessage> getExpiredMessages() { ArrayList<PendingMessage> ret = new ArrayList<PendingMessage>(); boolean foundOne = true; while (foundOne) { foundOne = false; for (Iterator<PendingMessage> it = pendingMessages.iterator(); it.hasNext(); ) { PendingMessage pendingMessage = it.next(); if (pendingMessage.isExpired()) { it.remove(); ret.add(pendingMessage); foundOne = true; break; } } } return ret; } static class AsyncRequestFromLongpoll { final long bestBefore; //Date dt; final BAsyncResult<BMessage> request; final BMessageHeader header; AsyncRequestFromLongpoll(BAsyncResult<BMessage> request, BMessageHeader header) { this.request = request; this.header = header; long timeout = header.timeoutSeconds != 0 ? (header.timeoutSeconds*1000) : HConstants.TIMEOUT_LONGPOLL_MILLIS; this.bestBefore = System.currentTimeMillis() + timeout; //this.dt = new Date(bestBefore); } boolean isExpired() { return bestBefore < System.currentTimeMillis(); } public String toString() { return "[" + header + ", expired=" + isExpired() + ", bestBefore=" + new Date(bestBefore) + "]"; } } static class PendingMessage { long bestBefore; BMessage msg; PendingMessage(BMessage msg) { this.msg = msg; this.bestBefore = System.currentTimeMillis() + HConstants.MAX_WAIT_FOR_LONGPOLL_MILLIS; } boolean isExpired() { return bestBefore < System.currentTimeMillis(); } public String toString() { return "[" + msg + ", expired=" + isExpired() + ", bestBefore=" + new Date(bestBefore) + "]"; } } private final BlockingQueue<AsyncRequestFromLongpoll> lonpollRequests = new LinkedBlockingQueue<AsyncRequestFromLongpoll>(); private final ConcurrentHashMap<Long, BAsyncResult<BMessage>> mapAsyncResults = new ConcurrentHashMap<Long, BAsyncResult<BMessage>>(); private final BlockingQueue<PendingMessage> pendingMessages = new LinkedBlockingQueue<PendingMessage>(); private final BWire wireServer; private final Log log = LogFactory.getLog(HWireClientR.class); private volatile boolean canceled; } diff --git a/java/bypshttp/src/byps/http/HWireServer.java b/java/bypshttp/src/byps/http/HWireServer.java index 9b170e3b..3cefb5bb 100644 --- a/java/bypshttp/src/byps/http/HWireServer.java +++ b/java/bypshttp/src/byps/http/HWireServer.java @@ -1,277 +1,283 @@ package byps.http; /* USE THIS FILE ACCORDING TO THE COPYRIGHT RULES IN LICENSE.TXT WHICH IS PART OF THE SOURCE CODE PACKAGE */ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; import java.io.OutputStream; import java.nio.ByteBuffer; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import byps.BAsyncResult; import byps.BContentStream; import byps.BException; import byps.BMessage; import byps.BMessageHeader; import byps.BStreamRequest; import byps.BWire; public class HWireServer extends BWire { private final HWriteResponseHelper writeHelper; public final HActiveMessages activeMessages = new HActiveMessages(); private final Log log = LogFactory.getLog(HWireServer.class); private final File tempDir; public HWireServer(HWriteResponseHelper writeHelper, File tempDir) { super(FLAG_DEFAULT); this.writeHelper = writeHelper; activeMessages.init(tempDir); if (tempDir == null) { String tempDirStr = System.getProperty("java.io.tmpdir"); if (tempDirStr != null && tempDirStr.length() != 0) { tempDir = new File(tempDirStr); } else { tempDir = new File("."); } tempDir = new File(tempDir, "byps"); } this.tempDir = tempDir; } public void done() { if (log.isDebugEnabled()) log.debug("done("); activeMessages.done(); if (log.isDebugEnabled()) log.debug(")done"); } private class MyIncomingInputStream extends BWire.InputStreamWrapper { public MyIncomingInputStream(long messageId, long streamId) { super(messageId, streamId); } @Override public String toString() { return "[" + messageId + "," + streamId + "]"; } @Override protected InputStream openStream() throws IOException { if (log.isDebugEnabled()) log.debug("openStream("); BContentStream is = null; try { is = activeMessages.getIncomingStream(messageId, streamId, HConstants.REQUEST_TIMEOUT_MILLIS); if (log.isDebugEnabled()) log.debug("stream for messageId=" + messageId + ", streamId=" + streamId + ", is=" + is); if (is == null) { throw new IOException("Timeout while waiting for stream"); } } catch (InterruptedException e) { if (log.isDebugEnabled()) log.debug("interrupted " + e); throw new InterruptedIOException("Interrupted"); } if (log.isDebugEnabled()) log.debug(")openStream=" + is); return is; } @Override public BContentStream cloneInputStream() throws IOException { if (log.isDebugEnabled()) log.debug("cloneInputStream("); final BContentStream src = (BContentStream) ensureStream(); final BContentStream ret = src.cloneInputStream(); if (log.isDebugEnabled()) log.debug(")cloneInputStream=" + ret); return ret; } @Override public long getContentLength() throws IOException { BContentStream src = (BContentStream) ensureStream(); return src.getContentLength(); } @Override public String getContentType() throws IOException { BContentStream src = (BContentStream) ensureStream(); return src.getContentType(); } } public void cleanup() { if (log.isDebugEnabled()) log.debug("cleanup("); activeMessages.cleanup(false); if (log.isDebugEnabled()) log.debug(")cleanup"); } @Override public BContentStream getStream(long messageId, long streamId) throws IOException { if (log.isDebugEnabled()) log.debug("getStream(messageId=" + messageId + ", streamId=" + streamId); MyIncomingInputStream is = new MyIncomingInputStream(messageId, streamId); if (log.isDebugEnabled()) log.debug(")getStream=" + is); return is; } @Override public void putStreams(List<BStreamRequest> streamRequests, BAsyncResult<BMessage> asyncResult) { if (log.isDebugEnabled()) log.debug("putStreams("); try { activeMessages.addOutgoingStreams(streamRequests); } catch (BException e) { // An exception is thrown, if the message has been canceled. if (log.isDebugEnabled()) log.debug("Exception: " + e); } if (log.isDebugEnabled()) log.debug(")putStreams"); } private class AsyncMessageResponse implements BAsyncResult<BMessage> { final boolean isAsync; final BMessageHeader header; private final Log log = LogFactory.getLog("AsyncMessageResponse"); AsyncMessageResponse(BMessageHeader header, boolean isAsync) { this.header = header; this.isAsync = isAsync; } @Override public void setAsyncResult(BMessage msg, Throwable e) { if (log.isDebugEnabled()) log.debug("setAsyncResult(" + msg + ", e=" + e); try { ByteBuffer buf = null; if (msg != null) { putStreams(msg.streams, null); buf = msg.buf; } writeResponse(header.messageId, buf, e, isAsync); } catch (IOException ex) { // Tomcat: Client abort Exception if (log.isDebugEnabled()) log.debug("ClientAbortException"); // Client has closed the connection. throw new IllegalStateException(ex); } catch (Throwable ex) { - log.error("Failed to write response.", ex); + // Seen under high load: + // called from HWireClientR.cancelAllRequests: + // java.lang.IllegalStateException: Calling [asyncComplete()] is not valid for a request with Async state [DISPATCHED] + // java.lang.IllegalStateException: The request associated with the AsyncContext has already completed processing. + // called from HWireClientR.cleanup + // java.lang.IllegalStateException: The request associated with the AsyncContext has already completed processing. + if (log.isDebugEnabled()) log.debug("Failed to write response.", ex); throw new IllegalStateException(ex); } finally { // Alle Streams zur Anfrage m�ssen geschlossen sein. // Dies stellt sicher, dass nicht versucht wird, einen eingehenden // Stream // als ausgehenden Stream zur�ckzugeben activeMessages.closeMessageIncomingStreams(header.messageId); } if (log.isDebugEnabled()) log.debug(")setAsyncResult"); } @Override public String toString() { return "[" + header.messageId + "]"; } }; private void writeResponse(Long messageId, ByteBuffer obuf, Throwable e, boolean isAsync) throws IOException { if (log.isDebugEnabled()) log.debug("writeResponse(messageId=" + messageId + ", obuf=" + obuf + ", exception=" + e); HRequestContext rctxt = activeMessages.getAndRemoveRequestContext(messageId); if (log.isDebugEnabled()) log.debug("async context of messageId: " + rctxt); if (rctxt == null) { // An async request could be already completed if a timeout has occurred. if (log.isDebugEnabled()) log.debug("No async context for messageId=" + messageId + ", message already written or an exception occured while it was beeing written before."); throw new IOException("Response already written."); } else { writeHelper.writeResponse(obuf, e, (HttpServletResponse) rctxt.getResponse(), isAsync); rctxt.complete(); } if (log.isDebugEnabled()) log.debug(")writeResponse"); } public BAsyncResult<BMessage> addMessage(final BMessageHeader header, HRequestContext rctxt, Thread workerThread) { if (log.isDebugEnabled()) log.debug("addMessage(" + rctxt + ", messageId=" + header.messageId); BAsyncResult<BMessage> asyncResponse = new AsyncMessageResponse(header, rctxt.isAsync()); try { activeMessages.addMessage(header, rctxt, workerThread); } catch (BException e) { try { writeHelper.writeResponse(null, e, (HttpServletResponse) rctxt.getResponse(), true); } catch (IOException e1) { if (log.isWarnEnabled()) log.warn("Failed to write error response.", e1); } rctxt.complete(); asyncResponse = null; } if (log.isDebugEnabled()) log.debug(")addMessage=" + header.messageId); return asyncResponse; } public void sendOutgoingStream(Long messageId, Long streamId, HttpServletResponse response) throws IOException { if (log.isDebugEnabled()) log.debug("sendOutgoingStream(streamId=" + streamId + ", response=" + response); BContentStream is = null; OutputStream os = null; try { is = activeMessages.getOutgoingStream(messageId, streamId); final String contentType = is.getContentType(); final long contentLength = is.getContentLength(); response.setContentType(contentType); if (contentLength >= 0) { response.setHeader("Content-Length", Long.toString(contentLength)); } os = response.getOutputStream(); byte[] buf = new byte[HConstants.DEFAULT_BYTE_BUFFER_SIZE]; int len = 0; while ((len = is.read(buf)) != -1) { os.write(buf, 0, len); } } catch (IOException e) { throw e; } catch (Throwable e) { throw new IOException("Read stream failed.", e); } finally { if (log.isDebugEnabled()) log.debug("close response of outgoing stream, streamId=" + streamId); if (is != null) try { is.close(); } catch (IOException ignored) { } if (os != null) try { os.close(); } catch (IOException ignored) { } } if (log.isDebugEnabled()) log.debug(")sendOutgoingStream"); } @Override public void send(BMessage msg, BAsyncResult<BMessage> asyncResult) { throw new IllegalStateException("BWireServer.send must not be called"); } public File getTempDir() { return tempDir; } }

diff --git a/src/com/android/phone/TelephonyCapabilities.java b/src/com/android/phone/TelephonyCapabilities.java index 53da7f66..ebb68386 100644 --- a/src/com/android/phone/TelephonyCapabilities.java +++ b/src/com/android/phone/TelephonyCapabilities.java @@ -1,214 +1,213 @@ /* * Copyright (C) 2010 The Android Open Source Project * * 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 com.android.phone; import android.content.Context; import android.provider.Settings; import android.util.Log; import com.android.internal.telephony.Phone; /** * TODO: This is intended as a temporary repository for behavior policy * functions that depend upon the type of phone or the carrier. Ultimately * these sorts of questions should be answered by the telephony layer. */ public class TelephonyCapabilities { private static final String LOG_TAG = "TelephonyCapabilities"; /** This class is never instantiated. */ private TelephonyCapabilities() { } /** * On GSM devices, we never use short tones. * On CDMA devices, it depends upon the settings. * TODO: I don't think this has anything to do with GSM versus CDMA, * should we be looking only at the setting? */ /* package */ static boolean useShortDtmfTones(Phone phone, Context context) { int phoneType = phone.getPhoneType(); if (phoneType == Phone.PHONE_TYPE_GSM) { return false; } else if (phoneType == Phone.PHONE_TYPE_CDMA) { int toneType = android.provider.Settings.System.getInt( context.getContentResolver(), Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL); if (toneType == CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL) { return true; } else { return false; } } else if (phoneType == Phone.PHONE_TYPE_SIP) { - // TODO: confirm SipPhone supports this - return true; + return false; } else { throw new IllegalStateException("Unexpected phone type: " + phoneType); } } /** * Return true if the current phone supports ECM ("Emergency Callback * Mode"), which is a feature where the device goes into a special * state for a short period of time after making an outgoing emergency * call. * * (On current devices, that state lasts 5 minutes. It prevents data * usage by other apps, to avoid conflicts with any possible incoming * calls. It also puts up a notification in the status bar, showing a * countdown while ECM is active, and allowing the user to exit ECM.) * * Currently this is assumed to be true for CDMA phones, and false * otherwise. * * TODO: This capability should really be exposed by the telephony * layer, since it depends on the underlying telephony technology. * (Or, is this actually carrier-specific? Is it VZW-only?) */ /* package */ static boolean supportsEcm(Phone phone) { return (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA); } /** * Return true if the current phone supports Over The Air Service * Provisioning (OTASP) * * Currently this is assumed to be true for CDMA phones, and false * otherwise. * * TODO: This capability should really be exposed by the telephony * layer, since it depends on the underlying telephony technology. * * TODO: Watch out: this is also highly carrier-specific, since the * OTA procedure is different from one carrier to the next, *and* the * different carriers may want very different onscreen UI as well. * The procedure may even be different for different devices with the * same carrier. * * So we eventually will need a much more flexible, pluggable design. * This method here is just a placeholder to reduce hardcoded * "if (CDMA)" checks sprinkled throughout the rest of the phone app. * * TODO: consider using the term "OTASP" rather "OTA" everywhere in the * phone app, since OTA can also mean over-the-air software updates. */ /* package */ static boolean supportsOtasp(Phone phone) { return (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA); } /** * Return true if the current phone can retrieve the voice message count. * * Currently this is assumed to be true on CDMA phones and false otherwise. * * TODO: This capability should really be exposed by the telephony * layer, since it depends on the underlying telephony technology. */ /* package */ static boolean supportsVoiceMessageCount(Phone phone) { return (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA); } /** * Return true if this phone allows the user to select which * network to use. * * Currently this is assumed to be true only on GSM phones. * * TODO: Should CDMA phones allow this as well? */ /* package */ static boolean supportsNetworkSelection(Phone phone) { return (phone.getPhoneType() == Phone.PHONE_TYPE_GSM); } /** * Returns a resource ID for a label to use when displaying the * "device id" of the current device. (This is currently used as the * title of the "device id" dialog.) * * This is specific to the device's telephony technology: the device * id is called "IMEI" on GSM phones and "MEID" on CDMA phones. * TODO: ultimately this name should come directly from the * telephony layer. */ /* package */ static int getDeviceIdLabel(Phone phone) { if (phone.getPhoneType() == Phone.PHONE_TYPE_GSM) { return R.string.imei; } else if (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA) { return R.string.meid; } else { Log.w(LOG_TAG, "getDeviceIdLabel: no known label for phone " + phone.getPhoneName()); return 0; } } /** * Return true if the current phone supports the ability to explicitly * manage the state of a conference call (i.e. view the participants, * and hangup or separate individual callers.) * * The in-call screen's "Manage conference" UI is available only on * devices that support this feature. * * Currently this is assumed to be true on GSM phones and false otherwise. * TODO: This capability should really be exposed by the telephony * layer, since it depends on the underlying telephony technology. */ /* package */ static boolean supportsConferenceCallManagement(Phone phone) { return ((phone.getPhoneType() == Phone.PHONE_TYPE_GSM) || (phone.getPhoneType() == Phone.PHONE_TYPE_SIP)); } /** * Return true if the current phone supports explicit "Hold" and * "Unhold" actions for an active call. (If so, the in-call UI will * provide onscreen "Hold" / "Unhold" buttons.) * * Currently this is assumed to be true on GSM phones and false * otherwise. (In particular, CDMA has no concept of "putting a call * on hold.") * TODO: This capability should really be exposed by the telephony * layer, since it depends on the underlying telephony technology. */ /* package */ static boolean supportsHoldAndUnhold(Phone phone) { return ((phone.getPhoneType() == Phone.PHONE_TYPE_GSM) || (phone.getPhoneType() == Phone.PHONE_TYPE_SIP)); } /** * Return true if the current phone supports distinct "Answer & Hold" * and "Answer & End" behaviors in the call-waiting scenario. If so, * the in-call UI may provide separate buttons or menu items for these * two actions. * * Currently this is assumed to be true on GSM phones and false * otherwise. (In particular, CDMA has no concept of explicitly * managing the background call, or "putting a call on hold.") * * TODO: This capability should really be exposed by the telephony * layer, since it depends on the underlying telephony technology. * * TODO: It might be better to expose this capability in a more * generic form, like maybe "supportsExplicitMultipleLineManagement()" * rather than focusing specifically on call-waiting behavior. */ /* package */ static boolean supportsAnswerAndHold(Phone phone) { return ((phone.getPhoneType() == Phone.PHONE_TYPE_GSM) || (phone.getPhoneType() == Phone.PHONE_TYPE_SIP)); } }

diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ContainerAdapter.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ContainerAdapter.java index 6323d1462..d9e6e2765 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ContainerAdapter.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ContainerAdapter.java @@ -1,776 +1,780 @@ /* * ContainerAdapter.java * * Version: $Revision: 1.6 $ * * Date: $Date: 2006/05/02 01:24:11 $ * * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts * Institute of Technology. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * - Neither the name of the Hewlett-Packard Company nor the name of the * Massachusetts Institute of Technology nor the names of their * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. */ package org.dspace.app.xmlui.objectmanager; import java.io.ByteArrayInputStream; import java.io.IOException; import java.sql.SQLException; import org.dspace.app.xmlui.wing.AttributeMap; import org.dspace.app.xmlui.wing.WingException; import org.dspace.authorize.AuthorizeException; import org.dspace.browse.ItemCounter; import org.dspace.browse.ItemCountException; import org.dspace.content.Bitstream; import org.dspace.content.Collection; import org.dspace.content.Community; import org.dspace.content.DSpaceObject; import org.dspace.content.crosswalk.CrosswalkException; import org.dspace.content.crosswalk.DisseminationCrosswalk; import org.dspace.core.ConfigurationManager; import org.dspace.core.Constants; import org.dspace.core.Context; import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; import org.jdom.output.SAXOutputter; import org.xml.sax.SAXException; /** * This is an adapter which translates DSpace containers * (communities & collections) into METS documents. This adapter follows * the DSpace METS profile however that profile does not define how a * community or collection should be described, but we make the obvious * decisions to deviate when nessasary from the profile. * * The METS document consists of three parts: descriptive metadata section, * file section, and a structural map. The descriptive metadata sections holds * metadata about the item being adapted using DSpace crosswalks. This is the * same way the item adapter works. * * However the file section and structural map are a bit different. In these * casses the the only files listed is the one logo that may be attached to * a community or collection. * * @author Scott Phillips */ public class ContainerAdapter extends AbstractAdapter { /** The community or collection this adapter represents. */ private DSpaceObject dso; /** A space seperated list of descriptive metadata sections */ private StringBuffer dmdSecIDS; /** Current DSpace context **/ private Context dspaceContext; /** * Construct a new CommunityCollectionMETSAdapter. * * @param dso * A DSpace Community or Collection to adapt. * @param contextPath * The contextPath of this webapplication. */ public ContainerAdapter(Context context, DSpaceObject dso,String contextPath) { super(contextPath); this.dso = dso; this.dspaceContext = context; } /** Return the container, community or collection, object */ public DSpaceObject getContainer() { return this.dso; } /** * * * * Required abstract methods * * * */ /** * Return the URL of this community/collection in the interface */ protected String getMETSOBJID() { if (dso.getHandle() != null) return contextPath+"/handle/" + dso.getHandle(); return null; } /** * @return Return the URL for editing this item */ protected String getMETSOBJEDIT() { return null; } /** * Use the handle as the id for this METS document */ protected String getMETSID() { if (dso.getHandle() == null) { if (dso instanceof Collection) return "collection:"+dso.getID(); else return "community:"+dso.getID(); } else return "hdl:"+dso.getHandle(); } /** * Return the profile to use for communities and collections. * */ protected String getMETSProfile() throws WingException { return "DSPACE METS SIP Profile 1.0"; } /** * Return a friendly label for the METS document to say we are a community * or collection. */ protected String getMETSLabel() { if (dso instanceof Community) return "DSpace Community"; else return "DSpace Collection"; } /** * Return a unique id for the given bitstream */ protected String getFileID(Bitstream bitstream) { return "file_" + bitstream.getID(); } /** * Return a group id for the given bitstream */ protected String getGroupFileID(Bitstream bitstream) { return "group_file_" + bitstream.getID(); } /** * * * * METS structural methods * * * */ /** * Render the METS descriptive section. This will create a new metadata * section for each crosswalk configured. * * Example: * <dmdSec> * <mdWrap MDTYPE="MODS"> * <xmlData> * ... content from the crosswalk ... * </xmlDate> * </mdWrap> * </dmdSec */ protected void renderDescriptiveSection() throws WingException, SAXException, CrosswalkException, IOException, SQLException { AttributeMap attributes; String groupID = getGenericID("group_dmd_"); dmdSecIDS = new StringBuffer(); // Add DIM descriptive metadata if it was requested or if no metadata types // were specified. Further more since this is the default type we also use a // faster rendering method that the crosswalk API. if(dmdTypes.size() == 0 || dmdTypes.contains("DIM")) { // Metadata element's ID String dmdID = getGenericID("dmd_"); // Keep track of all descriptive sections dmdSecIDS.append(dmdID); // //////////////////////////////// // Start a new dmdSec for each crosswalk. attributes = new AttributeMap(); attributes.put("ID", dmdID); attributes.put("GROUPID", groupID); startElement(METS,"dmdSec",attributes); // //////////////////////////////// // Start metadata wrapper attributes = new AttributeMap(); attributes.put("MDTYPE", "OTHER"); attributes.put("OTHERMDTYPE", "DIM"); startElement(METS,"mdWrap",attributes); // //////////////////////////////// // Start the xml data startElement(METS,"xmlData"); // /////////////////////////////// // Start the DIM element attributes = new AttributeMap(); attributes.put("dspaceType", Constants.typeText[dso.getType()]); startElement(DIM,"dim",attributes); // Add each field for this collection if (dso.getType() == Constants.COLLECTION) { Collection collection = (Collection) dso; String description = collection.getMetadata("introductory_text"); String description_abstract = collection.getMetadata("short_description"); String description_table = collection.getMetadata("side_bar_text"); String identifier_uri = "http://hdl.handle.net/" + collection.getHandle(); String provenance = collection.getMetadata("provenance_description"); String rights = collection.getMetadata("copyright_text"); String rights_license = collection.getMetadata("license"); String title = collection.getMetadata("name"); createField("dc","description",null,null,description); createField("dc","description","abstract",null,description_abstract); createField("dc","description","tableofcontents",null,description_table); createField("dc","identifier","uri",null,identifier_uri); createField("dc","provenance",null,null,provenance); createField("dc","rights",null,null,rights); createField("dc","rights","license",null,rights_license); createField("dc","title",null,null,title); boolean useCache = ConfigurationManager.getBooleanProperty("webui.strengths.cache"); //To improve scalability, XMLUI only adds item counts if they are cached if (useCache) { try { //try to determine Collection size (i.e. # of items) int size = new ItemCounter(this.dspaceContext).getCount(collection); createField("dc","format","extent",null, String.valueOf(size)); } catch(ItemCountException e) { - throw new IOException("Could not obtain Collection item-count: ", e); + IOException ioe = new IOException("Could not obtain Collection item-count"); + ioe.initCause(e); + throw ioe; } } } else if (dso.getType() == Constants.COMMUNITY) { Community community = (Community) dso; String description = community.getMetadata("introductory_text"); String description_abstract = community.getMetadata("short_description"); String description_table = community.getMetadata("side_bar_text"); String identifier_uri = "http://hdl.handle.net/" + community.getHandle(); String rights = community.getMetadata("copyright_text"); String title = community.getMetadata("name"); createField("dc","description",null,null,description); createField("dc","description","abstract",null,description_abstract); createField("dc","description","tableofcontents",null,description_table); createField("dc","identifier","uri",null,identifier_uri); createField("dc","rights",null,null,rights); createField("dc","title",null,null,title); boolean useCache = ConfigurationManager.getBooleanProperty("webui.strengths.cache"); //To improve scalability, XMLUI only adds item counts if they are cached if (useCache) { try { //try to determine Community size (i.e. # of items) int size = new ItemCounter(this.dspaceContext).getCount(community); createField("dc","format","extent",null, String.valueOf(size)); } catch(ItemCountException e) { - throw new IOException("Could not obtain Community item-count: ", e); + IOException ioe = new IOException("Could not obtain Collection item-count"); + ioe.initCause(e); + throw ioe; } } } // /////////////////////////////// // End the DIM element endElement(DIM,"dim"); // //////////////////////////////// // End elements endElement(METS,"xmlData"); endElement(METS,"mdWrap"); endElement(METS, "dmdSec"); } for (String dmdType : dmdTypes) { // If DIM was requested then it was generated above without using // the crosswalk API. So we can skip this one. if ("DIM".equals(dmdType)) continue; DisseminationCrosswalk crosswalk = getDisseminationCrosswalk(dmdType); if (crosswalk == null) continue; String dmdID = getGenericID("dmd_"); // Add our id to the list. dmdSecIDS.append(" " + dmdID); // //////////////////////////////// // Start a new dmdSec for each crosswalk. attributes = new AttributeMap(); attributes.put("ID", dmdID); attributes.put("GROUPID", groupID); startElement(METS,"dmdSec",attributes); // //////////////////////////////// // Start metadata wrapper attributes = new AttributeMap(); if (isDefinedMETStype(dmdType)) { attributes.put("MDTYPE", dmdType); } else { attributes.put("MDTYPE", "OTHER"); attributes.put("OTHERMDTYPE", dmdType); } startElement(METS,"mdWrap",attributes); // //////////////////////////////// // Start the xml data startElement(METS,"xmlData"); // /////////////////////////////// // Send the actual XML content try { Element dissemination = crosswalk.disseminateElement(dso); SAXFilter filter = new SAXFilter(contentHandler, lexicalHandler, namespaces); // Allow the basics for XML filter.allowElements().allowIgnorableWhitespace().allowCharacters().allowCDATA().allowPrefixMappings(); SAXOutputter outputter = new SAXOutputter(); outputter.setContentHandler(filter); outputter.setLexicalHandler(filter); outputter.output(dissemination); } catch (JDOMException jdome) { throw new WingException(jdome); } catch (AuthorizeException ae) { // just ignore the authorize exception and continue on with //out parsing the xml document. } // //////////////////////////////// // End elements endElement(METS,"xmlData"); endElement(METS,"mdWrap"); endElement(METS, "dmdSec"); // Record keeping if (dmdSecIDS == null) { dmdSecIDS = new StringBuffer(dmdID); } else { dmdSecIDS.append(" " + dmdID); } } } /** * Render the METS file section. If a logo is present for this * container then that single bitstream is listed in the * file section. * * Example: * <fileSec> * <fileGrp USE="LOGO"> * <file ... > * <fLocate ... > * </file> * </fileGrp> * </fileSec> */ protected void renderFileSection() throws SAXException { AttributeMap attributes; // Get the Community or Collection logo. Bitstream logo = getLogo(); if (logo != null) { // //////////////////////////////// // Start the file section startElement(METS,"fileSec"); // //////////////////////////////// // Start a new fileGrp for the logo. attributes = new AttributeMap(); attributes.put("USE", "LOGO"); startElement(METS,"fileGrp",attributes); // //////////////////////////////// // Add the actual file element String fileID = getFileID(logo); String groupID = getGroupFileID(logo); renderFile(null, logo, fileID, groupID); // //////////////////////////////// // End th file group and file section endElement(METS,"fileGrp"); endElement(METS,"fileSec"); } } /** * Render the container's structural map. This includes a refrence * to the container's logo, if available, otherwise it is an empty * division that just states it is a DSpace community or Collection. * * Examlpe: * <structMap TYPE="LOGICAL" LABEL="DSpace"> * <div TYPE="DSpace Collection" DMDID="space seperated list of ids"> * <fptr FILEID="logo id"/> * </div> * </structMap> */ protected void renderStructureMap() throws SQLException, SAXException { AttributeMap attributes; // /////////////////////// // Start a new structure map attributes = new AttributeMap(); attributes.put("TYPE", "LOGICAL"); attributes.put("LABEL", "DSpace"); startElement(METS,"structMap",attributes); // //////////////////////////////// // Start the special first division attributes = new AttributeMap(); attributes.put("TYPE", getMETSLabel()); // add references to the Descriptive metadata if (dmdSecIDS != null) attributes.put("DMDID", dmdSecIDS.toString()); startElement(METS,"div",attributes); // add a fptr pointer to the logo. Bitstream logo = getLogo(); if (logo != null) { // //////////////////////////////// // Add a refrence to the logo as the primary bitstream. attributes = new AttributeMap(); attributes.put("FILEID",getFileID(logo)); startElement(METS,"fptr",attributes); endElement(METS,"fptr"); // /////////////////////////////////////////////// // Add a div for the publicaly viewable bitstreams (i.e. the logo) attributes = new AttributeMap(); attributes.put("ID", getGenericID("div_")); attributes.put("TYPE", "DSpace Content Bitstream"); startElement(METS,"div",attributes); // //////////////////////////////// // Add a refrence to the logo as the primary bitstream. attributes = new AttributeMap(); attributes.put("FILEID",getFileID(logo)); startElement(METS,"fptr",attributes); endElement(METS,"fptr"); // ////////////////////////// // End the logo division endElement(METS,"div"); } // //////////////////////////////// // End the special first division endElement(METS,"div"); // /////////////////////// // End the structure map endElement(METS,"structMap"); } /** * * * * Private helpfull methods * * * */ /** * Return the logo bitstream associated with this community or collection. * If there is no logo then null is returned. */ private Bitstream getLogo() { if (dso instanceof Community) { Community community = (Community) dso; return community.getLogo(); } else if (dso instanceof Collection) { Collection collection = (Collection) dso; return collection.getLogo(); } return null; } /** * Count how many occurance there is of the given * character in the given string. * * @param string The string value to be counted. * @param character the character to count in the string. */ private int countOccurances(String string, char character) { if (string == null || string.length() == 0) return 0; int fromIndex = -1; int count = 0; while (true) { fromIndex = string.indexOf('>', fromIndex+1); if (fromIndex == -1) break; count++; } return count; } /** * Check if the given character sequence is located in the given * string at the specified index. If it is then return true, otherwise false. * * @param string The string to test against * @param index The location within the string * @param characters The character sequence to look for. * @return true if the character sequence was found, otherwise false. */ private boolean substringCompare(String string, int index, char ... characters) { // Is the string long enough? if (string.length() <= index + characters.length) return false; // Do all the characters match? for (char character : characters) { if (string.charAt(index) != character) return false; index++; } return false; } /** * Create a new DIM field element with the given attributes. * * @param schema The schema the DIM field belongs too. * @param element The element the DIM field belongs too. * @param qualifier The qualifier the DIM field belongs too. * @param language The language the DIM field belongs too. * @param value The value of the DIM field. * @return A new DIM field element * @throws SAXException */ private void createField(String schema, String element, String qualifier, String language, String value) throws SAXException { // /////////////////////////////// // Field element for each metadata field. AttributeMap attributes = new AttributeMap(); attributes.put("mdschema",schema); attributes.put("element", element); if (qualifier != null) attributes.put("qualifier", qualifier); if (language != null) attributes.put("language", language); startElement(DIM,"field",attributes); // Only try and add the metadata's value, but only if it is non null. if (value != null) { // First, preform a queck check to see if the value may be XML. int countOpen = countOccurances(value,'<'); int countClose = countOccurances(value, '>'); // If it passed the quick test, then try and parse the value. Element xmlDocument = null; if (countOpen > 0 && countOpen == countClose) { // This may be XML, First try and remove any bad entity refrences. int amp = -1; while ((amp = value.indexOf('&', amp+1)) > -1) { // Is it an xml entity named by number? if (substringCompare(value,amp+1,'#')) continue; // &amp; if (substringCompare(value,amp+1,'a','m','p',';')) continue; // &apos; if (substringCompare(value,amp+1,'a','p','o','s',';')) continue; // &quot; if (substringCompare(value,amp+1,'q','u','o','t',';')) continue; // &lt; if (substringCompare(value,amp+1,'l','t',';')) continue; // &gt; if (substringCompare(value,amp+1,'g','t',';')) continue; // Replace the ampersand with an XML entity. value = value.substring(0,amp) + "&amp;" + value.substring(amp+1); } // Second try and parse the XML into a mini-dom try { // Wrap the value inside a root element (which will be trimed out // by the SAX filter and set the default namespace to XHTML. String xml = "<fragment xmlns=\"http://www.w3.org/1999/xhtml\">"+value+"</fragment>"; ByteArrayInputStream inputStream = new ByteArrayInputStream(xml.getBytes()); SAXBuilder builder = new SAXBuilder(); Document document = builder.build(inputStream); xmlDocument = document.getRootElement(); } catch (Exception e) { // ignore any errors we get, and just add the string literaly. } } // Third, If we have xml, attempt to serialize the dom. if (xmlDocument != null) { SAXFilter filter = new SAXFilter(contentHandler, lexicalHandler, namespaces); // Allow the basics for XML filter.allowElements().allowIgnorableWhitespace().allowCharacters().allowCDATA().allowPrefixMappings(); // Special option, only allow elements below the second level to pass through. This // will trim out the METS declaration and only leave the actual METS parts to be // included. filter.allowElements(1); SAXOutputter outputter = new SAXOutputter(); outputter.setContentHandler(filter); outputter.setLexicalHandler(filter); try { outputter.output(xmlDocument); } catch (JDOMException jdome) { // serialization failed so let's just fallback sending the plain characters. sendCharacters(value); } } else { // We don't have XML, so just send the plain old characters. sendCharacters(value); } } // ////////////////////////////// // Close out field endElement(DIM,"field"); } }

protected void renderDescriptiveSection() throws WingException, SAXException, CrosswalkException, IOException, SQLException { AttributeMap attributes; String groupID = getGenericID("group_dmd_"); dmdSecIDS = new StringBuffer(); // Add DIM descriptive metadata if it was requested or if no metadata types // were specified. Further more since this is the default type we also use a // faster rendering method that the crosswalk API. if(dmdTypes.size() == 0 || dmdTypes.contains("DIM")) { // Metadata element's ID String dmdID = getGenericID("dmd_"); // Keep track of all descriptive sections dmdSecIDS.append(dmdID); // //////////////////////////////// // Start a new dmdSec for each crosswalk. attributes = new AttributeMap(); attributes.put("ID", dmdID); attributes.put("GROUPID", groupID); startElement(METS,"dmdSec",attributes); // //////////////////////////////// // Start metadata wrapper attributes = new AttributeMap(); attributes.put("MDTYPE", "OTHER"); attributes.put("OTHERMDTYPE", "DIM"); startElement(METS,"mdWrap",attributes); // //////////////////////////////// // Start the xml data startElement(METS,"xmlData"); // /////////////////////////////// // Start the DIM element attributes = new AttributeMap(); attributes.put("dspaceType", Constants.typeText[dso.getType()]); startElement(DIM,"dim",attributes); // Add each field for this collection if (dso.getType() == Constants.COLLECTION) { Collection collection = (Collection) dso; String description = collection.getMetadata("introductory_text"); String description_abstract = collection.getMetadata("short_description"); String description_table = collection.getMetadata("side_bar_text"); String identifier_uri = "http://hdl.handle.net/" + collection.getHandle(); String provenance = collection.getMetadata("provenance_description"); String rights = collection.getMetadata("copyright_text"); String rights_license = collection.getMetadata("license"); String title = collection.getMetadata("name"); createField("dc","description",null,null,description); createField("dc","description","abstract",null,description_abstract); createField("dc","description","tableofcontents",null,description_table); createField("dc","identifier","uri",null,identifier_uri); createField("dc","provenance",null,null,provenance); createField("dc","rights",null,null,rights); createField("dc","rights","license",null,rights_license); createField("dc","title",null,null,title); boolean useCache = ConfigurationManager.getBooleanProperty("webui.strengths.cache"); //To improve scalability, XMLUI only adds item counts if they are cached if (useCache) { try { //try to determine Collection size (i.e. # of items) int size = new ItemCounter(this.dspaceContext).getCount(collection); createField("dc","format","extent",null, String.valueOf(size)); } catch(ItemCountException e) { throw new IOException("Could not obtain Collection item-count: ", e); } } } else if (dso.getType() == Constants.COMMUNITY) { Community community = (Community) dso; String description = community.getMetadata("introductory_text"); String description_abstract = community.getMetadata("short_description"); String description_table = community.getMetadata("side_bar_text"); String identifier_uri = "http://hdl.handle.net/" + community.getHandle(); String rights = community.getMetadata("copyright_text"); String title = community.getMetadata("name"); createField("dc","description",null,null,description); createField("dc","description","abstract",null,description_abstract); createField("dc","description","tableofcontents",null,description_table); createField("dc","identifier","uri",null,identifier_uri); createField("dc","rights",null,null,rights); createField("dc","title",null,null,title); boolean useCache = ConfigurationManager.getBooleanProperty("webui.strengths.cache"); //To improve scalability, XMLUI only adds item counts if they are cached if (useCache) { try { //try to determine Community size (i.e. # of items) int size = new ItemCounter(this.dspaceContext).getCount(community); createField("dc","format","extent",null, String.valueOf(size)); } catch(ItemCountException e) { throw new IOException("Could not obtain Community item-count: ", e); } } } // /////////////////////////////// // End the DIM element endElement(DIM,"dim"); // //////////////////////////////// // End elements endElement(METS,"xmlData"); endElement(METS,"mdWrap"); endElement(METS, "dmdSec"); } for (String dmdType : dmdTypes) { // If DIM was requested then it was generated above without using // the crosswalk API. So we can skip this one. if ("DIM".equals(dmdType)) continue; DisseminationCrosswalk crosswalk = getDisseminationCrosswalk(dmdType); if (crosswalk == null) continue; String dmdID = getGenericID("dmd_"); // Add our id to the list. dmdSecIDS.append(" " + dmdID); // //////////////////////////////// // Start a new dmdSec for each crosswalk. attributes = new AttributeMap(); attributes.put("ID", dmdID); attributes.put("GROUPID", groupID); startElement(METS,"dmdSec",attributes); // //////////////////////////////// // Start metadata wrapper attributes = new AttributeMap(); if (isDefinedMETStype(dmdType)) { attributes.put("MDTYPE", dmdType); } else { attributes.put("MDTYPE", "OTHER"); attributes.put("OTHERMDTYPE", dmdType); } startElement(METS,"mdWrap",attributes); // //////////////////////////////// // Start the xml data startElement(METS,"xmlData"); // /////////////////////////////// // Send the actual XML content try { Element dissemination = crosswalk.disseminateElement(dso); SAXFilter filter = new SAXFilter(contentHandler, lexicalHandler, namespaces); // Allow the basics for XML filter.allowElements().allowIgnorableWhitespace().allowCharacters().allowCDATA().allowPrefixMappings(); SAXOutputter outputter = new SAXOutputter(); outputter.setContentHandler(filter); outputter.setLexicalHandler(filter); outputter.output(dissemination); } catch (JDOMException jdome) { throw new WingException(jdome); } catch (AuthorizeException ae) { // just ignore the authorize exception and continue on with //out parsing the xml document. } // //////////////////////////////// // End elements endElement(METS,"xmlData"); endElement(METS,"mdWrap"); endElement(METS, "dmdSec"); // Record keeping if (dmdSecIDS == null) { dmdSecIDS = new StringBuffer(dmdID); } else { dmdSecIDS.append(" " + dmdID); } } }

protected void renderDescriptiveSection() throws WingException, SAXException, CrosswalkException, IOException, SQLException { AttributeMap attributes; String groupID = getGenericID("group_dmd_"); dmdSecIDS = new StringBuffer(); // Add DIM descriptive metadata if it was requested or if no metadata types // were specified. Further more since this is the default type we also use a // faster rendering method that the crosswalk API. if(dmdTypes.size() == 0 || dmdTypes.contains("DIM")) { // Metadata element's ID String dmdID = getGenericID("dmd_"); // Keep track of all descriptive sections dmdSecIDS.append(dmdID); // //////////////////////////////// // Start a new dmdSec for each crosswalk. attributes = new AttributeMap(); attributes.put("ID", dmdID); attributes.put("GROUPID", groupID); startElement(METS,"dmdSec",attributes); // //////////////////////////////// // Start metadata wrapper attributes = new AttributeMap(); attributes.put("MDTYPE", "OTHER"); attributes.put("OTHERMDTYPE", "DIM"); startElement(METS,"mdWrap",attributes); // //////////////////////////////// // Start the xml data startElement(METS,"xmlData"); // /////////////////////////////// // Start the DIM element attributes = new AttributeMap(); attributes.put("dspaceType", Constants.typeText[dso.getType()]); startElement(DIM,"dim",attributes); // Add each field for this collection if (dso.getType() == Constants.COLLECTION) { Collection collection = (Collection) dso; String description = collection.getMetadata("introductory_text"); String description_abstract = collection.getMetadata("short_description"); String description_table = collection.getMetadata("side_bar_text"); String identifier_uri = "http://hdl.handle.net/" + collection.getHandle(); String provenance = collection.getMetadata("provenance_description"); String rights = collection.getMetadata("copyright_text"); String rights_license = collection.getMetadata("license"); String title = collection.getMetadata("name"); createField("dc","description",null,null,description); createField("dc","description","abstract",null,description_abstract); createField("dc","description","tableofcontents",null,description_table); createField("dc","identifier","uri",null,identifier_uri); createField("dc","provenance",null,null,provenance); createField("dc","rights",null,null,rights); createField("dc","rights","license",null,rights_license); createField("dc","title",null,null,title); boolean useCache = ConfigurationManager.getBooleanProperty("webui.strengths.cache"); //To improve scalability, XMLUI only adds item counts if they are cached if (useCache) { try { //try to determine Collection size (i.e. # of items) int size = new ItemCounter(this.dspaceContext).getCount(collection); createField("dc","format","extent",null, String.valueOf(size)); } catch(ItemCountException e) { IOException ioe = new IOException("Could not obtain Collection item-count"); ioe.initCause(e); throw ioe; } } } else if (dso.getType() == Constants.COMMUNITY) { Community community = (Community) dso; String description = community.getMetadata("introductory_text"); String description_abstract = community.getMetadata("short_description"); String description_table = community.getMetadata("side_bar_text"); String identifier_uri = "http://hdl.handle.net/" + community.getHandle(); String rights = community.getMetadata("copyright_text"); String title = community.getMetadata("name"); createField("dc","description",null,null,description); createField("dc","description","abstract",null,description_abstract); createField("dc","description","tableofcontents",null,description_table); createField("dc","identifier","uri",null,identifier_uri); createField("dc","rights",null,null,rights); createField("dc","title",null,null,title); boolean useCache = ConfigurationManager.getBooleanProperty("webui.strengths.cache"); //To improve scalability, XMLUI only adds item counts if they are cached if (useCache) { try { //try to determine Community size (i.e. # of items) int size = new ItemCounter(this.dspaceContext).getCount(community); createField("dc","format","extent",null, String.valueOf(size)); } catch(ItemCountException e) { IOException ioe = new IOException("Could not obtain Collection item-count"); ioe.initCause(e); throw ioe; } } } // /////////////////////////////// // End the DIM element endElement(DIM,"dim"); // //////////////////////////////// // End elements endElement(METS,"xmlData"); endElement(METS,"mdWrap"); endElement(METS, "dmdSec"); } for (String dmdType : dmdTypes) { // If DIM was requested then it was generated above without using // the crosswalk API. So we can skip this one. if ("DIM".equals(dmdType)) continue; DisseminationCrosswalk crosswalk = getDisseminationCrosswalk(dmdType); if (crosswalk == null) continue; String dmdID = getGenericID("dmd_"); // Add our id to the list. dmdSecIDS.append(" " + dmdID); // //////////////////////////////// // Start a new dmdSec for each crosswalk. attributes = new AttributeMap(); attributes.put("ID", dmdID); attributes.put("GROUPID", groupID); startElement(METS,"dmdSec",attributes); // //////////////////////////////// // Start metadata wrapper attributes = new AttributeMap(); if (isDefinedMETStype(dmdType)) { attributes.put("MDTYPE", dmdType); } else { attributes.put("MDTYPE", "OTHER"); attributes.put("OTHERMDTYPE", dmdType); } startElement(METS,"mdWrap",attributes); // //////////////////////////////// // Start the xml data startElement(METS,"xmlData"); // /////////////////////////////// // Send the actual XML content try { Element dissemination = crosswalk.disseminateElement(dso); SAXFilter filter = new SAXFilter(contentHandler, lexicalHandler, namespaces); // Allow the basics for XML filter.allowElements().allowIgnorableWhitespace().allowCharacters().allowCDATA().allowPrefixMappings(); SAXOutputter outputter = new SAXOutputter(); outputter.setContentHandler(filter); outputter.setLexicalHandler(filter); outputter.output(dissemination); } catch (JDOMException jdome) { throw new WingException(jdome); } catch (AuthorizeException ae) { // just ignore the authorize exception and continue on with //out parsing the xml document. } // //////////////////////////////// // End elements endElement(METS,"xmlData"); endElement(METS,"mdWrap"); endElement(METS, "dmdSec"); // Record keeping if (dmdSecIDS == null) { dmdSecIDS = new StringBuffer(dmdID); } else { dmdSecIDS.append(" " + dmdID); } } }

diff --git a/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/ForEachTest.java b/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/ForEachTest.java index daeafa4..37dd0a1 100644 --- a/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/ForEachTest.java +++ b/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/ForEachTest.java @@ -1,38 +1,45 @@ package org.richfaces.cdk.templatecompiler.statements; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; import java.util.Collections; +import java.util.Iterator; import org.junit.Test; import org.junit.runner.RunWith; import org.richfaces.cdk.CdkTestRunner; import org.richfaces.cdk.Mock; +import org.richfaces.cdk.templatecompiler.el.types.ELType; import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; import com.google.inject.Inject; @RunWith(CdkTestRunner.class) public class ForEachTest extends FreeMarkerTestBase { @Mock private TypesFactory typesFactory; + @Mock + private ELType arbitraryType; @Inject private ForEachStatement statement; @Test public void testSetItemsExpression() throws Exception { - expect(parser.parse(HTTP_EXAMPLE_COM, statement, Iterable.class.getName())).andReturn(parsedExpression); + expect(parser.parse(HTTP_EXAMPLE_COM, statement, Object.class.getName())).andReturn(parsedExpression); expect(parsedExpression.getCode()).andStubReturn("get(" + HTTP_EXAMPLE_COM + ")"); expect(parsedExpression.isLiteral()).andStubReturn(false); expect(parsedExpression.getType()).andStubReturn(TypesFactory.OBJECT_TYPE); expect(parsedExpression.getRequiredMethods()).andStubReturn(Collections.<HelperMethod>emptySet()); parsedExpression.setParent(statement); + expect(typesFactory.getType(Iterable.class)).andStubReturn(arbitraryType); + expect(typesFactory.getType(Iterator.class)).andStubReturn(arbitraryType); + expect(arbitraryType.isAssignableFrom(TypesFactory.OBJECT_TYPE)).andStubReturn(true); expectLastCall(); controller.replay(); - statement.setItemsExpression(HTTP_EXAMPLE_COM, "foo", "status", null, null, null); + statement.setItemsExpression(HTTP_EXAMPLE_COM, "foo", null, null, null, null); String code = statement.getCode(); verifyCode(code, HTTP_EXAMPLE_COM, "for"); controller.verify(); } }

diff --git a/src/main/java/net/sf/testium/executor/TestGroupExecutorImpl.java b/src/main/java/net/sf/testium/executor/TestGroupExecutorImpl.java index 785a7f7..7c40da6 100644 --- a/src/main/java/net/sf/testium/executor/TestGroupExecutorImpl.java +++ b/src/main/java/net/sf/testium/executor/TestGroupExecutorImpl.java @@ -1,506 +1,510 @@ package net.sf.testium.executor; import java.io.File; import java.io.FileNotFoundException; import java.io.IOError; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.List; import org.testtoolinterfaces.testresult.TestCaseResult; import org.testtoolinterfaces.testresult.TestCaseResultLink; import org.testtoolinterfaces.testresult.TestExecItemIterationResult; import org.testtoolinterfaces.testresult.TestExecItemSelectionResult; import org.testtoolinterfaces.testresult.TestGroupEntryResult; import org.testtoolinterfaces.testresult.TestGroupResult; import org.testtoolinterfaces.testresult.TestResult.VERDICT; import org.testtoolinterfaces.testresult.TestStepResult; import org.testtoolinterfaces.testresult.TestStepResultBase; import org.testtoolinterfaces.testresult.impl.TestCaseResultImpl; import org.testtoolinterfaces.testresult.impl.TestExecItemIterationResultImpl; import org.testtoolinterfaces.testresult.impl.TestExecItemSelectionResultImpl; import org.testtoolinterfaces.testresult.impl.TestGroupResultImpl; import org.testtoolinterfaces.testresult.impl.TestGroupResultLinkImpl; import org.testtoolinterfaces.testresultinterface.TestGroupResultWriter; import org.testtoolinterfaces.testsuite.TestCase; import org.testtoolinterfaces.testsuite.TestCaseImpl; import org.testtoolinterfaces.testsuite.TestCaseLink; import org.testtoolinterfaces.testsuite.TestGroup; import org.testtoolinterfaces.testsuite.TestGroupEntry; import org.testtoolinterfaces.testsuite.TestGroupEntryIteration; import org.testtoolinterfaces.testsuite.TestGroupEntrySelection; import org.testtoolinterfaces.testsuite.TestGroupEntrySequence; import org.testtoolinterfaces.testsuite.TestGroupImpl; import org.testtoolinterfaces.testsuite.TestGroupLink; import org.testtoolinterfaces.testsuite.TestLinkImpl; import org.testtoolinterfaces.testsuite.TestStep; import org.testtoolinterfaces.testsuite.TestStepSequence; import org.testtoolinterfaces.testsuiteinterface.TestGroupReader; import org.testtoolinterfaces.utils.RunTimeData; import org.testtoolinterfaces.utils.RunTimeVariable; import org.testtoolinterfaces.utils.Trace; import org.testtoolinterfaces.utils.Trace.LEVEL; import org.testtoolinterfaces.utils.Warning; public class TestGroupExecutorImpl implements TestGroupExecutor { private static final String TYPE = "tti"; private TestStepMetaExecutor myTestStepExecutor; private TestGroupResultWriter myTestGroupResultWriter; private TestGroupReader myTestGroupReader; private TestGroupMetaExecutor myTestGroupExecutor; private TestCaseMetaExecutor myTestCaseExecutor; /** * @param aTestRunResultWriter * @param myTestStepExecutor * @param myTestCaseScriptExecutor */ public TestGroupExecutorImpl( TestStepMetaExecutor aTestStepMetaExecutor, TestCaseMetaExecutor aTestCaseMetaExecutor, TestGroupMetaExecutor aTestGroupMetaExecutor, TestGroupResultWriter aTestGroupResultWriter ) { myTestStepExecutor = aTestStepMetaExecutor; myTestCaseExecutor = aTestCaseMetaExecutor; myTestGroupExecutor = aTestGroupMetaExecutor; myTestGroupResultWriter = aTestGroupResultWriter; myTestGroupReader = new TestGroupReader( myTestStepExecutor.getInterfaces(), true ); } /** * Executes the TestGroupLink * The preparation must have been done * * @param aTestGroupLink * @param aParentTgResult * @param aParentEnv */ public void execute( TestGroupLink aTestGroupLink, TestGroupResult aParentTgResult, ExecutionEnvironment aParentEnv ) { TestGroup testGroup = this.readTgLink(aTestGroupLink); ExecutionEnvironment execEnv = this.setExecutionEnvironment(aTestGroupLink, aParentEnv.getLogDir(), aParentEnv.getRtData()); File logFile = execEnv.getLogFile( testGroup.getId() ); TestGroupResult tgResult = createTgResult(testGroup, execEnv, logFile); tgResult.setExecutionPath( aParentTgResult.getExecutionIdPath() ); TestGroupResultLinkImpl tgResultLink = new TestGroupResultLinkImpl( aTestGroupLink, logFile ); tgResult.register(tgResultLink); aParentTgResult.addTestExecItemResultLink(tgResultLink); execute( testGroup, tgResult, execEnv ); } private ExecutionEnvironment setExecutionEnvironment( TestGroupLink aTestGroupLink, File aLogDir, RunTimeData aRTData ) { if ( !aLogDir.isDirectory() ) { FileNotFoundException exc = new FileNotFoundException("Directory does not exist: " + aLogDir.getPath()); throw new IOError( exc ); } Trace.println(Trace.EXEC, "setExecutionEnvironment( " + aTestGroupLink.getId() + ", " + aLogDir.getPath() + ", " + aRTData.size() + " Variables )", true ); File testGroupFile = aTestGroupLink.getLink(); File scriptDir = testGroupFile.getParentFile(); File groupLogDir = new File(aLogDir, aTestGroupLink.getId()); groupLogDir.mkdir(); return new ExecutionEnvironment(scriptDir, groupLogDir, aRTData ); } private TestGroup readTgLink( TestGroupLink aTestGroupLink ) { File testGroupFile = aTestGroupLink.getLink(); return myTestGroupReader.readTgFile(testGroupFile); } /** * @param testGroup * @param execEnv * @param logFile * @return testGrouResult */ private TestGroupResult createTgResult(TestGroup testGroup, ExecutionEnvironment execEnv, File logFile) { TestGroupResult tgResult = new TestGroupResultImpl( testGroup ); myTestGroupResultWriter.write( tgResult, logFile ); return tgResult; } @Deprecated public void execute( TestGroupLink aTestGroupLink, File aLogDir, TestGroupResult aTestGroupResult, RunTimeData aRTData ) { ExecutionEnvironment env = this.setExecutionEnvironment(aTestGroupLink, aLogDir, aRTData); this.execute(aTestGroupLink, aTestGroupResult, env); } public void execute(TestGroup aTestGroup, TestGroupResult aTestGroupResult, ExecutionEnvironment anEnv) { Trace.println(Trace.EXEC, "execute( " + aTestGroup.getId() + " )", true); TestStepSequence prepareSteps = aTestGroup.getPrepareSteps(); executePrepareSteps(prepareSteps, aTestGroupResult, anEnv); TestGroupEntrySequence execSteps = aTestGroup.getExecutionEntries(); executeExecSteps(execSteps, aTestGroupResult, anEnv); TestStepSequence restoreSteps = aTestGroup.getRestoreSteps(); executeRestoreSteps(restoreSteps, aTestGroupResult, anEnv); } @Deprecated public void execute(TestGroup aTestGroup, File aScriptDir, File aLogDir, TestGroupResult aTestGroupResult, RunTimeData aRTData) { ExecutionEnvironment env = new ExecutionEnvironment(aScriptDir, aLogDir, aRTData); this.execute(aTestGroup, aTestGroupResult, env); } public void executePrepareSteps(TestStepSequence aPrepareSteps, TestGroupResult aResult, ExecutionEnvironment anEnv) { Trace.println(Trace.EXEC_PLUS, "executePrepareSteps( " + aPrepareSteps + ", " + aResult + " )", true); Iterator<TestStep> stepsItr = aPrepareSteps.iterator(); while (stepsItr.hasNext()) { TestStep step = stepsItr.next(); TestStepResultBase tsResult = myTestStepExecutor.execute(step, anEnv.getScriptDir(), anEnv.getLogDir(), anEnv.getRtData()); tsResult.setExecutionPath(aResult.getExecutionPath() + "." + aResult.getId()); aResult.addInitialization(tsResult); } } public void executeExecSteps(TestGroupEntrySequence anExecEntries, TestGroupResult aResult, ExecutionEnvironment anEnv) { Trace.println(Trace.EXEC_PLUS, "executeExecSteps( " + anExecEntries + ", " + aResult + " )", true); Iterator<TestGroupEntry> entriesItr = anExecEntries.iterator(); while (entriesItr.hasNext()) { TestGroupEntry entry = entriesItr.next(); RunTimeData rtData = new RunTimeData(anEnv.getRtData()); ExecutionEnvironment env = new ExecutionEnvironment( anEnv.getScriptDir(), anEnv.getLogDir(), rtData ); try { if (entry instanceof TestGroupLink) { executeTestGroupLink((TestGroupLink) entry, aResult, env); } else if (entry instanceof TestCaseLink) { executeTestCaseLink((TestCaseLink) entry, aResult, env); } else if (entry instanceof TestGroupEntryIteration) { executeForeach((TestGroupEntryIteration) entry, aResult, anEnv); } else if (entry instanceof TestGroupEntrySelection) { executeSelection((TestGroupEntrySelection) entry, aResult, anEnv); } else { throw new InvalidTestTypeException(entry.getClass() .getSimpleName(), "Cannot execute execution entries of type " + entry.getClass().getSimpleName()); } } catch (Throwable t) // wider than strictly needed, but plugins can // be mal-implemented. { String message = "Execution of " + entry.getClass().getSimpleName() + " " + entry.getId() + " failed:\n" + t.getMessage() + "\nTrying to continue, but this may affect further execution..."; aResult.addComment(message); Warning.println(message); Trace.print(Trace.ALL, t); } } } /** * @param aResult * @param aScriptDir * @param anEnv */ private void executeTestGroupLink(TestGroupLink tgLink, TestGroupResult aResult, ExecutionEnvironment anEnv) { try { String fileName = tgLink.getLink().getPath(); String updatedFileName = anEnv.getRtData().substituteVars(fileName); if ( ! fileName.equals(updatedFileName) ) { TestLinkImpl newLink = new TestLinkImpl( updatedFileName, tgLink.getLinkType() ); tgLink.setLink(newLink); } else { tgLink.setLinkDir( anEnv.getScriptDir() ); } myTestGroupExecutor.execute(tgLink, aResult, anEnv ); } catch (Throwable t) // wider than strictly needed, but plugins could be mal-interpreted. { System.out.println( "ERROR in " + tgLink.getId() ); t.printStackTrace(); Trace.print(LEVEL.ALL, t); throw new Error( t ); // String tgId = tgLink.getId(); // TestGroup tg = new TestGroupImpl( tgId, // tgLink.getDescription(), // tgLink.getSequenceNr(), // new TestStepSequence(), // new TestGroupEntrySequence(), // new TestStepSequence() ); // TestGroupResult tgResult = new TestGroupResultImpl( tg ); // tgResult.addComment(t.getMessage()); // ExecutionEnvironment env = this.setExecutionEnvironment(tgLink, anEnv.getLogDir(), anEnv.getRtData()); // TestGroupResultLink tgResultLink = this.writeTestGroup(tgResult, tgLink.getSequenceNr(), env); // aResult.addTestExecItemResultLink(tgResultLink); } } /** * @param tcLink * @param aResult * @param anEnv * @throws Error */ private void executeTestCaseLink(TestCaseLink tcLink, TestGroupResult aResult, ExecutionEnvironment anEnv) throws Error { if ( myTestCaseExecutor == null ) { throw new Error("No Executor is defined for TestCaseLinks"); } try { String fileName = tcLink.getLink().getPath(); String updatedFileName = anEnv.getRtData().substituteVars(fileName); if ( ! fileName.equals(updatedFileName) ) { TestLinkImpl newLink = new TestLinkImpl( updatedFileName, tcLink.getLinkType() ); tcLink.setLink(newLink); } else { tcLink.setLinkDir( anEnv.getScriptDir() ); } TestCaseResultLink tcResult = myTestCaseExecutor.execute(tcLink, anEnv.getLogDir(), anEnv.getRtData()); tcResult.setExecutionPath( aResult.getExecutionPath() + "." + aResult.getId() ); aResult.addTestExecItemResultLink(tcResult); } catch (Throwable t) { Trace.print(LEVEL.ALL, t); String tcId = tcLink.getId(); TestCase tc = new TestCaseImpl( tcId, tcLink.getDescription(), tcLink.getSequenceNr(), new TestStepSequence(), new TestStepSequence(), new TestStepSequence() ); TestCaseResult tcResult = new TestCaseResultImpl( tc ); tcResult.setResult(VERDICT.ERROR); tcResult.addComment(t.getMessage()); // File logDir = new File (aLogDir, tcId ); // logDir.mkdir(); // // File logFile = new File( logDir, tcId + "_log.xml" ); // myTestCaseResultWriter.write( tcResult, logFile ); // // TestCaseResultLink tcResultLink = new TestCaseResultLink( tcLink, VERDICT.ERROR, logFile ); // aResult.addTestCase(tcResultLink); } } /** * @param entryIteration * @param aResult * @param anEnv */ private void executeForeach(TestGroupEntryIteration entryIteration, TestGroupResult aResult, ExecutionEnvironment anEnv) { String listName = entryIteration.getListName(); String listElement = entryIteration.getItemName(); @SuppressWarnings("unchecked") ArrayList<Object> list = anEnv.getRtData().getValueAs(ArrayList.class, listName); - TestGroupEntrySequence doSteps = new TestGroupEntrySequence( entryIteration.getSequence() ); TestStep untilStep = entryIteration.getUntilStep(); TestExecItemIterationResult teiIterationResult = new TestExecItemIterationResultImpl(entryIteration); + if ( list == null ) { + teiIterationResult.addComment("List " + listName + " is not set." ); + aResult.addTgEntryResult(teiIterationResult); + return; + } + Iterator<Object> listItr = list.iterator(); int seqNr = entryIteration.getSequenceNr(); int foreachSeqNr = 0; while (listItr.hasNext() ) { Object element = listItr.next(); teiIterationResult.addIterationValue(element); String tgId = entryIteration.getId() + "_" + foreachSeqNr++; TestGroup tg = new TestGroupImpl(tgId, seqNr, new TestStepSequence(), doSteps, new TestStepSequence()); RunTimeVariable rtVariable = new RunTimeVariable( listElement, element ); RunTimeData subRtData = new RunTimeData( anEnv.getRtData() ); subRtData.add(rtVariable); ExecutionEnvironment env = new ExecutionEnvironment( anEnv.getScriptDir(), anEnv.getLogDir(), subRtData ); List<TestGroupEntryResult> tgEntryResults = executeTestGroupEntries(tg, env); teiIterationResult.addExecResult(tgEntryResults); if ( untilStep != null ) { TestStepResult untilResult = (TestStepResult) myTestStepExecutor.execute(untilStep, env.getScriptDir(), env.getLogDir(), env.getRtData()); if (untilResult.getResult() == VERDICT.PASSED) { teiIterationResult.addUntilResult(untilResult); break; } } } aResult.addTgEntryResult(teiIterationResult); } private void executeSelection( TestGroupEntrySelection selectionEntry, TestGroupResult aResult, ExecutionEnvironment anEnv ) { String tgId = selectionEntry.getId(); TestStep ifStep = selectionEntry.getIfStep(); TestStepResult ifResult = (TestStepResult) myTestStepExecutor.execute(ifStep, anEnv.getScriptDir(), anEnv.getLogDir(), anEnv.getRtData()); TestStepSequence prepSteps = new TestStepSequence(); prepSteps.add(ifStep); boolean negator = selectionEntry.getNegator(); TestGroupEntrySequence execEntries = new TestGroupEntrySequence(); TestExecItemSelectionResult teiSelectionResult = new TestExecItemSelectionResultImpl(selectionEntry); teiSelectionResult.setIfResult(ifResult); // String comment = "If-step evaluated to " + ifResult.getResult() + "."; if ( ifResult.getResult().equals(VERDICT.ERROR) || ifResult.getResult().equals(VERDICT.UNKNOWN) ) { // NOP, we don't execute the then or else! } else { if ( ifResult.getResult().equals( negator ? VERDICT.FAILED : VERDICT.PASSED) ) { execEntries = selectionEntry.getThenSteps(); // comment += " Then-sequence executed."; } else { execEntries = selectionEntry.getElseSteps(); // comment += execEntries.isEmpty() ? " Nothing executed." : " Else-sequence executed."; } } TestGroup tg = new TestGroupImpl(tgId, selectionEntry.getSequenceNr(), prepSteps, execEntries, new TestStepSequence()); // TODO Now the if-step is lost. Make it a sub test group. Either special or with the if-step in prepare. // TestGroupResultLink groupResultLink = // executeTestGroupEntries(tg, aScriptDir, aLogDir, aRTData); // aResult.addTestGroup(groupResultLink); execute(tg, teiSelectionResult, anEnv); // TestGroupResult result = new TestGroupResult(tg); // aResult.addTgEntryResult(teiSelectionResult); // // ifResult.setExecutionPath( result.getExecutionPath() + "." + result.getId() ); // result.addInitialization(ifResult); // // this.executeExecSteps(execEntries, result, aScriptDir, aLogDir, aRTData); // result.setComment(comment); } /** * @param tg * @param aScriptDir * @param aLogDir * @param subRtData */ // private TestGroupResultLink executeTestGroupEntries(TestGroup tg, ExecutionEnvironment anEnv) { private List<TestGroupEntryResult> executeTestGroupEntries(TestGroup tg, ExecutionEnvironment anEnv) { String tgId = tg.getId(); TestGroupEntrySequence doSteps = tg.getExecutionEntries(); TestGroupResult groupResult = new TestGroupResultImpl( tg ); File logDir = new File (anEnv.getLogDir(), tgId ); logDir.mkdir(); ExecutionEnvironment env = new ExecutionEnvironment( anEnv.getScriptDir(), logDir, anEnv.getRtData() ); this.executeExecSteps(doSteps, groupResult, env); return groupResult.getTestGroupEntryResults(); } // /** // * @param groupResult // * @param tgId // * @param seqNr // * @param logDir // * @return // */ // private TestGroupResultLink writeTestGroup(TestGroupResult groupResult, int seqNr, ExecutionEnvironment anEnv) { // // String tgId = groupResult.getId(); // File logFile = anEnv.getLogFile(tgId); // myTestGroupResultWriter.write( groupResult, logFile ); // // TestGroupLink tgLink = new TestGroupLink(tgId, seqNr, logFile.getName()); // // TestGroupResultLinkImpl tgResultLink = new TestGroupResultLinkImpl( tgLink, logFile ); // tgResultLink.setSummary( groupResult.getSummary() ); // groupResult.register(tgResultLink); // return tgResultLink; // } public void executeRestoreSteps(TestStepSequence aRestoreSteps, TestGroupResult aResult, ExecutionEnvironment anEnv ) { Trace.println(Trace.EXEC_PLUS, "executeRestoreSteps( " + aRestoreSteps + ", " + aResult + " )", true); Iterator<TestStep> stepsItr = aRestoreSteps.iterator(); while (stepsItr.hasNext()) { TestStep step = stepsItr.next(); TestStepResultBase tsResult = myTestStepExecutor.execute(step, anEnv.getScriptDir(), anEnv.getLogDir(), anEnv.getRtData()); tsResult.setExecutionPath(aResult.getExecutionPath() + "." + aResult.getId()); aResult.addRestore(tsResult); } } public String getType() { return TYPE; } }

diff --git a/deegree-tools/src/main/java/org/deegree/tools/crs/XMLCoordinateTransform.java b/deegree-tools/src/main/java/org/deegree/tools/crs/XMLCoordinateTransform.java index bdc253db49..b12ae972e3 100644 --- a/deegree-tools/src/main/java/org/deegree/tools/crs/XMLCoordinateTransform.java +++ b/deegree-tools/src/main/java/org/deegree/tools/crs/XMLCoordinateTransform.java @@ -1,234 +1,234 @@ /*---------------------------------------------------------------------------- This file is part of deegree, http://deegree.org/ Copyright (C) 2001-2009 by: Department of Geography, University of Bonn and lat/lon GmbH This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Contact information: lat/lon GmbH Aennchenstr. 19, 53177 Bonn Germany http://lat-lon.de/ Department of Geography, University of Bonn Prof. Dr. Klaus Greve Postfach 1147, 53001 Bonn Germany http://www.geographie.uni-bonn.de/deegree/ e-mail: [email protected] ----------------------------------------------------------------------------*/ package org.deegree.tools.crs; import static org.deegree.tools.CommandUtils.OPT_VERBOSE; import static org.slf4j.LoggerFactory.getLogger; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.Collections; import java.util.List; import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; import org.deegree.commons.xml.stax.FormattingXMLStreamWriter; import org.deegree.cs.CRS; import org.deegree.cs.CRSRegistry; import org.deegree.cs.coordinatesystems.CoordinateSystem; import org.deegree.cs.exceptions.TransformationException; import org.deegree.cs.exceptions.UnknownCRSException; import org.deegree.cs.transformations.Transformation; import org.deegree.gml.GMLVersion; import org.deegree.gml.XMLTransformer; import org.deegree.tools.CommandUtils; import org.deegree.tools.annotations.Tool; import org.slf4j.Logger; /** * Tool for converting the GML geometries inside an XML document from one SRS to another. * * @author <a href="mailto:[email protected]">Markus Schneider</a> * @author last edited by: $Author$ * * @version $Revision$, $Date$ */ @Tool("Converts the GML geometries inside an XML document from one SRS to another.") public class XMLCoordinateTransform { private static final Logger LOG = getLogger( XMLCoordinateTransform.class ); private static final String OPT_S_SRS = "source_srs"; private static final String OPT_T_SRS = "target_srs"; private static final String OPT_TRANSFORMATION = "transformation"; private static final String OPT_INPUT = "input"; private static final String OPT_GML_VERSION = "gml_version"; private static final String OPT_OUTPUT = "output"; /** * a starter method to transform a given point or a serie of points read from a file. * * @param args */ public static void main( String[] args ) { CommandLineParser parser = new PosixParser(); Options options = initOptions(); boolean verbose = false; // for the moment, using the CLI API there is no way to respond to a help argument; see // https://issues.apache.org/jira/browse/CLI-179 if ( args != null && args.length > 0 ) { for ( String a : args ) { if ( a != null && a.toLowerCase().contains( "help" ) || "-?".equals( a ) ) { printHelp( options ); } } } CommandLine line = null; try { line = parser.parse( options, args ); verbose = line.hasOption( OPT_VERBOSE ); doTransform( line ); } catch ( ParseException exp ) { System.err.println( "ERROR: Invalid command line: " + exp.getMessage() ); printHelp( options ); } catch ( Throwable e ) { System.err.println( "An Exception occurred while transforming your document, error message: " + e.getMessage() ); if ( verbose ) { e.printStackTrace(); } System.exit( 1 ); } } private static void doTransform( CommandLine line ) throws IllegalArgumentException, TransformationException, UnknownCRSException, IOException, XMLStreamException, FactoryConfigurationError { // TODO source srs should actually override all srsName attributes in document, not just be the default CoordinateSystem sourceCRS = null; String sourceCRSId = line.getOptionValue( OPT_S_SRS ); if ( sourceCRSId != null ) { sourceCRS = new CRS( sourceCRSId ).getWrappedCRS(); } String targetCRSId = line.getOptionValue( OPT_T_SRS ); CoordinateSystem targetCRS = new CRS( targetCRSId ).getWrappedCRS(); String transId = line.getOptionValue( OPT_TRANSFORMATION ); List<Transformation> trans = null; if ( transId != null ) { Transformation t = CRSRegistry.getTransformation( null, transId ); if ( t != null ) { trans = Collections.singletonList( CRSRegistry.getTransformation( null, transId ) ); } else { throw new IllegalArgumentException( "Specified transformation id '" + transId + "' does not exist in CRS database." ); } } GMLVersion gmlVersion = GMLVersion.GML_31; String gmlVersionString = line.getOptionValue( OPT_GML_VERSION ); if ( gmlVersionString != null ) { gmlVersion = GMLVersion.valueOf( gmlVersionString ); } String i = line.getOptionValue( OPT_INPUT ); File inputFile = new File( i ); if ( !inputFile.exists() ) { throw new IllegalArgumentException( "Input file '" + inputFile + "' does not exist." ); } XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader( new FileInputStream( inputFile ) ); String o = line.getOptionValue( OPT_OUTPUT ); XMLStreamWriter xmlWriter = null; if ( o != null ) { File outputFile = new File( o ); xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter( new FileOutputStream( outputFile ), "UTF-8" ); } else { xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter( System.out, "UTF-8" ); } - xmlWriter = new FormattingXMLStreamWriter( xmlWriter, " ", true ); + xmlWriter = new FormattingXMLStreamWriter( xmlWriter, " ", false ); xmlWriter.writeStartDocument( "UTF-8", "1.0" ); XMLTransformer transformer = new XMLTransformer( targetCRS ); transformer.transform( xmlReader, xmlWriter, sourceCRS, gmlVersion, false, trans ); xmlWriter.close(); } private static Options initOptions() { Options options = new Options(); Option option = new Option( OPT_S_SRS, true, "Identifier of the source srs, e.g. 'EPSG:4326'." ); option.setArgs( 1 ); options.addOption( option ); option = new Option( OPT_T_SRS, true, "Identifier of the target srs, e.g. 'EPSG:4326'." ); option.setArgs( 1 ); option.setRequired( true ); options.addOption( option ); option = new Option( OPT_TRANSFORMATION, true, "Identifier of the transformation to be used, e.g. 'EPSG:4326'." ); option.setArgs( 1 ); options.addOption( option ); option = new Option( OPT_INPUT, true, "Filename of the XML file to be transformed" ); option.setArgs( 1 ); option.setRequired( true ); options.addOption( option ); option = new Option( OPT_GML_VERSION, true, "GML version (GML_2, GML_30, GML_31 or GML_32). Defaults to GML_31 if omitted." ); option.setArgs( 1 ); options.addOption( option ); option = new Option( OPT_OUTPUT, true, "Filename of the output file. If omitted, output is directed to console." ); option.setArgs( 1 ); options.addOption( option ); CommandUtils.addDefaultOptions( options ); return options; } private static void printHelp( Options options ) { CommandUtils.printHelp( options, XMLCoordinateTransform.class.getCanonicalName(), null, null ); } }

private static void doTransform( CommandLine line ) throws IllegalArgumentException, TransformationException, UnknownCRSException, IOException, XMLStreamException, FactoryConfigurationError { // TODO source srs should actually override all srsName attributes in document, not just be the default CoordinateSystem sourceCRS = null; String sourceCRSId = line.getOptionValue( OPT_S_SRS ); if ( sourceCRSId != null ) { sourceCRS = new CRS( sourceCRSId ).getWrappedCRS(); } String targetCRSId = line.getOptionValue( OPT_T_SRS ); CoordinateSystem targetCRS = new CRS( targetCRSId ).getWrappedCRS(); String transId = line.getOptionValue( OPT_TRANSFORMATION ); List<Transformation> trans = null; if ( transId != null ) { Transformation t = CRSRegistry.getTransformation( null, transId ); if ( t != null ) { trans = Collections.singletonList( CRSRegistry.getTransformation( null, transId ) ); } else { throw new IllegalArgumentException( "Specified transformation id '" + transId + "' does not exist in CRS database." ); } } GMLVersion gmlVersion = GMLVersion.GML_31; String gmlVersionString = line.getOptionValue( OPT_GML_VERSION ); if ( gmlVersionString != null ) { gmlVersion = GMLVersion.valueOf( gmlVersionString ); } String i = line.getOptionValue( OPT_INPUT ); File inputFile = new File( i ); if ( !inputFile.exists() ) { throw new IllegalArgumentException( "Input file '" + inputFile + "' does not exist." ); } XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader( new FileInputStream( inputFile ) ); String o = line.getOptionValue( OPT_OUTPUT ); XMLStreamWriter xmlWriter = null; if ( o != null ) { File outputFile = new File( o ); xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter( new FileOutputStream( outputFile ), "UTF-8" ); } else { xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter( System.out, "UTF-8" ); } xmlWriter = new FormattingXMLStreamWriter( xmlWriter, " ", true ); xmlWriter.writeStartDocument( "UTF-8", "1.0" ); XMLTransformer transformer = new XMLTransformer( targetCRS ); transformer.transform( xmlReader, xmlWriter, sourceCRS, gmlVersion, false, trans ); xmlWriter.close(); }

private static void doTransform( CommandLine line ) throws IllegalArgumentException, TransformationException, UnknownCRSException, IOException, XMLStreamException, FactoryConfigurationError { // TODO source srs should actually override all srsName attributes in document, not just be the default CoordinateSystem sourceCRS = null; String sourceCRSId = line.getOptionValue( OPT_S_SRS ); if ( sourceCRSId != null ) { sourceCRS = new CRS( sourceCRSId ).getWrappedCRS(); } String targetCRSId = line.getOptionValue( OPT_T_SRS ); CoordinateSystem targetCRS = new CRS( targetCRSId ).getWrappedCRS(); String transId = line.getOptionValue( OPT_TRANSFORMATION ); List<Transformation> trans = null; if ( transId != null ) { Transformation t = CRSRegistry.getTransformation( null, transId ); if ( t != null ) { trans = Collections.singletonList( CRSRegistry.getTransformation( null, transId ) ); } else { throw new IllegalArgumentException( "Specified transformation id '" + transId + "' does not exist in CRS database." ); } } GMLVersion gmlVersion = GMLVersion.GML_31; String gmlVersionString = line.getOptionValue( OPT_GML_VERSION ); if ( gmlVersionString != null ) { gmlVersion = GMLVersion.valueOf( gmlVersionString ); } String i = line.getOptionValue( OPT_INPUT ); File inputFile = new File( i ); if ( !inputFile.exists() ) { throw new IllegalArgumentException( "Input file '" + inputFile + "' does not exist." ); } XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader( new FileInputStream( inputFile ) ); String o = line.getOptionValue( OPT_OUTPUT ); XMLStreamWriter xmlWriter = null; if ( o != null ) { File outputFile = new File( o ); xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter( new FileOutputStream( outputFile ), "UTF-8" ); } else { xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter( System.out, "UTF-8" ); } xmlWriter = new FormattingXMLStreamWriter( xmlWriter, " ", false ); xmlWriter.writeStartDocument( "UTF-8", "1.0" ); XMLTransformer transformer = new XMLTransformer( targetCRS ); transformer.transform( xmlReader, xmlWriter, sourceCRS, gmlVersion, false, trans ); xmlWriter.close(); }

diff --git a/src/persistence/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/src/persistence/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java index fbcdf4479..4cc27252b 100644 --- a/src/persistence/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java +++ b/src/persistence/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java @@ -1,2005 +1,2005 @@ /* Copyright 2004-2005 the original author or authors. * * 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 org.codehaus.groovy.grails.orm.hibernate.cfg; import groovy.lang.Closure; import groovy.lang.MissingPropertyException; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.groovy.grails.commons.GrailsClassUtils; import org.codehaus.groovy.grails.commons.GrailsDomainClass; import org.codehaus.groovy.grails.commons.GrailsDomainClassProperty; import org.codehaus.groovy.grails.orm.hibernate.validation.UniqueConstraint; import org.codehaus.groovy.grails.validation.ConstrainedProperty; import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.cfg.ImprovedNamingStrategy; import org.hibernate.cfg.Mappings; import org.hibernate.cfg.NamingStrategy; import org.hibernate.cfg.SecondPass; import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.mapping.*; import org.hibernate.mapping.Collection; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; import org.hibernate.persister.entity.SingleTableEntityPersister; import org.hibernate.type.ForeignKeyDirection; import org.hibernate.usertype.UserType; import org.hibernate.util.StringHelper; import java.util.*; import java.util.List; import java.util.Map; import java.util.Set; /** * Handles the binding Grails domain classes and properties to the Hibernate runtime meta model. * Based on the HbmBinder code in Hibernate core and influenced by AnnotationsBinder. * * @author Graeme Rocher * @since 0.1 * * Created: 06-Jul-2005 */ public final class GrailsDomainBinder { private static final String FOREIGN_KEY_SUFFIX = "_id"; private static final Log LOG = LogFactory.getLog( GrailsDomainBinder.class ); private static final NamingStrategy namingStrategy = ImprovedNamingStrategy.INSTANCE; private static final String STRING_TYPE = "string"; private static final String EMPTY_PATH = ""; private static final char UNDERSCORE = '_'; private static final String CASCADE_ALL = "all"; private static final String CASCADE_SAVE_UPDATE = "save-update"; private static final String CASCADE_MERGE = "merge"; private static final String CASCADE_NONE = "none"; private static final String BACKTICK = "`"; private static final Map MAPPING_CACHE = new HashMap(); /** * A Collection type, for the moment only Set is supported * * @author Graeme * */ abstract static class CollectionType { private Class clazz; public abstract Collection create(GrailsDomainClassProperty property, PersistentClass owner, String path, Mappings mappings) throws MappingException; CollectionType(Class clazz) { this.clazz = clazz; } public String toString() { return clazz.getName(); } private static CollectionType SET = new CollectionType(Set.class) { public Collection create(GrailsDomainClassProperty property, PersistentClass owner, String path, Mappings mappings) throws MappingException { org.hibernate.mapping.Set coll = new org.hibernate.mapping.Set(owner); coll.setCollectionTable(owner.getTable()); bindCollection( property, coll, owner, mappings, path); return coll; } }; private static CollectionType LIST = new CollectionType(List.class) { public Collection create(GrailsDomainClassProperty property, PersistentClass owner, String path, Mappings mappings) throws MappingException { org.hibernate.mapping.List coll = new org.hibernate.mapping.List(owner); coll.setCollectionTable(owner.getTable()); bindCollection( property, coll, owner, mappings, path); return coll; } }; private static CollectionType MAP = new CollectionType(Map.class) { public Collection create(GrailsDomainClassProperty property, PersistentClass owner, String path, Mappings mappings) throws MappingException { org.hibernate.mapping.Map map = new org.hibernate.mapping.Map(owner); bindCollection(property, map, owner, mappings, path); return map; } }; private static final Map INSTANCES = new HashMap(); static { INSTANCES.put( Set.class, SET ); INSTANCES.put( SortedSet.class, SET ); INSTANCES.put( List.class, LIST ); INSTANCES.put( Map.class, MAP ); } public static CollectionType collectionTypeForClass(Class clazz) { return (CollectionType)INSTANCES.get( clazz ); } } /** * Second pass class for grails relationships. This is required as all * persistent classes need to be loaded in the first pass and then relationships * established in the second pass compile * * @author Graeme * */ static class GrailsCollectionSecondPass implements SecondPass { protected static final long serialVersionUID = -5540526942092611348L; protected GrailsDomainClassProperty property; protected Mappings mappings; protected Collection collection; public GrailsCollectionSecondPass(GrailsDomainClassProperty property, Mappings mappings, Collection coll) { this.property = property; this.mappings = mappings; this.collection = coll; } public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException { bindCollectionSecondPass( this.property, mappings, persistentClasses, collection,inheritedMetas ); createCollectionKeys(); } private void createCollectionKeys() { collection.createAllKeys(); if ( LOG.isDebugEnabled() ) { String msg = "Mapped collection key: " + columns( collection.getKey() ); if ( collection.isIndexed() ) msg += ", index: " + columns( ( (IndexedCollection) collection ).getIndex() ); if ( collection.isOneToMany() ) { msg += ", one-to-many: " + ( (OneToMany) collection.getElement() ).getReferencedEntityName(); } else { msg += ", element: " + columns( collection.getElement() ); } LOG.debug( msg ); } } private static String columns(Value val) { StringBuffer columns = new StringBuffer(); Iterator iter = val.getColumnIterator(); while ( iter.hasNext() ) { columns.append( ( (Selectable) iter.next() ).getText() ); if ( iter.hasNext() ) columns.append( ", " ); } return columns.toString(); } public void doSecondPass(Map persistentClasses) throws MappingException { bindCollectionSecondPass( this.property, mappings, persistentClasses, collection,Collections.EMPTY_MAP ); createCollectionKeys(); } } static class ListSecondPass extends GrailsCollectionSecondPass { public ListSecondPass(GrailsDomainClassProperty property, Mappings mappings, Collection coll) { super(property, mappings, coll); } public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException { bindListSecondPass(this.property, mappings, persistentClasses, (org.hibernate.mapping.List)collection, inheritedMetas); } public void doSecondPass(Map persistentClasses) throws MappingException { bindListSecondPass(this.property, mappings, persistentClasses, (org.hibernate.mapping.List)collection, Collections.EMPTY_MAP); } } static class MapSecondPass extends GrailsCollectionSecondPass { public MapSecondPass(GrailsDomainClassProperty property, Mappings mappings, Collection coll) { super(property, mappings, coll); } public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException { bindMapSecondPass( this.property, mappings, persistentClasses, (org.hibernate.mapping.Map)collection, inheritedMetas); } public void doSecondPass(Map persistentClasses) throws MappingException { bindMapSecondPass( this.property, mappings, persistentClasses, (org.hibernate.mapping.Map)collection, Collections.EMPTY_MAP); } } private static void bindMapSecondPass(GrailsDomainClassProperty property, Mappings mappings, Map persistentClasses, org.hibernate.mapping.Map map, Map inheritedMetas) { bindCollectionSecondPass(property, mappings, persistentClasses, map, inheritedMetas); String columnName = getColumnNameForPropertyAndPath(property, ""); SimpleValue value = new SimpleValue( map.getCollectionTable() ); bindSimpleValue(STRING_TYPE, value, true, columnName + UNDERSCORE + IndexedCollection.DEFAULT_INDEX_COLUMN_NAME,mappings); if ( !value.isTypeSpecified() ) { throw new MappingException( "map index element must specify a type: " + map.getRole() ); } map.setIndex( value ); if(!property.isOneToMany()) { SimpleValue elt = new SimpleValue( map.getCollectionTable() ); map.setElement( elt ); bindSimpleValue(STRING_TYPE, elt, false, columnName + UNDERSCORE + IndexedCollection.DEFAULT_ELEMENT_COLUMN_NAME,mappings); elt.setTypeName(STRING_TYPE); map.setInverse(false); } else { map.setInverse(false); } } private static void bindListSecondPass(GrailsDomainClassProperty property, Mappings mappings, Map persistentClasses, org.hibernate.mapping.List list, Map inheritedMetas) { bindCollectionSecondPass( property, mappings, persistentClasses, list,inheritedMetas ); String columnName = getColumnNameForPropertyAndPath(property, "")+ UNDERSCORE +IndexedCollection.DEFAULT_INDEX_COLUMN_NAME; SimpleValue iv = new SimpleValue( list.getCollectionTable() ); bindSimpleValue("integer", iv, true,columnName, mappings); iv.setTypeName( "integer" ); list.setIndex( iv ); list.setBaseIndex(0); list.setInverse(false); Value v = list.getElement(); v.createForeignKey(); if(property.isBidirectional()) { String entityName; Value element = list.getElement(); if(element instanceof ManyToOne) { ManyToOne manyToOne = (ManyToOne) element; entityName = manyToOne.getReferencedEntityName(); } else { entityName = ( (OneToMany) element).getReferencedEntityName(); } PersistentClass referenced = mappings.getClass( entityName ); Backref prop = new Backref(); prop.setEntityName(property.getDomainClass().getFullName()); prop.setName(UNDERSCORE + property.getDomainClass().getShortName() + UNDERSCORE + property.getName() + "Backref" ); prop.setSelectable( false ); prop.setUpdateable( false ); prop.setInsertable( true ); prop.setCollectionRole( list.getRole() ); prop.setValue( list.getKey() ); DependantValue value = (DependantValue) prop.getValue(); value.setNullable(false); value.setUpdateable(true); prop.setOptional( false ); referenced.addProperty( prop ); IndexBackref ib = new IndexBackref(); ib.setName( UNDERSCORE + property.getName() + "IndexBackref" ); ib.setUpdateable( false ); ib.setSelectable( false ); ib.setCollectionRole( list.getRole() ); ib.setEntityName( list.getOwner().getEntityName() ); ib.setValue( list.getIndex() ); referenced.addProperty( ib ); } } private static void bindCollectionSecondPass(GrailsDomainClassProperty property, Mappings mappings, Map persistentClasses, Collection collection, Map inheritedMetas) { PersistentClass associatedClass = null; if(LOG.isDebugEnabled()) LOG.debug( "Mapping collection: " + collection.getRole() + " -> " + collection.getCollectionTable().getName() ); ColumnConfig cc = getColumnConfig(property); // Configure one-to-many if(collection.isOneToMany() ) { GrailsDomainClass referenced = property.getReferencedDomainClass(); Mapping m = getRootMapping(referenced); boolean tablePerSubclass = m != null && !m.getTablePerHierarchy(); if(referenced != null && !referenced.isRoot() && !tablePerSubclass) { // NOTE: Work around for http://opensource.atlassian.com/projects/hibernate/browse/HHH-2855 collection.setWhere(RootClass.DEFAULT_DISCRIMINATOR_COLUMN_NAME + " = '"+referenced.getFullName()+"'"); } OneToMany oneToMany = (OneToMany)collection.getElement(); String associatedClassName = oneToMany.getReferencedEntityName(); associatedClass = (PersistentClass)persistentClasses.get(associatedClassName); // if there is no persistent class for the association throw // exception if(associatedClass == null) { throw new MappingException( "Association references unmapped class: " + oneToMany.getReferencedEntityName() ); } oneToMany.setAssociatedClass( associatedClass ); if(shouldBindCollectionWithForeignKey(property)) { collection.setCollectionTable( associatedClass.getTable() ); } bindCollectionForColumnConfig(collection, cc); } if(isSorted(property)) { collection.setSorted(true); } // setup the primary key references DependantValue key = createPrimaryKeyValue(property, collection,persistentClasses); // link a bidirectional relationship if(property.isBidirectional()) { GrailsDomainClassProperty otherSide = property.getOtherSide(); if(otherSide.isManyToOne() && shouldBindCollectionWithForeignKey(property)) { linkBidirectionalOneToMany(collection, associatedClass, key, otherSide); } else if(property.isManyToMany() || Map.class.isAssignableFrom(property.getType())) { bindDependentKeyValue(property,key,mappings); } } else { if(cc != null && cc.getJoinTable() != null && cc.getJoinTable().getKey() != null) { bindSimpleValue("long", key,false, cc.getJoinTable().getKey(), mappings); } else { bindDependentKeyValue(property,key,mappings); } } collection.setKey( key ); // get cache config if(cc != null) { CacheConfig cacheConfig = cc.getCache(); if(cacheConfig != null) { collection.setCacheConcurrencyStrategy(cacheConfig.getUsage()); } } // if we have a many-to-many if(property.isManyToMany() || isBidirectionalOneToManyMap(property)) { GrailsDomainClassProperty otherSide = property.getOtherSide(); if(property.isBidirectional()) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Mapping other side "+otherSide.getDomainClass().getName()+"."+otherSide.getName()+" -> "+collection.getCollectionTable().getName()+" as ManyToOne"); ManyToOne element = new ManyToOne( collection.getCollectionTable() ); bindManyToMany(otherSide, element, mappings); collection.setElement(element); bindCollectionForColumnConfig(collection, cc); } else { // TODO support unidirectional many-to-many } } else if (shouldCollectionBindWithJoinColumn(property)) { bindCollectionWithJoinTable(property, mappings, collection, cc); } else if(isUnidirectionalOneToMany(property)) { // for non-inverse one-to-many, with a not-null fk, add a backref! // there are problems with list and map mappings and join columns relating to duplicate key constraints // TODO change this when HHH-1268 is resolved bindUnidirectionalOneToMany(property, mappings, collection); } } private static Mapping getRootMapping(GrailsDomainClass referenced) { if(referenced == null) return null; Class current = referenced.getClazz(); while(true) { Class superClass = current.getSuperclass(); if(Object.class.equals(superClass)) break; current = superClass; } - return getMapping(current.getName()); + return getMapping(current); } private static boolean isBidirectionalOneToManyMap(GrailsDomainClassProperty property) { return Map.class.isAssignableFrom(property.getType()) && property.isBidirectional(); } private static void bindCollectionWithJoinTable(GrailsDomainClassProperty property, Mappings mappings, Collection collection, ColumnConfig cc) { // for a normal unidirectional one-to-many we use a join column ManyToOne element = new ManyToOne( collection.getCollectionTable() ); bindUnidirectionalOneToManyInverseValues(property, element); collection.setInverse(false); String columnName; JoinTable jt = cc != null ? cc.getJoinTable() : null; if(jt != null && jt.getKey()!=null) { columnName = jt.getColumn(); } else { columnName = namingStrategy.propertyToColumnName(property.getReferencedDomainClass().getPropertyName()) + FOREIGN_KEY_SUFFIX; } bindSimpleValue("long", element,true, columnName, mappings); collection.setElement(element); bindCollectionForColumnConfig(collection, cc); } private static boolean shouldCollectionBindWithJoinColumn(GrailsDomainClassProperty property) { ColumnConfig cc = getColumnConfig(property); JoinTable jt = cc != null ? cc.getJoinTable() : new JoinTable(); return isUnidirectionalOneToMany(property) && jt!=null; } /** * @param property * @param manyToOne */ private static void bindUnidirectionalOneToManyInverseValues(GrailsDomainClassProperty property, ManyToOne manyToOne) { ColumnConfig cc = getColumnConfig(property); if(cc != null) { manyToOne.setLazy(cc.getLazy()); } else { manyToOne.setLazy(true); } // set referenced entity manyToOne.setReferencedEntityName( property.getReferencedPropertyType().getName() ); manyToOne.setIgnoreNotFound(true); } private static void bindCollectionForColumnConfig(Collection collection, ColumnConfig cc) { if(cc!=null) { collection.setLazy(cc.getLazy()); } else { collection.setLazy(true); } } private static ColumnConfig getColumnConfig(GrailsDomainClassProperty property) { - Mapping m = getMapping(property.getDomainClass().getFullName()); + Mapping m = getMapping(property.getDomainClass().getClazz()); ColumnConfig cc = m != null ? m.getColumn(property.getName()) : null; return cc; } /** * Checks whether a property is a unidirectional non-circular one-to-many * @param property The property to check * @return True if it is unidirectional and a one-to-many */ private static boolean isUnidirectionalOneToMany(GrailsDomainClassProperty property) { return property.isOneToMany() && !property.isBidirectional(); } /** * Binds the primary key value column * * @param property The property * @param key The key * @param mappings The mappings */ private static void bindDependentKeyValue(GrailsDomainClassProperty property, DependantValue key, Mappings mappings) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] binding ["+property.getName()+"] with dependant key"); bindSimpleValue(property, key, EMPTY_PATH, mappings); } /** * Creates the DependentValue object that forms a primary key reference for the collection * * @param property The grails property * @param collection The collection object * @param persistentClasses * @return The DependantValue (key) */ private static DependantValue createPrimaryKeyValue(GrailsDomainClassProperty property, Collection collection, Map persistentClasses) { KeyValue keyValue; DependantValue key; String propertyRef = collection.getReferencedPropertyName(); // this is to support mapping by a property if(propertyRef == null) { keyValue = collection.getOwner().getIdentifier(); } else { keyValue = (KeyValue)collection.getOwner().getProperty( propertyRef ).getValue(); } if(LOG.isDebugEnabled()) LOG.debug( "[GrailsDomainBinder] creating dependant key value to table ["+keyValue.getTable().getName()+"]"); key = new DependantValue(collection.getCollectionTable(), keyValue); key.setTypeName(null); // make nullable and non-updateable key.setNullable(true); key.setUpdateable(false); return key; } /** * Binds a unidirectional one-to-many creating a psuedo back reference property in the process. * * @param property * @param mappings * @param collection */ private static void bindUnidirectionalOneToMany(GrailsDomainClassProperty property, Mappings mappings, Collection collection) { Value v = collection.getElement(); v.createForeignKey(); String entityName; if(v instanceof ManyToOne) { ManyToOne manyToOne = (ManyToOne) v; entityName = manyToOne.getReferencedEntityName(); } else { entityName = ((OneToMany)v).getReferencedEntityName(); } collection.setInverse(false); PersistentClass referenced = mappings.getClass( entityName ); Backref prop = new Backref(); prop.setEntityName(property.getDomainClass().getFullName()); prop.setName(UNDERSCORE + property.getDomainClass().getShortName() + UNDERSCORE + property.getName() + "Backref" ); prop.setUpdateable( false ); prop.setInsertable( true ); prop.setCollectionRole( collection.getRole() ); prop.setValue( collection.getKey() ); prop.setOptional( true ); referenced.addProperty( prop ); } private static Property getProperty(PersistentClass associatedClass, String propertyName) throws MappingException { try { return associatedClass.getProperty(propertyName); } catch (MappingException e) { //maybe it's squirreled away in a composite primary key if (associatedClass.getKey() instanceof Component) { return ((Component)associatedClass.getKey()).getProperty(propertyName); } else { throw e; } } } /** * Links a bidirectional one-to-many, configuring the inverse side and using a column copy to perform the link * * @param collection The collection one-to-many * @param associatedClass The associated class * @param key The key * @param otherSide The other side of the relationship */ private static void linkBidirectionalOneToMany(Collection collection, PersistentClass associatedClass, DependantValue key, GrailsDomainClassProperty otherSide) { collection.setInverse(true); // Iterator mappedByColumns = associatedClass.getProperty( otherSide.getName() ).getValue().getColumnIterator(); Iterator mappedByColumns = getProperty(associatedClass, otherSide.getName()) .getValue().getColumnIterator(); while(mappedByColumns.hasNext()) { Column column = (Column)mappedByColumns.next(); linkValueUsingAColumnCopy(otherSide,column,key); } } /** * Establish whether a collection property is sorted * @param property The property * @return True if sorted */ private static boolean isSorted(GrailsDomainClassProperty property) { return SortedSet.class.isAssignableFrom(property.getType()); } /** * Binds a many-to-many relationship. A many-to-many consists of * - a key (a DependentValue) * - an element * * The element is a ManyToOne from the association table to the target entity * * @param property The grails property * @param element The ManyToOne element * @param mappings The mappings */ private static void bindManyToMany(GrailsDomainClassProperty property, ManyToOne element, Mappings mappings) { bindManyToOne(property,element, EMPTY_PATH, mappings); element.setReferencedEntityName(property.getDomainClass().getFullName()); } private static void linkValueUsingAColumnCopy(GrailsDomainClassProperty prop, Column column, DependantValue key) { Column mappingColumn = new Column(); mappingColumn.setName(column.getName()); mappingColumn.setLength(column.getLength()); mappingColumn.setNullable(prop.isOptional()); mappingColumn.setSqlType(column.getSqlType()); mappingColumn.setValue(key); key.addColumn( mappingColumn ); key.getTable().addColumn( mappingColumn ); } /** * First pass to bind collection to Hibernate metamodel, sets up second pass * * @param property The GrailsDomainClassProperty instance * @param collection The collection * @param owner The owning persistent class * @param mappings The Hibernate mappings instance * @param path */ private static void bindCollection(GrailsDomainClassProperty property, Collection collection, PersistentClass owner, Mappings mappings, String path) { // set role String propertyName = getNameForPropertyAndPath(property, path); collection.setRole( StringHelper.qualify( property.getDomainClass().getFullName() , propertyName ) ); // configure eager fetching if(property.getFetchMode() == GrailsDomainClassProperty.FETCH_EAGER) { collection.setFetchMode(FetchMode.JOIN); } else { collection.setFetchMode( FetchMode.DEFAULT ); } // if its a one-to-many mapping if(shouldBindCollectionWithForeignKey(property)) { OneToMany oneToMany = new OneToMany( collection.getOwner() ); collection.setElement( oneToMany ); bindOneToMany( property, oneToMany, mappings ); } else { bindCollectionTable(property, mappings, collection); if(!property.isOwningSide()) { collection.setInverse(true); } } // setup second pass if(collection instanceof org.hibernate.mapping.Set) mappings.addSecondPass( new GrailsCollectionSecondPass(property, mappings, collection) ); else if(collection instanceof org.hibernate.mapping.List) { mappings.addSecondPass( new ListSecondPass(property, mappings, collection) ); } else if(collection instanceof org.hibernate.mapping.Map) { mappings.addSecondPass( new MapSecondPass(property, mappings, collection)); } } /* * We bind collections with foreign keys if specified in the mapping and only if it is a unidirectional one-to-many * that is */ private static boolean shouldBindCollectionWithForeignKey(GrailsDomainClassProperty property) { return (property.isOneToMany() && property.isBidirectional() || !shouldCollectionBindWithJoinColumn(property)) && !Map.class.isAssignableFrom(property.getType()) && !property.isManyToMany(); } private static boolean isListOrMapCollection(GrailsDomainClassProperty property) { return Map.class.isAssignableFrom(property.getType()) || List.class.isAssignableFrom(property.getType()); } private static String getNameForPropertyAndPath(GrailsDomainClassProperty property, String path) { String propertyName; if(StringHelper.isNotEmpty(path)) { propertyName = StringHelper.qualify(path, property.getName()); } else { propertyName = property.getName(); } return propertyName; } private static void bindCollectionTable(GrailsDomainClassProperty property, Mappings mappings, Collection collection) { String tableName = calculateTableForMany(property); Table t = mappings.addTable( mappings.getSchemaName(), mappings.getCatalogName(), tableName, null, false ); collection.setCollectionTable(t); } /** * This method will calculate the mapping table for a many-to-many. One side of * the relationship has to "own" the relationship so that there is not a situation * where you have two mapping tables for left_right and right_left */ private static String calculateTableForMany(GrailsDomainClassProperty property) { if(Map.class.isAssignableFrom(property.getType())) { String tablePrefix = getTableName(property.getDomainClass()); return tablePrefix + "_" + namingStrategy.propertyToColumnName(property.getName()); } else { ColumnConfig cc = getColumnConfig(property); JoinTable jt = cc != null ? cc.getJoinTable() : null; if(property.isManyToMany() && jt != null && jt.getName()!=null) { return jt.getName(); } else { String left = getTableName(property.getDomainClass()); String right = getTableName(property.getReferencedDomainClass()); if(property.isOwningSide()) { return left+ UNDERSCORE +right; } else if(shouldCollectionBindWithJoinColumn(property)) { if(jt != null && jt.getName() != null) { return jt.getName(); } left = trimBackTigs(left); right = trimBackTigs(right); return left+ UNDERSCORE +right; } else { return right+ UNDERSCORE +left; } } } } private static String trimBackTigs(String tableName) { if(tableName.startsWith(BACKTICK)) return tableName.substring(1, tableName.length()-1); return tableName; } /** * Evaluates the table name for the given property * * @param domainClass The domain class to evaluate * @return The table name */ private static String getTableName(GrailsDomainClass domainClass) { - Mapping m = getMapping(domainClass.getFullName()); + Mapping m = getMapping(domainClass.getClazz()); String tableName = null; if(m != null && m.getTableName() != null) { tableName = m.getTableName(); } if(tableName == null) { tableName = namingStrategy.classToTableName(domainClass.getShortName()); } return tableName; } /** * Binds a Grails domain class to the Hibernate runtime meta model * @param domainClass The domain class to bind * @param mappings The existing mappings * @throws MappingException Thrown if the domain class uses inheritance which is not supported */ public static void bindClass(GrailsDomainClass domainClass, Mappings mappings) throws MappingException { //if(domainClass.getClazz().getSuperclass() == java.lang.Object.class) { if(domainClass.isRoot()) { evaluateMapping(domainClass); bindRoot(domainClass, mappings); } //} //else { // throw new MappingException("Grails domain classes do not support inheritance"); //} } /** * Evaluates a Mapping object from the domain class if it has a mapping closure * * @param domainClass The domain class */ private static void evaluateMapping(GrailsDomainClass domainClass) { try { Object o = GrailsClassUtils.getStaticPropertyValue(domainClass.getClazz(), GrailsDomainClassProperty.MAPPING); if(o instanceof Closure) { HibernateMappingBuilder builder = new HibernateMappingBuilder(domainClass.getFullName()); Mapping m = builder.evaluate((Closure)o); MAPPING_CACHE.put(domainClass.getFullName(), m); } } catch (MissingPropertyException e) { // ignore } } /** * Obtains a mapping object for the given domain class nam - * @param domainClassName The domain class name in question + * @param theClass The domain class in question * @return A Mapping object or null */ - public static Mapping getMapping(String domainClassName) { - return (Mapping) MAPPING_CACHE.get(domainClassName); + public static Mapping getMapping(Class theClass) { + return (Mapping) MAPPING_CACHE.get(theClass.getName()); } /** * Binds the specified persistant class to the runtime model based on the * properties defined in the domain class * @param domainClass The Grails domain class * @param persistentClass The persistant class * @param mappings Existing mappings */ private static void bindClass(GrailsDomainClass domainClass, PersistentClass persistentClass, Mappings mappings) { // set lazy loading for now persistentClass.setLazy(true); persistentClass.setEntityName(domainClass.getFullName()); persistentClass.setProxyInterfaceName( domainClass.getFullName() ); persistentClass.setClassName(domainClass.getFullName()); // set dynamic insert to false persistentClass.setDynamicInsert(false); // set dynamic update to false persistentClass.setDynamicUpdate(false); // set select before update to false persistentClass.setSelectBeforeUpdate(false); // add import to mappings if ( mappings.isAutoImport() && persistentClass.getEntityName().indexOf( '.' ) > 0 ) { mappings.addImport( persistentClass.getEntityName(), StringHelper.unqualify( persistentClass .getEntityName() ) ); } } /** * Binds a root class (one with no super classes) to the runtime meta model * based on the supplied Grails domain class * * @param domainClass The Grails domain class * @param mappings The Hibernate Mappings object */ public static void bindRoot(GrailsDomainClass domainClass, Mappings mappings) { if(mappings.getClass(domainClass.getFullName()) == null) { RootClass root = new RootClass(); bindClass(domainClass, root, mappings); - Mapping m = getMapping(domainClass.getName()); + Mapping m = getMapping(domainClass.getClazz()); if(m!=null) { CacheConfig cc = m.getCache(); if(cc != null && cc.getEnabled()) { root.setCacheConcurrencyStrategy(cc.getUsage()); root.setLazyPropertiesCacheable(!"non-lazy".equals(cc.getInclude())); } } bindRootPersistentClassCommonValues(domainClass, root, mappings); if(!domainClass.getSubClasses().isEmpty()) { boolean tablePerSubclass = m != null && !m.getTablePerHierarchy(); if(!tablePerSubclass) { // if the root class has children create a discriminator property bindDiscriminatorProperty(root.getTable(), root, mappings); } // bind the sub classes bindSubClasses(domainClass,root,mappings); } mappings.addClass(root); } else { LOG.info("[GrailsDomainBinder] Class ["+domainClass.getFullName()+"] is already mapped, skipping.. "); } } /** * Binds the sub classes of a root class using table-per-heirarchy inheritance mapping * * @param domainClass The root domain class to bind * @param parent The parent class instance * @param mappings The mappings instance */ private static void bindSubClasses(GrailsDomainClass domainClass, PersistentClass parent, Mappings mappings) { Set subClasses = domainClass.getSubClasses(); for (Iterator i = subClasses.iterator(); i.hasNext();) { GrailsDomainClass sub = (GrailsDomainClass) i.next(); Set subSubs = sub.getSubClasses(); if(sub.getClazz().getSuperclass().equals(domainClass.getClazz())) { bindSubClass(sub,parent,mappings); } } } /** * Binds a sub class * * @param sub The sub domain class instance * @param parent The parent persistent class instance * @param mappings The mappings instance */ private static void bindSubClass(GrailsDomainClass sub, PersistentClass parent, Mappings mappings) { evaluateMapping(sub); - Mapping m = getMapping(parent.getClassName()); + Mapping m = getMapping(parent.getMappedClass()); Subclass subClass; boolean tablePerSubclass = m != null && !m.getTablePerHierarchy(); if(tablePerSubclass) { subClass = new JoinedSubclass(parent); } else { subClass = new SingleTableSubclass(parent); // set the descriminator value as the name of the class. This is the // value used by Hibernate to decide what the type of the class is // to perform polymorphic queries subClass.setDiscriminatorValue(sub.getFullName()); } subClass.setEntityName(sub.getFullName()); parent.addSubclass( subClass ); mappings.addClass( subClass ); if(tablePerSubclass) bindJoinedSubClass(sub, (JoinedSubclass)subClass, mappings, m); else bindSubClass(sub,subClass,mappings); if(!sub.getSubClasses().isEmpty()) { // bind the sub classes bindSubClasses(sub,subClass,mappings); } } /** * Binds a joined sub-class mapping using table-per-subclass * @param sub The Grails sub class * @param joinedSubclass The Hibernate Subclass object * @param mappings The mappings Object * @param gormMapping The GORM mapping object */ private static void bindJoinedSubClass(GrailsDomainClass sub, JoinedSubclass joinedSubclass, Mappings mappings, Mapping gormMapping) { bindClass( sub, joinedSubclass, mappings ); if ( joinedSubclass.getEntityPersisterClass() == null ) { joinedSubclass.getRootClass() .setEntityPersisterClass( JoinedSubclassEntityPersister.class ); } Table mytable = mappings.addTable( mappings.getSchemaName(), mappings.getCatalogName(), getJoinedSubClassTableName( sub,joinedSubclass, null, mappings ), null, false ); joinedSubclass.setTable( mytable ); LOG.info( "Mapping joined-subclass: " + joinedSubclass.getEntityName() + " -> " + joinedSubclass.getTable().getName() ); SimpleValue key = new DependantValue( mytable, joinedSubclass.getIdentifier() ); joinedSubclass.setKey( key ); GrailsDomainClassProperty identifier = sub.getIdentifier(); String columnName = getColumnNameForPropertyAndPath(identifier, EMPTY_PATH); bindSimpleValue( identifier.getType().getName(), key, false, columnName, mappings ); joinedSubclass.createPrimaryKey(); // properties createClassProperties( sub, joinedSubclass, mappings); } private static String getJoinedSubClassTableName( GrailsDomainClass sub, PersistentClass model, Table denormalizedSuperTable, Mappings mappings ) { String logicalTableName = StringHelper.unqualify( model.getEntityName() ); String physicalTableName = getTableName(sub); mappings.addTableBinding( mappings.getSchemaName(), mappings.getCatalogName(), logicalTableName, physicalTableName, denormalizedSuperTable ); return physicalTableName; } /** * Binds a sub-class using table-per-heirarchy in heritance mapping * * @param sub The Grails domain class instance representing the sub-class * @param subClass The Hibernate SubClass instance * @param mappings The mappings instance */ private static void bindSubClass(GrailsDomainClass sub, Subclass subClass, Mappings mappings) { bindClass( sub, subClass, mappings ); if ( subClass.getEntityPersisterClass() == null ) { subClass.getRootClass() .setEntityPersisterClass( SingleTableEntityPersister.class ); } if(LOG.isDebugEnabled()) LOG.debug( "Mapping subclass: " + subClass.getEntityName() + " -> " + subClass.getTable().getName() ); // properties createClassProperties( sub, subClass, mappings); } /** * Creates and binds the discriminator property used in table-per-heirarchy inheritance to * discriminate between sub class instances * * @param table The table to bind onto * @param entity The root class entity * @param mappings The mappings instance */ private static void bindDiscriminatorProperty(Table table, RootClass entity, Mappings mappings) { SimpleValue d = new SimpleValue( table ); entity.setDiscriminator( d ); entity.setDiscriminatorValue(entity.getClassName()); bindSimpleValue( STRING_TYPE, d, false, RootClass.DEFAULT_DISCRIMINATOR_COLUMN_NAME, mappings ); entity.setPolymorphic( true ); } /** * Binds a persistent classes to the table representation and binds the class properties * * @param domainClass * @param root * @param mappings */ private static void bindRootPersistentClassCommonValues(GrailsDomainClass domainClass, RootClass root, Mappings mappings) { // get the schema and catalog names from the configuration String schema = mappings.getSchemaName(); String catalog = mappings.getCatalogName(); // create the table Table table = mappings.addTable( schema, catalog, getTableName(domainClass), null, false ); root.setTable(table); if(LOG.isDebugEnabled()) LOG.debug( "[GrailsDomainBinder] Mapping Grails domain class: " + domainClass.getFullName() + " -> " + root.getTable().getName() ); - Mapping m = getMapping(domainClass.getFullName()); + Mapping m = getMapping(domainClass.getClazz()); bindIdentity(domainClass, root, mappings, m); if(m != null) { if(m.getVersioned()) { bindVersion( domainClass.getVersion(), root, mappings ); } } else bindVersion( domainClass.getVersion(), root, mappings ); root.createPrimaryKey(); createClassProperties(domainClass,root,mappings); } private static void bindIdentity(GrailsDomainClass domainClass, RootClass root, Mappings mappings, Mapping gormMapping) { if(gormMapping != null) { Object id = gormMapping.getIdentity(); if(id instanceof CompositeIdentity){ bindCompositeId(domainClass, root, (CompositeIdentity)id, gormMapping, mappings); } else { bindSimpleId( domainClass.getIdentifier(), root, mappings, (Identity)id ); } } else { bindSimpleId( domainClass.getIdentifier(), root, mappings, null); } } private static void bindCompositeId(GrailsDomainClass domainClass, RootClass root, CompositeIdentity compositeIdentity, Mapping gormMapping, Mappings mappings) { Component id = new Component(root); root.setIdentifier(id); root.setEmbeddedIdentifier(true); id.setComponentClassName( domainClass.getFullName() ); id.setKey(true); id.setEmbedded(true); String path = StringHelper.qualify( root.getEntityName(), "id"); id.setRoleName(path); String[] props = compositeIdentity.getPropertyNames(); for (int i = 0; i < props.length; i++) { String propName = props[i]; GrailsDomainClassProperty property = domainClass.getPropertyByName(propName); if(property == null) throw new MappingException("Property ["+propName+"] referenced in composite-id mapping of class ["+domainClass.getFullName()+"] is not a valid property!"); bindComponentProperty(id, property, root, "", root.getTable(), mappings); } } /** * Creates and binds the properties for the specified Grails domain class and PersistantClass * and binds them to the Hibernate runtime meta model * * @param domainClass The Grails domain class * @param persistentClass The Hibernate PersistentClass instance * @param mappings The Hibernate Mappings instance */ protected static void createClassProperties(GrailsDomainClass domainClass, PersistentClass persistentClass, Mappings mappings) { GrailsDomainClassProperty[] persistentProperties = domainClass.getPersistentProperties(); Table table = persistentClass.getTable(); - Mapping gormMapping = getMapping(domainClass.getFullName()); + Mapping gormMapping = getMapping(domainClass.getClazz()); for(int i = 0; i < persistentProperties.length;i++) { GrailsDomainClassProperty currentGrailsProp = persistentProperties[i]; // if its inherited skip if(currentGrailsProp.isInherited() && !isBidirectionalManyToOne(currentGrailsProp)) continue; if (isCompositeIdProperty(gormMapping, currentGrailsProp)) continue; if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding persistent property [" + currentGrailsProp.getName() + "]"); Value value; // see if its a collection type CollectionType collectionType = CollectionType.collectionTypeForClass( currentGrailsProp.getType() ); Class userType = getUserType(currentGrailsProp); if(collectionType != null) { // create collection Collection collection = collectionType.create( currentGrailsProp, persistentClass, EMPTY_PATH, mappings ); mappings.addCollection(collection); value = collection; } // work out what type of relationship it is and bind value else if ( currentGrailsProp.isManyToOne() ) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding property [" + currentGrailsProp.getName() + "] as ManyToOne"); value = new ManyToOne( table ); bindManyToOne( currentGrailsProp, (ManyToOne) value, EMPTY_PATH, mappings ); } else if ( currentGrailsProp.isOneToOne() && !isUserType(userType)) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding property [" + currentGrailsProp.getName() + "] as OneToOne"); //value = new OneToOne( table, persistentClass ); //bindOneToOne( currentGrailsProp, (OneToOne)value,EMPTY_PATH,mappings ); value = new ManyToOne( table ); bindManyToOne( currentGrailsProp, (ManyToOne)value, EMPTY_PATH, mappings ); } else if ( currentGrailsProp.isEmbedded() ) { value = new Component( persistentClass ); bindComponent((Component)value, currentGrailsProp, true, mappings); } else { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding property [" + currentGrailsProp.getName() + "] as SimpleValue"); value = new SimpleValue( table ); bindSimpleValue( persistentProperties[i], (SimpleValue) value, EMPTY_PATH, mappings ); } if(value != null) { Property property = createProperty( value, persistentClass, persistentProperties[i], mappings ); persistentClass.addProperty( property ); } } } private static boolean isUserType(Class userType) { if(userType == null) return false; return UserType.class.isAssignableFrom(userType); } private static Class getUserType(GrailsDomainClassProperty currentGrailsProp) { Class userType = null; ColumnConfig cc = getColumnConfig(currentGrailsProp); Object typeObj = cc != null ? cc.getType() : null; if(typeObj instanceof Class) { userType = (Class)typeObj; } else if(typeObj != null) { String typeName = typeObj.toString(); try { userType = Class.forName(typeName); } catch (ClassNotFoundException e) { // ignore } } return userType; } private static boolean isCompositeIdProperty(Mapping gormMapping, GrailsDomainClassProperty currentGrailsProp) { if(gormMapping != null && gormMapping.getIdentity() != null) { Object id = gormMapping.getIdentity(); if(id instanceof CompositeIdentity) { CompositeIdentity cid = (CompositeIdentity)id; if(ArrayUtils.contains(cid.getPropertyNames(), currentGrailsProp.getName())) return true; } } return false; } private static boolean isBidirectionalManyToOne(GrailsDomainClassProperty currentGrailsProp) { return (currentGrailsProp.isBidirectional() && currentGrailsProp.isManyToOne()); } /** * Binds a Hibernate component type using the given GrailsDomainClassProperty instance * * @param component The component to bind * @param property The property * @param isNullable Whether it is nullable or not * @param mappings The Hibernate Mappings object */ private static void bindComponent(Component component, GrailsDomainClassProperty property, boolean isNullable, Mappings mappings) { component.setEmbedded(true); Class type = property.getType(); String role = StringHelper.qualify(type.getName(), property.getName()); component.setRoleName(role); component.setComponentClassName(type.getName()); GrailsDomainClass domainClass = property.getReferencedDomainClass() != null ? property.getReferencedDomainClass() : property.getComponent(); GrailsDomainClassProperty[] properties = domainClass.getPersistentProperties(); Table table = component.getOwner().getTable(); PersistentClass persistentClass = component.getOwner(); String path = property.getName(); Class propertyType = property.getDomainClass().getClazz(); for (int i = 0; i < properties.length; i++) { GrailsDomainClassProperty currentGrailsProp = properties[i]; if(currentGrailsProp.isIdentity()) continue; if(currentGrailsProp.getName().equals(GrailsDomainClassProperty.VERSION)) continue; if(currentGrailsProp.getType().equals(propertyType)) { component.setParentProperty(currentGrailsProp.getName()); continue; } bindComponentProperty(component, currentGrailsProp, persistentClass, path, table, mappings); } } private static void bindComponentProperty(Component component, GrailsDomainClassProperty property, PersistentClass persistentClass, String path, Table table, Mappings mappings) { Value value = null; // see if its a collection type CollectionType collectionType = CollectionType.collectionTypeForClass( property.getType() ); if(collectionType != null) { // create collection Collection collection = collectionType.create( property, persistentClass, path, mappings ); mappings.addCollection(collection); value = collection; } // work out what type of relationship it is and bind value else if ( property.isManyToOne() ) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding property [" + property.getName() + "] as ManyToOne"); value = new ManyToOne( table ); bindManyToOne(property, (ManyToOne) value, path, mappings ); } else if ( property.isOneToOne()) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding property [" + property.getName() + "] as OneToOne"); //value = new OneToOne( table, persistentClass ); //bindOneToOne( currentGrailsProp, (OneToOne)value, mappings ); value = new ManyToOne( table ); bindManyToOne(property, (ManyToOne) value, path, mappings ); } /* else if ( currentGrailsProp.isEmbedded() ) { value = new Component( persistentClass ); bindComponent((Component)value, currentGrailsProp, true, mappings); } */ else { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Binding property [" + property.getName() + "] as SimpleValue"); value = new SimpleValue( table ); bindSimpleValue(property, (SimpleValue) value, path, mappings ); } if(value != null) { Property persistentProperty = createProperty( value, persistentClass, property, mappings ); component.addProperty( persistentProperty ); } } /** * Creates a persistant class property based on the GrailDomainClassProperty instance * * @param value * @param persistentClass * @param mappings */ private static Property createProperty(Value value, PersistentClass persistentClass, GrailsDomainClassProperty grailsProperty, Mappings mappings) { // set type value.setTypeUsingReflection( persistentClass.getClassName(), grailsProperty.getName() ); if(value.getTable() != null) value.createForeignKey(); Property prop = new Property(); ColumnConfig cc = getColumnConfig(grailsProperty); if(cc != null) { prop.setLazy(cc.getLazy()); } else if(grailsProperty.isManyToOne() || grailsProperty.isOneToOne()) { prop.setLazy(true); } prop.setValue( value ); bindProperty( grailsProperty, prop, mappings ); return prop; } /** * @param property * @param oneToOne * @param mappings */ /* private static void bindOneToOne(GrailsDomainClassProperty property, OneToOne oneToOne, Mappings mappings) { // bind value bindSimpleValue(property, oneToOne, mappings ); // set foreign key type oneToOne.setForeignKeyType( ForeignKeyDirection.FOREIGN_KEY_TO_PARENT ); oneToOne.setForeignKeyName( property.getFieldName() + FOREIGN_KEY_SUFFIX ); // TODO configure fetch settings oneToOne.setFetchMode( FetchMode.DEFAULT ); // TODO configure lazy loading oneToOne.setLazy(true); oneToOne.setPropertyName( property.getTagName() ); oneToOne.setReferencedEntityName( property.getType().getTagName() ); }*/ /** * @param currentGrailsProp * @param one * @param mappings */ private static void bindOneToMany(GrailsDomainClassProperty currentGrailsProp, OneToMany one, Mappings mappings) { one.setReferencedEntityName( currentGrailsProp.getReferencedPropertyType().getName() ); } /** * Binds a many-to-one relationship to the * @param property * @param manyToOne * @param path * @param mappings */ private static void bindManyToOne(GrailsDomainClassProperty property, ManyToOne manyToOne, String path, Mappings mappings) { bindManyToOneValues(property, manyToOne); // bind column bindSimpleValue(property,manyToOne, path, mappings); } private static void bindOneToOne(GrailsDomainClassProperty property, OneToOne oneToOne, String path, Mappings mappings) { ColumnConfig cc = getColumnConfig(property); oneToOne.setConstrained(!property.isOwningSide()); oneToOne.setForeignKeyType( !property.isOwningSide() ? ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT : ForeignKeyDirection.FOREIGN_KEY_TO_PARENT ); if(cc != null) { oneToOne.setLazy(cc.getLazy()); } else { oneToOne.setLazy(false); } bindSimpleValue(property,oneToOne, path, mappings); } /** * @param property * @param manyToOne */ private static void bindManyToOneValues(GrailsDomainClassProperty property, ManyToOne manyToOne) { manyToOne.setFetchMode(FetchMode.DEFAULT); ColumnConfig cc = getColumnConfig(property); if(cc != null) { manyToOne.setLazy(cc.getLazy()); } else { manyToOne.setLazy(false); } // set referenced entity manyToOne.setReferencedEntityName( property.getReferencedPropertyType().getName() ); if(manyToOne.isLazy()) { manyToOne.setIgnoreNotFound(false); } } /** * @param version * @param mappings */ private static void bindVersion(GrailsDomainClassProperty version, RootClass entity, Mappings mappings) { SimpleValue val = new SimpleValue( entity.getTable() ); bindSimpleValue( version, val, EMPTY_PATH, mappings); if ( !val.isTypeSpecified() ) { val.setTypeName( "version".equals( version.getName() ) ? "integer" : "timestamp" ); } Property prop = new Property(); prop.setValue( val ); bindProperty( version, prop, mappings ); val.setNullValue( "undefined" ); entity.setVersion( prop ); entity.addProperty( prop ); } /** * @param identifier * @param entity * @param mappings * @param mappedId */ private static void bindSimpleId(GrailsDomainClassProperty identifier, RootClass entity, Mappings mappings, Identity mappedId) { // create the id value SimpleValue id = new SimpleValue(entity.getTable()); // set identifier on entity Properties params = new Properties(); entity.setIdentifier( id ); if(mappedId != null) { id.setIdentifierGeneratorStrategy(mappedId.getGenerator()); params.putAll(mappedId.getParams()); } else { // configure generator strategy id.setIdentifierGeneratorStrategy( "native" ); } if ( mappings.getSchemaName() != null ) { params.setProperty( PersistentIdentifierGenerator.SCHEMA, mappings.getSchemaName() ); } if ( mappings.getCatalogName() != null ) { params.setProperty( PersistentIdentifierGenerator.CATALOG, mappings.getCatalogName() ); } id.setIdentifierGeneratorProperties(params); // bind value bindSimpleValue(identifier, id, EMPTY_PATH, mappings ); // create property Property prop = new Property(); prop.setValue(id); // bind property bindProperty( identifier, prop, mappings ); // set identifier property entity.setIdentifierProperty( prop ); id.getTable().setIdentifierValue( id ); } /** * Binds a property to Hibernate runtime meta model. Deals with cascade strategy based on the Grails domain model * * @param grailsProperty The grails property instance * @param prop The Hibernate property * @param mappings The Hibernate mappings */ private static void bindProperty(GrailsDomainClassProperty grailsProperty, Property prop, Mappings mappings) { // set the property name prop.setName( grailsProperty.getName() ); if(isBidirectionalManyToOneWithListMapping(grailsProperty, prop)) { prop.setInsertable(false); prop.setUpdateable(false); } else { prop.setInsertable(true); prop.setUpdateable(true); } prop.setPropertyAccessorName( mappings.getDefaultAccess() ); prop.setOptional( grailsProperty.isOptional() ); setCascadeBehaviour(grailsProperty, prop); // lazy to true prop.setLazy(true); } private static boolean isBidirectionalManyToOneWithListMapping(GrailsDomainClassProperty grailsProperty, Property prop) { return grailsProperty.isBidirectional() && prop.getValue() instanceof ManyToOne && List.class.isAssignableFrom(grailsProperty.getOtherSide().getType()); } private static void setCascadeBehaviour(GrailsDomainClassProperty grailsProperty, Property prop) { String cascadeStrategy = "none"; // set to cascade all for the moment GrailsDomainClass domainClass = grailsProperty.getDomainClass(); ColumnConfig cc = getColumnConfig(grailsProperty); GrailsDomainClass referenced = grailsProperty.getReferencedDomainClass(); if(cc!=null && cc.getCascade() != null) { cascadeStrategy = cc.getCascade(); } else if(grailsProperty.isAssociation()) { if(grailsProperty.isOneToOne()) { if(referenced!=null&&referenced.isOwningClass(domainClass.getClazz())) cascadeStrategy = CASCADE_ALL; } else if(grailsProperty.isOneToMany()) { if(referenced!=null&&referenced.isOwningClass(domainClass.getClazz())) cascadeStrategy = CASCADE_ALL; else cascadeStrategy = CASCADE_SAVE_UPDATE; } else if(grailsProperty.isManyToMany()) { if(referenced!=null&&referenced.isOwningClass(domainClass.getClazz())) cascadeStrategy = CASCADE_SAVE_UPDATE; } else if(grailsProperty.isManyToOne() ) { if(referenced!=null&&referenced.isOwningClass(domainClass.getClazz()) && !isCircularAssociation(grailsProperty)) cascadeStrategy = CASCADE_ALL; else cascadeStrategy = CASCADE_NONE; } } else if( Map.class.isAssignableFrom(grailsProperty.getType())) { referenced = grailsProperty.getReferencedDomainClass(); if(referenced!=null&&referenced.isOwningClass(grailsProperty.getDomainClass().getClazz())) { cascadeStrategy = CASCADE_ALL; } else { cascadeStrategy = CASCADE_SAVE_UPDATE; } } logCascadeMapping(grailsProperty, cascadeStrategy, referenced); prop.setCascade(cascadeStrategy); } private static boolean isCircularAssociation(GrailsDomainClassProperty grailsProperty) { return grailsProperty.getType().equals(grailsProperty.getDomainClass().getClazz()); } private static void logCascadeMapping(GrailsDomainClassProperty grailsProperty, String cascadeStrategy, GrailsDomainClass referenced) { if(LOG.isDebugEnabled() && grailsProperty.isAssociation()) { String assType = getAssociationDescription(grailsProperty); LOG.debug("Mapping cascade strategy for "+assType+" property "+grailsProperty.getDomainClass().getFullName()+"." + grailsProperty.getName() + " referencing type ["+referenced.getClazz()+"] -> [CASCADE: "+cascadeStrategy+"]"); } } private static String getAssociationDescription(GrailsDomainClassProperty grailsProperty) { String assType = "unknown"; if(grailsProperty.isManyToMany()) { assType = "many-to-many"; } else if(grailsProperty.isOneToMany()) { assType = "one-to-many"; } else if(grailsProperty.isOneToOne()) { assType = "one-to-one"; } else if(grailsProperty.isManyToOne()) { assType = "many-to-one"; } else if(grailsProperty.isEmbedded()) { assType = "embedded"; } return assType; } /** w * Binds a simple value to the Hibernate metamodel. A simple value is * any type within the Hibernate type system * * @param grailsProp The grails domain class property * @param simpleValue The simple value to bind * @param path * @param mappings The Hibernate mappings instance */ private static void bindSimpleValue(GrailsDomainClassProperty grailsProp, SimpleValue simpleValue, String path, Mappings mappings) { // set type ColumnConfig cc = getColumnConfig(grailsProp); setTypeForColumnConfig(grailsProp, simpleValue, cc); Table table = simpleValue.getTable(); Column column = new Column(); // Check for explicitly mapped column name. if (cc != null && cc.getColumn() != null) { column.setName(cc.getColumn()); } column.setValue(simpleValue); bindColumn(grailsProp, column, path, table); if(table != null) table.addColumn(column); simpleValue.addColumn(column); } private static void setTypeForColumnConfig(GrailsDomainClassProperty grailsProp, SimpleValue simpleValue, ColumnConfig cc) { if(cc != null && cc.getType() != null) { Object type = cc.getType(); if(type instanceof Class) { simpleValue.setTypeName(((Class)type).getName()); } else { simpleValue.setTypeName(type.toString()); } } else { simpleValue.setTypeName(grailsProp.getType().getName()); } } /** * Binds a value for the specified parameters to the meta model. * * @param type The type of the property * @param simpleValue The simple value instance * @param nullable Whether it is nullable * @param columnName The property name * @param mappings The mappings */ private static void bindSimpleValue(String type,SimpleValue simpleValue, boolean nullable, String columnName, Mappings mappings) { simpleValue.setTypeName(type); Table t = simpleValue.getTable(); Column column = new Column(); column.setNullable(nullable); column.setValue(simpleValue); column.setName(columnName); if(t!=null)t.addColumn(column); simpleValue.addColumn(column); } /** * Binds a Column instance to the Hibernate meta model * @param grailsProp The Grails domain class property * @param column The column to bind * @param path * @param table The table name */ private static void bindColumn(GrailsDomainClassProperty grailsProp, Column column, String path, Table table) { if(grailsProp.isAssociation()) { // Only use conventional naming when the column has not been explicitly mapped. if (column.getName() == null) { String columnName = getColumnNameForPropertyAndPath(grailsProp, path); if(!grailsProp.isBidirectional() && grailsProp.isOneToMany()) { String prefix = namingStrategy.classToTableName(grailsProp.getDomainClass().getName()); column.setName(prefix+ UNDERSCORE +columnName + FOREIGN_KEY_SUFFIX); } else { if(grailsProp.isInherited() && isBidirectionalManyToOne(grailsProp)) { column.setName( namingStrategy.propertyToColumnName(grailsProp.getDomainClass().getName()) + '_'+ columnName + FOREIGN_KEY_SUFFIX ); } else { column.setName( columnName + FOREIGN_KEY_SUFFIX ); } } } if(grailsProp.isManyToMany()) column.setNullable(false); else if(grailsProp.isOneToOne() && grailsProp.isBidirectional() && !grailsProp.isOwningSide()) { column.setNullable(true); } else { column.setNullable(grailsProp.isOptional()); } } else { String columnName = getColumnNameForPropertyAndPath(grailsProp, path); column.setName(columnName); column.setNullable(grailsProp.isOptional()); // Use the constraints for this property to more accurately define // the column's length, precision, and scale ConstrainedProperty constrainedProperty = getConstrainedProperty(grailsProp); if (constrainedProperty != null) { if (String.class.isAssignableFrom(grailsProp.getType()) || byte[].class.isAssignableFrom(grailsProp.getType())) { bindStringColumnConstraints(column, constrainedProperty); } if (Number.class.isAssignableFrom(grailsProp.getType())) { bindNumericColumnConstraints(column, constrainedProperty); } } } ConstrainedProperty cp = getConstrainedProperty(grailsProp); if(cp!=null&&cp.hasAppliedConstraint(UniqueConstraint.UNIQUE_CONSTRAINT)) { UniqueConstraint uc = (UniqueConstraint)cp.getAppliedConstraint(UniqueConstraint.UNIQUE_CONSTRAINT); if(uc != null && uc.isUnique() && !uc.isUniqueWithinGroup()) { column.setUnique(true); } } else { Object val = cp != null ? cp.getMetaConstraintValue(UniqueConstraint.UNIQUE_CONSTRAINT) : null; if(val instanceof Boolean) { column.setUnique(((Boolean)val).booleanValue()); } } bindIndex(grailsProp, column, table); if(!grailsProp.getDomainClass().isRoot()) { if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] Sub class property [" + grailsProp.getName() + "] for column name ["+column.getName()+"] in table ["+table.getName()+"] set to nullable"); column.setNullable(true); } if(LOG.isDebugEnabled()) LOG.debug("[GrailsDomainBinder] bound property [" + grailsProp.getName() + "] to column name ["+column.getName()+"] in table ["+table.getName()+"]"); } private static void bindIndex(GrailsDomainClassProperty grailsProp, Column column, Table table) { ColumnConfig cc = getColumnConfig(grailsProp); if(cc!=null) { String indexDefinition = cc.getIndex(); if(indexDefinition != null) { String[] tokens = indexDefinition.split(","); for (int i = 0; i < tokens.length; i++) { String index = tokens[i]; table.getOrCreateIndex(index).addColumn(column); } } } } private static String getColumnNameForPropertyAndPath(GrailsDomainClassProperty grailsProp, String path) { GrailsDomainClass domainClass = grailsProp.getDomainClass(); String columnName = null; - Mapping m = getMapping(domainClass.getFullName()); + Mapping m = getMapping(domainClass.getClazz()); if(m != null) { ColumnConfig c = m.getColumn(grailsProp.getName()); if(c != null && c.getColumn() != null) { columnName = c.getColumn(); } } if(columnName == null) { if(StringHelper.isNotEmpty(path)) { columnName = namingStrategy.propertyToColumnName(path) + UNDERSCORE + namingStrategy.propertyToColumnName(grailsProp.getName()); } else { columnName = namingStrategy.propertyToColumnName(grailsProp.getName()); } } return columnName; } /** * Returns the constraints applied to the specified domain class property. * * @param grailsProp the property whose constraints will be returned * @return the <code>ConstrainedProperty</code> object representing the property's constraints */ private static ConstrainedProperty getConstrainedProperty(GrailsDomainClassProperty grailsProp) { ConstrainedProperty constrainedProperty = null; Map constraints = grailsProp.getDomainClass().getConstrainedProperties(); for (Iterator constrainedPropertyIter = constraints.values().iterator(); constrainedPropertyIter.hasNext() && (constrainedProperty == null);) { ConstrainedProperty tmpConstrainedProperty = (ConstrainedProperty)constrainedPropertyIter.next(); if (tmpConstrainedProperty.getPropertyName().equals(grailsProp.getName())) { constrainedProperty = tmpConstrainedProperty; } } return constrainedProperty; } /** * Interrogates the specified constraints looking for any constraints that would limit the * length of the property's value. If such constraints exist, this method adjusts the length * of the column accordingly. * * @param column the column that corresponds to the property * @param constrainedProperty the property's constraints */ protected static void bindStringColumnConstraints(Column column, ConstrainedProperty constrainedProperty) { Integer columnLength = constrainedProperty.getMaxSize(); List inListValues = constrainedProperty.getInList(); if (columnLength != null) { column.setLength(columnLength.intValue()); } else if (inListValues != null) { column.setLength(getMaxSize(inListValues)); } } /** * Interrogates the specified constraints looking for any constraints that would limit the * precision and/or scale of the property's value. If such constraints exist, this method adjusts * the precision and/or scale of the column accordingly. * * @param column the column that corresponds to the property * @param constrainedProperty the property's constraints */ protected static void bindNumericColumnConstraints(Column column, ConstrainedProperty constrainedProperty) { int scale = Column.DEFAULT_SCALE; int precision = Column.DEFAULT_PRECISION; if (constrainedProperty.getScale() != null) { scale = constrainedProperty.getScale().intValue(); column.setScale(scale); } Comparable minConstraintValue = constrainedProperty.getMin(); Comparable maxConstraintValue = constrainedProperty.getMax(); int minConstraintValueLength = 0; if ((minConstraintValue != null) && (minConstraintValue instanceof Number)) { minConstraintValueLength = Math.max( countDigits((Number) minConstraintValue), countDigits(new Long(((Number) minConstraintValue).longValue())) + scale ); } int maxConstraintValueLength = 0; if ((maxConstraintValue != null) && (maxConstraintValue instanceof Number)) { maxConstraintValueLength = Math.max( countDigits((Number) maxConstraintValue), countDigits(new Long(((Number) maxConstraintValue).longValue())) + scale ); } if (minConstraintValueLength > 0 && maxConstraintValueLength > 0) { // If both of min and max constraints are setted we could use // maximum digits number in it as precision precision = NumberUtils.max(new int[] { minConstraintValueLength, maxConstraintValueLength }); } else { // Overwise we should also use default precision precision = NumberUtils.max(new int[] { precision, minConstraintValueLength, maxConstraintValueLength }); } column.setPrecision(precision); } /** * @return a count of the digits in the specified number */ private static int countDigits(Number number) { int numDigits = 0; if (number != null) { // Remove everything that's not a digit (e.g., decimal points or signs) String digitsOnly = number.toString().replaceAll("\\D", EMPTY_PATH); numDigits = digitsOnly.length(); } return numDigits; } /** * @return the maximum length of the strings in the specified list */ private static int getMaxSize(List inListValues) { int maxSize = 0; for (Iterator iter = inListValues.iterator(); iter.hasNext();) { String value = (String)iter.next(); maxSize = Math.max(value.length(), maxSize); } return maxSize; } }

diff --git a/src/org/jruby/RubyStringScanner.java b/src/org/jruby/RubyStringScanner.java index afb90fdee..781bf0266 100644 --- a/src/org/jruby/RubyStringScanner.java +++ b/src/org/jruby/RubyStringScanner.java @@ -1,277 +1,277 @@ package org.jruby; import org.jruby.runtime.CallbackFactory; import org.jruby.runtime.builtin.IRubyObject; import org.jruby.util.StringScanner; /** * @author kscott * */ public class RubyStringScanner extends RubyObject { private StringScanner scanner; public static RubyClass createScannerClass(final IRuby runtime) { RubyClass scannerClass = runtime.defineClass("StringScanner",runtime.getObject()); CallbackFactory callbackFactory = runtime.callbackFactory(RubyStringScanner.class); scannerClass.defineSingletonMethod("new", callbackFactory.getOptSingletonMethod("newInstance")); scannerClass.defineMethod("initialize", callbackFactory.getOptMethod("initialize")); scannerClass.defineMethod("<<", callbackFactory.getMethod("concat", IRubyObject.class)); scannerClass.defineMethod("concat", callbackFactory.getMethod("concat", IRubyObject.class)); scannerClass.defineMethod("[]", callbackFactory.getMethod("group", RubyFixnum.class)); scannerClass.defineMethod("beginning_of_line?", callbackFactory.getMethod("bol_p")); scannerClass.defineMethod("bol?", callbackFactory.getMethod("bol_p")); scannerClass.defineMethod("check", callbackFactory.getMethod("check", RubyRegexp.class)); scannerClass.defineMethod("check_until", callbackFactory.getMethod("check_until", RubyRegexp.class)); scannerClass.defineMethod("clear", callbackFactory.getMethod("terminate")); scannerClass.defineMethod("empty?", callbackFactory.getMethod("eos_p")); scannerClass.defineMethod("eos?", callbackFactory.getMethod("eos_p")); scannerClass.defineMethod("exist?", callbackFactory.getMethod("exist_p", RubyRegexp.class)); scannerClass.defineMethod("get_byte", callbackFactory.getMethod("getch")); scannerClass.defineMethod("getbyte", callbackFactory.getMethod("getch")); scannerClass.defineMethod("getch", callbackFactory.getMethod("getch")); scannerClass.defineMethod("inspect", callbackFactory.getMethod("inspect")); scannerClass.defineMethod("match?", callbackFactory.getMethod("match_p", RubyRegexp.class)); scannerClass.defineMethod("matched", callbackFactory.getMethod("matched")); scannerClass.defineMethod("matched?", callbackFactory.getMethod("matched_p")); scannerClass.defineMethod("matched_size", callbackFactory.getMethod("matched_size")); scannerClass.defineMethod("matchedsize", callbackFactory.getMethod("matched_size")); scannerClass.defineMethod("peek", callbackFactory.getMethod("peek", RubyFixnum.class)); scannerClass.defineMethod("peep", callbackFactory.getMethod("peek", RubyFixnum.class)); scannerClass.defineMethod("pointer", callbackFactory.getMethod("pos")); scannerClass.defineMethod("pointer=", callbackFactory.getMethod("set_pos", RubyFixnum.class)); scannerClass.defineMethod("pos=", callbackFactory.getMethod("set_pos", RubyFixnum.class)); scannerClass.defineMethod("pos", callbackFactory.getMethod("pos")); scannerClass.defineMethod("post_match", callbackFactory.getMethod("post_match")); scannerClass.defineMethod("pre_match", callbackFactory.getMethod("pre_match")); scannerClass.defineMethod("reset", callbackFactory.getMethod("reset")); scannerClass.defineMethod("rest", callbackFactory.getMethod("rest")); scannerClass.defineMethod("rest?", callbackFactory.getMethod("rest_p")); scannerClass.defineMethod("rest_size", callbackFactory.getMethod("rest_size")); scannerClass.defineMethod("restsize", callbackFactory.getMethod("rest_size")); scannerClass.defineMethod("scan", callbackFactory.getMethod("scan", RubyRegexp.class)); scannerClass.defineMethod("scan_full", callbackFactory.getMethod("scan_full", RubyRegexp.class, RubyBoolean.class, RubyBoolean.class)); scannerClass.defineMethod("scan_until", callbackFactory.getMethod("scan_until", RubyRegexp.class)); scannerClass.defineMethod("search_full", callbackFactory.getMethod("search_full", RubyRegexp.class, RubyBoolean.class, RubyBoolean.class)); scannerClass.defineMethod("skip", callbackFactory.getMethod("skip", RubyRegexp.class)); scannerClass.defineMethod("skip_until", callbackFactory.getMethod("skip_until", RubyRegexp.class)); scannerClass.defineMethod("string", callbackFactory.getMethod("string")); scannerClass.defineMethod("string=", callbackFactory.getMethod("set_string", RubyString.class)); scannerClass.defineMethod("terminate", callbackFactory.getMethod("terminate")); scannerClass.defineMethod("unscan", callbackFactory.getMethod("unscan")); return scannerClass; } public static IRubyObject newInstance(IRubyObject recv, IRubyObject[] args) { - RubyStringScanner result = new RubyStringScanner(recv.getRuntime()); + RubyStringScanner result = new RubyStringScanner(recv.getRuntime(),(RubyClass)recv); result.callInit(args); return result; } - protected RubyStringScanner(IRuby runtime) { - super(runtime, runtime.getClass("StringScanner")); + protected RubyStringScanner(IRuby runtime, RubyClass type) { + super(runtime, type); } public IRubyObject initialize(IRubyObject[] args) { if (checkArgumentCount(args, 0, 2) > 0) { scanner = new StringScanner(args[0].convertToString().getValue()); } else { scanner = new StringScanner(); } return this; } public IRubyObject concat(IRubyObject obj) { scanner.append(obj.convertToString().getValue()); return this; } private RubyBoolean trueOrFalse(boolean p) { if (p) { return getRuntime().getTrue(); } else { return getRuntime().getFalse(); } } private IRubyObject positiveFixnumOrNil(int val) { if (val > -1) { return RubyFixnum.newFixnum(getRuntime(), (long)val); } else { return getRuntime().getNil(); } } private IRubyObject stringOrNil(CharSequence cs) { if (cs == null) { return getRuntime().getNil(); } else { return RubyString.newString(getRuntime(), cs); } } public IRubyObject group(RubyFixnum num) { return stringOrNil(scanner.group(RubyFixnum.fix2int(num))); } public RubyBoolean bol_p() { return trueOrFalse(scanner.isBeginningOfLine()); } public IRubyObject check(RubyRegexp rx) { return stringOrNil(scanner.check(rx.getPattern())); } public IRubyObject check_until(RubyRegexp rx) { return stringOrNil(scanner.checkUntil(rx.getPattern())); } public IRubyObject terminate() { scanner.terminate(); return this; } public RubyBoolean eos_p() { return trueOrFalse(scanner.isEndOfString()); } public IRubyObject exist_p(RubyRegexp rx) { return positiveFixnumOrNil(scanner.exists(rx.getPattern())); } public IRubyObject getch() { char c = scanner.getChar(); if (c == 0) { return getRuntime().getNil(); } else { return RubyString.newString(getRuntime(), new Character(c).toString()); } } public IRubyObject inspect() { return super.inspect(); } public IRubyObject match_p(RubyRegexp rx) { return positiveFixnumOrNil(scanner.matches(rx.getPattern())); } public IRubyObject matched() { return stringOrNil(scanner.matchedValue()); } public RubyBoolean matched_p() { return trueOrFalse(scanner.matched()); } public IRubyObject matched_size() { return positiveFixnumOrNil(scanner.matchedSize()); } public IRubyObject peek(RubyFixnum length) { return RubyString.newString(getRuntime(), scanner.peek(RubyFixnum.fix2int(length))); } public RubyFixnum pos() { return RubyFixnum.newFixnum(getRuntime(), (long)scanner.getPos()); } public RubyFixnum set_pos(RubyFixnum pos) { try { scanner.setPos(RubyFixnum.fix2int(pos)); } catch (IllegalArgumentException e) { throw getRuntime().newRangeError("index out of range"); } return pos; } public IRubyObject post_match() { return stringOrNil(scanner.postMatch()); } public IRubyObject pre_match() { return stringOrNil(scanner.preMatch()); } public IRubyObject reset() { scanner.reset(); return this; } public RubyString rest() { return RubyString.newString(getRuntime(), scanner.rest()); } public RubyBoolean rest_p() { return trueOrFalse(!scanner.isEndOfString()); } public RubyFixnum rest_size() { return RubyFixnum.newFixnum(getRuntime(), (long)scanner.rest().length()); } public IRubyObject scan(RubyRegexp rx) { return stringOrNil(scanner.scan(rx.getPattern())); } public IRubyObject scan_full(RubyRegexp rx, RubyBoolean adv_ptr, RubyBoolean ret_str) { if (adv_ptr.isTrue()) { if (ret_str.isTrue()) { return stringOrNil(scanner.scan(rx.getPattern())); } else { return positiveFixnumOrNil(scanner.skip(rx.getPattern())); } } else { if (ret_str.isTrue()) { return stringOrNil(scanner.check(rx.getPattern())); } else { return positiveFixnumOrNil(scanner.matches(rx.getPattern())); } } } public IRubyObject scan_until(RubyRegexp rx) { return stringOrNil(scanner.scanUntil(rx.getPattern())); } public IRubyObject search_full(RubyRegexp rx, RubyBoolean adv_ptr, RubyBoolean ret_str) { if (adv_ptr.isTrue()) { if (ret_str.isTrue()) { return stringOrNil(scanner.scanUntil(rx.getPattern())); } else { return positiveFixnumOrNil(scanner.skipUntil(rx.getPattern())); } } else { if (ret_str.isTrue()) { return stringOrNil(scanner.checkUntil(rx.getPattern())); } else { return positiveFixnumOrNil(scanner.exists(rx.getPattern())); } } } public IRubyObject skip(RubyRegexp rx) { return positiveFixnumOrNil(scanner.skip(rx.getPattern())); } public IRubyObject skip_until(RubyRegexp rx) { return positiveFixnumOrNil(scanner.skipUntil(rx.getPattern())); } public RubyString string() { return RubyString.newString(getRuntime(), scanner.getString()); } public RubyString set_string(RubyString str) { scanner.setString(str.getValue()); return str; } public IRubyObject unscan() { scanner.unscan(); return this; } -} \ No newline at end of file +}

diff --git a/KernelGesturesBuilder/src/ar/com/nivel7/kernelgesturesbuilder/Actions.java b/KernelGesturesBuilder/src/ar/com/nivel7/kernelgesturesbuilder/Actions.java index 0edd78c..602f629 100644 --- a/KernelGesturesBuilder/src/ar/com/nivel7/kernelgesturesbuilder/Actions.java +++ b/KernelGesturesBuilder/src/ar/com/nivel7/kernelgesturesbuilder/Actions.java @@ -1,168 +1,168 @@ package ar.com.nivel7.kernelgesturesbuilder; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; import com.google.analytics.tracking.android.EasyTracker; public class Actions extends Activity { public static final String[] titles = new String[] { "Toggle inverted screen colors", "action_2", "Start Stweaks", "Start a call to the intended phone", "Start the camera app", "Toggle bluetooth on/off", "Toggle WiFi on/off", "Media Play/Pause", "Volume Mute/Unmute", "Home", "Toggle between the last 2 activities"}; public static final String[] actions = new String[] { "mdnie_status=`cat /sys/class/mdnie/mdnie/negative`\n if [ \"$mdnie_status\" -eq \"0\" ]; then\n echo 1 > /sys/class/mdnie/mdnie/negative\n else\n echo 0 > /sys/class/mdnie/mdnie/negative\n fi;\n", "key=26; service call window 12 i32 1 i32 1 i32 5 i32 0 i32 0 i32 $key i32 0 i32 0 i32 0 i32 8 i32 0 i32 0 i32 0 i32 0; service call window 12 i32 1 i32 1 i32 5 i32 0 i32 1 i32 $key i32 0 i32 0 i32 27 i32 8 i32 0 i32 0 i32 0 i32 0\n", "am start -a android.intent.action.MAIN -n com.gokhanmoral.stweaks.app/.MainActivity;", "service call phone 2 s16 \"your beloved number\"", "am start --activity-exclude-from-recents com.sec.android.app.camera\nam start --activity-exclude-from-recents com.android.camera/.Camera\n", "service call bluetooth 1 | grep \"0 00000000\" \n if [ \"$?\" -eq \"0\" ]; then\n service call bluetooth 3 \n else\n [ \"$1\" -eq \"1\" ] &amp;&amp; service call bluetooth 5 \n [ \"$1\" -ne \"1\" ] &amp;&amp; service call bluetooth 4 \n fi;\n", "service call wifi 14 | grep \"0 00000001\" > /dev/null\n if [ \"$?\" -eq \"0\" ]; then\n service call wifi 13 i32 1 > /dev/null\n else\n service call wifi 13 i32 0 > /dev/null\n fi;\n", "input keyevent 85\n", "input keyevent 164\n", "input keyevent 3\n", "service call vibrator 2 i32 100 i32 0\n dumpsys activity a | grep \"Recent #1:.* com.anddoes.launcher\"\n if [ \"$?\" -eq \"0\" ]; then\n service call activity 24 i32 `dumpsys activity a | grep \"Recent #2:\" | grep -o -E \"#[0-9]+ \" | cut -c2-` i32 2\n else\n service call activity 24 i32 `dumpsys activity a | grep \"Recent #1:\" | grep -o -E \"#[0-9]+ \" | cut -c2-` i32 2\n fi\n" }; public static final Integer[] images = { - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher, - R.drawable.ic_launcher + R.drawable.ic_mdnie, + R.drawable.ic_question, + R.drawable.ic_stweaks, + R.drawable.ic_lovecall, + R.drawable.ic_camera, + R.drawable.ic_bluetooth, + R.drawable.ic_wifi, + R.drawable.ic_playpause, + R.drawable.ic_mute, + R.drawable.ic_home, + R.drawable.ic_alttab }; List<ActionsRowItem> rowItems; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.actions); rowItems = new ArrayList<ActionsRowItem>(); for (int i = 0; i < titles.length; i++) { ActionsRowItem item = new ActionsRowItem(images[i], titles[i], actions[i]); rowItems.add(item); } ListView actions_list = (ListView) findViewById(R.id.actions_list); final ActionsAdapter adapter = new ActionsAdapter(this, R.layout.actionsrow , rowItems); actions_list.setAdapter(adapter); actions_list.setOnItemClickListener(new OnItemClickListener() { public void onItemClick(AdapterView<?> arg0, View v, int position, long id) { ActionsRowItem rowitem=adapter.getItem(position); String action=rowitem.getDesc(); int gesturenumber = KernelGesturesBuilder.getGesturenumber(); FileOutputStream fos; String FILENAME = "gesture-"+gesturenumber+".sh"; try { fos = openFileOutput(FILENAME, Context.MODE_PRIVATE); fos.write(action.getBytes()); fos.close(); } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } Actions.this.finish(); } }); } @Override public void onStart() { super.onStart(); EasyTracker.getInstance().activityStart(this); } @Override public void onStop() { super.onStop(); EasyTracker.getInstance().activityStop(this); } } class ActionsAdapter extends ArrayAdapter<ActionsRowItem> { Context context; public ActionsAdapter(Context context, int resourceId, List<ActionsRowItem> items) { super(context, resourceId, items); this.context = context; } private class ViewHolder { ImageView imageView; TextView txtTitle; TextView txtDesc; } public View getView(int position, View convertView, ViewGroup parent) { ViewHolder holder = null; ActionsRowItem rowItem = getItem(position); LayoutInflater mInflater = (LayoutInflater) context .getSystemService(Activity.LAYOUT_INFLATER_SERVICE); if (convertView == null) { convertView = mInflater.inflate(R.layout.actionsrow , null); holder = new ViewHolder(); holder.txtTitle = (TextView) convertView.findViewById(R.id.actiontitle); holder.imageView = (ImageView) convertView.findViewById(R.id.actionicon); holder.txtDesc = (TextView) convertView.findViewById(R.id.actiondesc); convertView.setTag(holder); } else holder = (ViewHolder) convertView.getTag(); holder.txtDesc.setText(rowItem.getDesc()); holder.txtTitle.setText(rowItem.getTitle()); holder.imageView.setImageResource(rowItem.getImageId()); return convertView; } }

diff --git a/products/federation/library/source/com/sun/identity/wsfederation/servlet/RPSigninRequest.java b/products/federation/library/source/com/sun/identity/wsfederation/servlet/RPSigninRequest.java index 7ea9ccd8e..5c90d7813 100644 --- a/products/federation/library/source/com/sun/identity/wsfederation/servlet/RPSigninRequest.java +++ b/products/federation/library/source/com/sun/identity/wsfederation/servlet/RPSigninRequest.java @@ -1,299 +1,309 @@ /** * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2007 Sun Microsystems Inc. All Rights Reserved * * The contents of this file are subject to the terms * of the Common Development and Distribution License * (the License). You may not use this file except in * compliance with the License. * * You can obtain a copy of the License at * https://opensso.dev.java.net/public/CDDLv1.0.html or * opensso/legal/CDDLv1.0.txt * See the License for the specific language governing * permission and limitations under the License. * * When distributing Covered Code, include this CDDL * Header Notice in each file and include the License file * at opensso/legal/CDDLv1.0.txt. * If applicable, add the following below the CDDL Header, * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * - * $Id: RPSigninRequest.java,v 1.6 2008-06-25 05:48:09 qcheng Exp $ + * $Id: RPSigninRequest.java,v 1.7 2008-08-28 14:47:45 superpat7 Exp $ * */ package com.sun.identity.wsfederation.servlet; import com.sun.identity.saml2.meta.SAML2MetaUtils; import com.sun.identity.shared.DateUtils; import com.sun.identity.shared.debug.Debug; import com.sun.identity.shared.encode.URLEncDec; import com.sun.identity.wsfederation.common.WSFederationConstants; import com.sun.identity.wsfederation.common.WSFederationException; import java.io.IOException; import java.util.Date; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.sun.identity.wsfederation.common.WSFederationUtils; import com.sun.identity.wsfederation.jaxb.entityconfig.SPSSOConfigElement; import com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement; import com.sun.identity.wsfederation.meta.WSFederationMetaManager; import com.sun.identity.wsfederation.meta.WSFederationMetaUtils; +import java.util.ArrayList; import java.util.List; import java.util.Map; /** * This class implements the sign-in request for the service provider. */ public class RPSigninRequest extends WSFederationAction { private static Debug debug = WSFederationUtils.debug; String whr; String wreply; String wctx; String wct; /** * Creates a new instance of RPSigninRequest * @param request HTTPServletRequest for this interaction * @param response HTTPServletResponse for this interaction * @param whr the whr parameter from the signin request * @param wct the wct parameter from the signin request * @param wctx the wctx parameter from the signin request * @param wreply the wreply parameter from the signin request */ public RPSigninRequest(HttpServletRequest request, HttpServletResponse response, String whr, String wct, String wctx, String wreply) { super(request,response); this.whr = whr; this.wct = wct; this.wctx = wctx; this.wreply = wreply; } /** * Processes the sign-in request, redirecting the browser to the identity * provider via the HttpServletResponse passed to the constructor. */ public void process() throws WSFederationException, IOException { String classMethod = "RPSigninRequest.process: "; if (debug.messageEnabled()) { debug.message(classMethod+"entered method"); } if (wctx == null || wctx.length() == 0){ // Exchange reply URL for opaque identifier wctx = (wreply != null && (wreply.length() > 0)) ? WSFederationUtils.putReplyURL(wreply) : null; } String spMetaAlias = WSFederationMetaUtils.getMetaAliasByUri( request.getRequestURI()); if ( spMetaAlias==null || spMetaAlias.length()==0 ) { throw new WSFederationException( WSFederationUtils.bundle.getString("MetaAliasNotFound")); } String spRealm = SAML2MetaUtils.getRealmByMetaAlias(spMetaAlias); String spEntityId = WSFederationMetaManager.getEntityByMetaAlias(spMetaAlias); if ( spEntityId==null || spEntityId.length()==0 ) { String[] args = {spMetaAlias, spRealm}; throw new WSFederationException(WSFederationConstants.BUNDLE_NAME, "invalidMetaAlias", args); } SPSSOConfigElement spConfig = WSFederationMetaManager.getSPSSOConfig(spRealm,spEntityId); if ( spConfig==null ) { String[] args = {spEntityId, spRealm}; throw new WSFederationException(WSFederationConstants.BUNDLE_NAME, "badSPEntityID",args); } Map<String,List<String>> spConfigAttributes = WSFederationMetaUtils.getAttributes(spConfig); String accountRealmSelection = spConfigAttributes.get( com.sun.identity.wsfederation.common.WSFederationConstants. ACCOUNT_REALM_SELECTION).get(0); if ( accountRealmSelection == null ) { accountRealmSelection = WSFederationConstants.ACCOUNT_REALM_SELECTION_DEFAULT; } String accountRealmCookieName = spConfigAttributes.get(WSFederationConstants. ACCOUNT_REALM_COOKIE_NAME).get(0); if ( accountRealmCookieName == null ) { accountRealmCookieName = WSFederationConstants.ACCOUNT_REALM_COOKIE_NAME_DEFAULT; } String homeRealmDiscoveryService = spConfigAttributes.get( WSFederationConstants.HOME_REALM_DISCOVERY_SERVICE).get(0); if (debug.messageEnabled()) { debug.message(classMethod+"account realm selection method is " + accountRealmSelection); } String idpIssuerName = null; if (whr != null && whr.length() > 0) { // whr parameter overrides other mechanisms... idpIssuerName = whr; if (accountRealmSelection.equals(WSFederationConstants.COOKIE)) { // ...and overwrites cookie Cookie cookie = new Cookie(accountRealmCookieName,whr); // Set cookie to persist for a year cookie.setMaxAge(60*60*24*365); response.addCookie(cookie); } } else { if (accountRealmSelection.equals( WSFederationConstants.USERAGENT)) { String uaHeader = request.getHeader(WSFederationConstants.USERAGENT); if (debug.messageEnabled()) { debug.message(classMethod+"user-agent is :" + uaHeader); } idpIssuerName = WSFederationUtils.accountRealmFromUserAgent(uaHeader, accountRealmCookieName); } else if (accountRealmSelection.equals( WSFederationConstants.COOKIE)) { Cookie[] cookies = request.getCookies(); if (cookies != null) { for (int i = 0; i < cookies.length; i++) { if (cookies[i].getName().equals( accountRealmCookieName)) { idpIssuerName = cookies[i].getValue(); break; } } } } else { debug.error(classMethod+"unexpected value for " + WSFederationConstants.ACCOUNT_REALM_SELECTION + " : " + accountRealmSelection); throw new WSFederationException( WSFederationUtils.bundle.getString("badAccountRealm")); } } FederationElement sp = WSFederationMetaManager.getEntityDescriptor(spRealm,spEntityId); String spIssuerName = WSFederationMetaManager.getTokenIssuerName(sp); if (debug.messageEnabled()) { debug.message(classMethod+"SP issuer name:" + spIssuerName); } String idpEntityId = null; if (idpIssuerName != null && idpIssuerName.length() > 0) { // Got the issuer name from the cookie/UA string - let's see if // we know the entity ID idpEntityId = WSFederationMetaManager.getEntityByTokenIssuerName(null, idpIssuerName); } if (idpEntityId == null) { - // See if there is only one IdP configured... - List<String> idpList = + // See if there is only one trusted IdP configured... + List<String> allRemoteIdPs = WSFederationMetaManager. getAllRemoteIdentityProviderEntities(spRealm); + ArrayList<String> trustedRemoteIdPs = new ArrayList<String>(); + + for ( String idp : allRemoteIdPs ) + { + if ( WSFederationMetaManager.isTrustedProvider(spRealm, + spEntityId, idp) ) { + trustedRemoteIdPs.add(idp); + } + } - if ( idpList.size() == 0 ) + if ( trustedRemoteIdPs.size() == 0 ) { // Misconfiguration! throw new WSFederationException( WSFederationUtils.bundle.getString("noIDPConfigured")); } - else if ( idpList.size() == 1 ) + else if ( trustedRemoteIdPs.size() == 1 ) { - idpEntityId = idpList.get(0); + idpEntityId = trustedRemoteIdPs.get(0); } } FederationElement idp = null; if ( idpEntityId != null ) { idp = WSFederationMetaManager.getEntityDescriptor(null, idpEntityId); } // Set LB cookie here so it's done regardless of which redirect happens // We want response to come back to this instance WSFederationUtils.sessionProvider.setLoadBalancerCookie(response); // If we still don't know the IdP, redirect to home realm discovery if (idp == null) { StringBuffer url = new StringBuffer(homeRealmDiscoveryService); url.append("?wreply="); url.append(URLEncDec.encode(request.getRequestURL().toString())); if (wctx != null) { url.append("&wctx="); url.append(URLEncDec.encode(wctx)); } if (debug.messageEnabled()) { debug.message(classMethod + "no account realm - redirecting to :" + url); } response.sendRedirect(url.toString()); return; } if (debug.messageEnabled()) { debug.message(classMethod+"account realm:" + idpEntityId); } String endpoint = WSFederationMetaManager.getTokenIssuerEndpoint(idp); if (debug.messageEnabled()) { debug.message(classMethod+"endpoint:" + endpoint); } String replyURL = WSFederationMetaManager.getTokenIssuerEndpoint(sp); if (debug.messageEnabled()) { debug.message(classMethod+"replyURL:" + replyURL); } StringBuffer url = new StringBuffer(endpoint); url.append("?wa="); url.append(URLEncDec.encode(WSFederationConstants.WSIGNIN10)); if ( wctx != null ) { url.append("&wctx="); url.append(URLEncDec.encode(wctx)); } url.append("&wreply="); url.append(URLEncDec.encode(replyURL)); url.append("&wct="); url.append(URLEncDec.encode(DateUtils.toUTCDateFormat(new Date()))); url.append("&wtrealm="); url.append(URLEncDec.encode(spIssuerName)); if (debug.messageEnabled()) { debug.message(classMethod+"Redirecting to:" + url); } response.sendRedirect(url.toString()); } }

diff --git a/src/driver/GUIDriver.java b/src/driver/GUIDriver.java index 67f4da5..e975559 100644 --- a/src/driver/GUIDriver.java +++ b/src/driver/GUIDriver.java @@ -1,309 +1,309 @@ package driver; import java.awt.Canvas; import java.awt.Color; import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; import java.awt.Point; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.image.BufferStrategy; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashMap; import javax.swing.JFrame; import world.Character; import world.Enemy; import world.Grid; import world.GridSpace; import world.LivingThing; import world.Terrain; import world.Thing; import world.World; public class GUIDriver { private static Grid g; private static long gravityRate; private static int lastKey; private static long hangTime; private static long value; private static boolean spaceDown = false; private static int stage = 1; public static void main(String[] args) { // Create game window... JFrame app = new JFrame(); app.setIgnoreRepaint(true); app.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // Create canvas for painting... Canvas canvas = new Canvas(); canvas.setIgnoreRepaint(true); canvas.setSize(1200, 480); // Add canvas to game window... app.add(canvas); app.pack(); app.setVisible(true); // Create BackBuffer... canvas.createBufferStrategy(2); BufferStrategy buffer = canvas.getBufferStrategy(); // Get graphics configuration... GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice gd = ge.getDefaultScreenDevice(); GraphicsConfiguration gc = gd.getDefaultConfiguration(); // Create off-screen drawing surface BufferedImage bi = gc.createCompatibleImage(1200, 480); // Objects needed for rendering... Graphics graphics = null; Graphics2D g2d = null; Color background = Color.BLACK; // Variables for counting frames per seconds int fps = 0; int frames = 0; long totalTime = 0; long gravityTime = 0; long enemyDamageTime = 0; hangTime = 500; gravityRate = 300; value = gravityRate + hangTime; long curTime = System.currentTimeMillis(); long lastTime = curTime; g = new Grid(0); g.makeDefaultGrid(); stage = 1; app.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) { g.retractWeapon(lastKey); if (g.getGrid() .get(new Point((int) g.getCharacterLocation().getX(), (int) g.getCharacterLocation().getY() + 1)).hasSolid()) { g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); value = gravityRate + hangTime; } } else if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) { g.moveCharacter(-1, 0, lastKey); lastKey = KeyEvent.VK_A; } else if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) { g.moveCharacter(0, 1, lastKey); } else if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) { g.moveCharacter(1, 0, lastKey); lastKey = KeyEvent.VK_D; } else if (keyCode == KeyEvent.VK_SPACE) { if (!spaceDown) { spaceDown = true; g.useWeapon(lastKey); } } else if (keyCode == KeyEvent.VK_P) { String name = "Yo Mama"; Color c = Color.ORANGE; Point p = g.findValidEnemyLocation(); if (p != null) { g.spawnNewEnemy(p, new Enemy(true, c, name, 10, 10, 10)); } else { System.out.println("Could not spawn a new enemy."); } } } public void keyReleased(KeyEvent e) { int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_SPACE) { g.retractWeapon(lastKey); spaceDown = false; } } }); while (true) { try { lastTime = curTime; curTime = System.currentTimeMillis(); totalTime += curTime - lastTime; gravityTime += curTime - lastTime; enemyDamageTime += curTime - lastTime; if (gravityTime > value) { value += gravityRate; g.moveCharacter(0, 1, lastKey); g.moveRangedWeapon(); // check every instance of p for (int i = 0; i < g.getEnemyLocation().size(); i++) { Point p = g.getEnemyLocation().get(i); Point q = new Point((int) p.getX(), (int) p.getY() + 1); GridSpace gs = g.getGrid().get(q); if (p.getX() - g.getCharacterLocation().getX() > 0) { g.moveEnemy(-1, 0); } else { g.moveEnemy(1, 0); } - if (true) { + if (p.equals(g.getEnemyLocation().get(i))) { if (gs.returnThings().size() > 0) { if (gs.hasSolid()) { if (gs.returnWeapons().size() == 0) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } else { for (LivingThing e : gs.returnLivingThings()) { if (e.getSolid()) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } } for (Terrain t : gs.returnTerrain()) { if (t.getSolid()) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } } } } } } g.moveEnemy(0, 1); } if (gravityTime > 4 * gravityRate + hangTime) { gravityTime = 0; value = gravityRate + hangTime; } } if (enemyDamageTime > 500) { } if (totalTime > 1000) { totalTime -= 1000; fps = frames; frames = 0; } ++frames; // clear back buffer... if (g.getCharacterLocation().getX() >= 100) { HashMap<Point, GridSpace> grid = g.getGrid(); Point oldLocation = g.getCharacterLocation(); Character c = grid.get(oldLocation).returnCharacter(); World w = new World(); int killed = g.getNumKilled(); g = w.drawWorld(1, killed); stage++; grid = g.getGrid(); g.setNumKilled(killed); ArrayList<Thing> t = new ArrayList<Thing>(); t.add(c); GridSpace gs = new GridSpace(t); gs.sortArrayOfThings(); grid.put(new Point(0, (int) oldLocation.getY()), gs); g.setCharacterLocation(new Point(0, (int) oldLocation.getY())); } g2d = bi.createGraphics(); g2d.setColor(background); g2d.fillRect(0, 0, 639, 479); HashMap<Point, GridSpace> grid = g.getGrid(); for (int i = 0; i < 100; i++) { for (int j = 0; j < 25; j++) { g2d.setColor(grid.get(new Point(i, j)).getColor()); g2d.fillRect(i * 10, j * 10, 10, 10); } } // display frames per second... g2d.setFont(new Font("Courier New", Font.PLAIN, 12)); g2d.setColor(Color.GREEN); g2d.drawString(String.format("FPS: %s", fps), 20, 20); g2d.drawString(String.format("Stage: %s", stage), 100, 20); g2d.drawString(String.format("Enemies killed: %s", g.getNumKilled()), 180, 20); try { switch (g.getGrid().get(g.getCharacterLocation()).returnCharacter().getHp()) { case 20: g2d.drawString("Health: * * * *", 320, 20); break; case 15: g2d.drawString("Health: * * * _", 320, 20); break; case 10: g2d.drawString("Health: * * _ _", 320, 20); break; case 5: g2d.drawString("Health: * _ _ _", 320, 20); break; default: g2d.drawString("Health: _ _ _ _", 320, 20); break; } } catch (NullPointerException e) { System.out.println("Caught that error"); } // Blit image and flip... graphics = buffer.getDrawGraphics(); graphics.drawImage(bi, 0, 0, null); if (!buffer.contentsLost()) { buffer.show(); } // Let the OS have a little time... Thread.yield(); } finally { // release resources if (graphics != null) graphics.dispose(); if (g2d != null) g2d.dispose(); } } } }

public static void main(String[] args) { // Create game window... JFrame app = new JFrame(); app.setIgnoreRepaint(true); app.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // Create canvas for painting... Canvas canvas = new Canvas(); canvas.setIgnoreRepaint(true); canvas.setSize(1200, 480); // Add canvas to game window... app.add(canvas); app.pack(); app.setVisible(true); // Create BackBuffer... canvas.createBufferStrategy(2); BufferStrategy buffer = canvas.getBufferStrategy(); // Get graphics configuration... GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice gd = ge.getDefaultScreenDevice(); GraphicsConfiguration gc = gd.getDefaultConfiguration(); // Create off-screen drawing surface BufferedImage bi = gc.createCompatibleImage(1200, 480); // Objects needed for rendering... Graphics graphics = null; Graphics2D g2d = null; Color background = Color.BLACK; // Variables for counting frames per seconds int fps = 0; int frames = 0; long totalTime = 0; long gravityTime = 0; long enemyDamageTime = 0; hangTime = 500; gravityRate = 300; value = gravityRate + hangTime; long curTime = System.currentTimeMillis(); long lastTime = curTime; g = new Grid(0); g.makeDefaultGrid(); stage = 1; app.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) { g.retractWeapon(lastKey); if (g.getGrid() .get(new Point((int) g.getCharacterLocation().getX(), (int) g.getCharacterLocation().getY() + 1)).hasSolid()) { g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); value = gravityRate + hangTime; } } else if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) { g.moveCharacter(-1, 0, lastKey); lastKey = KeyEvent.VK_A; } else if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) { g.moveCharacter(0, 1, lastKey); } else if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) { g.moveCharacter(1, 0, lastKey); lastKey = KeyEvent.VK_D; } else if (keyCode == KeyEvent.VK_SPACE) { if (!spaceDown) { spaceDown = true; g.useWeapon(lastKey); } } else if (keyCode == KeyEvent.VK_P) { String name = "Yo Mama"; Color c = Color.ORANGE; Point p = g.findValidEnemyLocation(); if (p != null) { g.spawnNewEnemy(p, new Enemy(true, c, name, 10, 10, 10)); } else { System.out.println("Could not spawn a new enemy."); } } } public void keyReleased(KeyEvent e) { int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_SPACE) { g.retractWeapon(lastKey); spaceDown = false; } } }); while (true) { try { lastTime = curTime; curTime = System.currentTimeMillis(); totalTime += curTime - lastTime; gravityTime += curTime - lastTime; enemyDamageTime += curTime - lastTime; if (gravityTime > value) { value += gravityRate; g.moveCharacter(0, 1, lastKey); g.moveRangedWeapon(); // check every instance of p for (int i = 0; i < g.getEnemyLocation().size(); i++) { Point p = g.getEnemyLocation().get(i); Point q = new Point((int) p.getX(), (int) p.getY() + 1); GridSpace gs = g.getGrid().get(q); if (p.getX() - g.getCharacterLocation().getX() > 0) { g.moveEnemy(-1, 0); } else { g.moveEnemy(1, 0); } if (true) { if (gs.returnThings().size() > 0) { if (gs.hasSolid()) { if (gs.returnWeapons().size() == 0) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } else { for (LivingThing e : gs.returnLivingThings()) { if (e.getSolid()) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } } for (Terrain t : gs.returnTerrain()) { if (t.getSolid()) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } } } } } } g.moveEnemy(0, 1); } if (gravityTime > 4 * gravityRate + hangTime) { gravityTime = 0; value = gravityRate + hangTime; } } if (enemyDamageTime > 500) { } if (totalTime > 1000) { totalTime -= 1000; fps = frames; frames = 0; } ++frames; // clear back buffer... if (g.getCharacterLocation().getX() >= 100) { HashMap<Point, GridSpace> grid = g.getGrid(); Point oldLocation = g.getCharacterLocation(); Character c = grid.get(oldLocation).returnCharacter(); World w = new World(); int killed = g.getNumKilled(); g = w.drawWorld(1, killed); stage++; grid = g.getGrid(); g.setNumKilled(killed); ArrayList<Thing> t = new ArrayList<Thing>(); t.add(c); GridSpace gs = new GridSpace(t); gs.sortArrayOfThings(); grid.put(new Point(0, (int) oldLocation.getY()), gs); g.setCharacterLocation(new Point(0, (int) oldLocation.getY())); } g2d = bi.createGraphics(); g2d.setColor(background); g2d.fillRect(0, 0, 639, 479); HashMap<Point, GridSpace> grid = g.getGrid(); for (int i = 0; i < 100; i++) { for (int j = 0; j < 25; j++) { g2d.setColor(grid.get(new Point(i, j)).getColor()); g2d.fillRect(i * 10, j * 10, 10, 10); } } // display frames per second... g2d.setFont(new Font("Courier New", Font.PLAIN, 12)); g2d.setColor(Color.GREEN); g2d.drawString(String.format("FPS: %s", fps), 20, 20); g2d.drawString(String.format("Stage: %s", stage), 100, 20); g2d.drawString(String.format("Enemies killed: %s", g.getNumKilled()), 180, 20); try { switch (g.getGrid().get(g.getCharacterLocation()).returnCharacter().getHp()) { case 20: g2d.drawString("Health: * * * *", 320, 20); break; case 15: g2d.drawString("Health: * * * _", 320, 20); break; case 10: g2d.drawString("Health: * * _ _", 320, 20); break; case 5: g2d.drawString("Health: * _ _ _", 320, 20); break; default: g2d.drawString("Health: _ _ _ _", 320, 20); break; } } catch (NullPointerException e) { System.out.println("Caught that error"); } // Blit image and flip... graphics = buffer.getDrawGraphics(); graphics.drawImage(bi, 0, 0, null); if (!buffer.contentsLost()) { buffer.show(); } // Let the OS have a little time... Thread.yield(); } finally { // release resources if (graphics != null) graphics.dispose(); if (g2d != null) g2d.dispose(); } } }

public static void main(String[] args) { // Create game window... JFrame app = new JFrame(); app.setIgnoreRepaint(true); app.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // Create canvas for painting... Canvas canvas = new Canvas(); canvas.setIgnoreRepaint(true); canvas.setSize(1200, 480); // Add canvas to game window... app.add(canvas); app.pack(); app.setVisible(true); // Create BackBuffer... canvas.createBufferStrategy(2); BufferStrategy buffer = canvas.getBufferStrategy(); // Get graphics configuration... GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice gd = ge.getDefaultScreenDevice(); GraphicsConfiguration gc = gd.getDefaultConfiguration(); // Create off-screen drawing surface BufferedImage bi = gc.createCompatibleImage(1200, 480); // Objects needed for rendering... Graphics graphics = null; Graphics2D g2d = null; Color background = Color.BLACK; // Variables for counting frames per seconds int fps = 0; int frames = 0; long totalTime = 0; long gravityTime = 0; long enemyDamageTime = 0; hangTime = 500; gravityRate = 300; value = gravityRate + hangTime; long curTime = System.currentTimeMillis(); long lastTime = curTime; g = new Grid(0); g.makeDefaultGrid(); stage = 1; app.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) { g.retractWeapon(lastKey); if (g.getGrid() .get(new Point((int) g.getCharacterLocation().getX(), (int) g.getCharacterLocation().getY() + 1)).hasSolid()) { g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); g.moveCharacter(0, -1, lastKey); value = gravityRate + hangTime; } } else if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) { g.moveCharacter(-1, 0, lastKey); lastKey = KeyEvent.VK_A; } else if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) { g.moveCharacter(0, 1, lastKey); } else if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) { g.moveCharacter(1, 0, lastKey); lastKey = KeyEvent.VK_D; } else if (keyCode == KeyEvent.VK_SPACE) { if (!spaceDown) { spaceDown = true; g.useWeapon(lastKey); } } else if (keyCode == KeyEvent.VK_P) { String name = "Yo Mama"; Color c = Color.ORANGE; Point p = g.findValidEnemyLocation(); if (p != null) { g.spawnNewEnemy(p, new Enemy(true, c, name, 10, 10, 10)); } else { System.out.println("Could not spawn a new enemy."); } } } public void keyReleased(KeyEvent e) { int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_SPACE) { g.retractWeapon(lastKey); spaceDown = false; } } }); while (true) { try { lastTime = curTime; curTime = System.currentTimeMillis(); totalTime += curTime - lastTime; gravityTime += curTime - lastTime; enemyDamageTime += curTime - lastTime; if (gravityTime > value) { value += gravityRate; g.moveCharacter(0, 1, lastKey); g.moveRangedWeapon(); // check every instance of p for (int i = 0; i < g.getEnemyLocation().size(); i++) { Point p = g.getEnemyLocation().get(i); Point q = new Point((int) p.getX(), (int) p.getY() + 1); GridSpace gs = g.getGrid().get(q); if (p.getX() - g.getCharacterLocation().getX() > 0) { g.moveEnemy(-1, 0); } else { g.moveEnemy(1, 0); } if (p.equals(g.getEnemyLocation().get(i))) { if (gs.returnThings().size() > 0) { if (gs.hasSolid()) { if (gs.returnWeapons().size() == 0) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } else { for (LivingThing e : gs.returnLivingThings()) { if (e.getSolid()) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } } for (Terrain t : gs.returnTerrain()) { if (t.getSolid()) { g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); g.moveEnemy(0, -1); } } } } } } g.moveEnemy(0, 1); } if (gravityTime > 4 * gravityRate + hangTime) { gravityTime = 0; value = gravityRate + hangTime; } } if (enemyDamageTime > 500) { } if (totalTime > 1000) { totalTime -= 1000; fps = frames; frames = 0; } ++frames; // clear back buffer... if (g.getCharacterLocation().getX() >= 100) { HashMap<Point, GridSpace> grid = g.getGrid(); Point oldLocation = g.getCharacterLocation(); Character c = grid.get(oldLocation).returnCharacter(); World w = new World(); int killed = g.getNumKilled(); g = w.drawWorld(1, killed); stage++; grid = g.getGrid(); g.setNumKilled(killed); ArrayList<Thing> t = new ArrayList<Thing>(); t.add(c); GridSpace gs = new GridSpace(t); gs.sortArrayOfThings(); grid.put(new Point(0, (int) oldLocation.getY()), gs); g.setCharacterLocation(new Point(0, (int) oldLocation.getY())); } g2d = bi.createGraphics(); g2d.setColor(background); g2d.fillRect(0, 0, 639, 479); HashMap<Point, GridSpace> grid = g.getGrid(); for (int i = 0; i < 100; i++) { for (int j = 0; j < 25; j++) { g2d.setColor(grid.get(new Point(i, j)).getColor()); g2d.fillRect(i * 10, j * 10, 10, 10); } } // display frames per second... g2d.setFont(new Font("Courier New", Font.PLAIN, 12)); g2d.setColor(Color.GREEN); g2d.drawString(String.format("FPS: %s", fps), 20, 20); g2d.drawString(String.format("Stage: %s", stage), 100, 20); g2d.drawString(String.format("Enemies killed: %s", g.getNumKilled()), 180, 20); try { switch (g.getGrid().get(g.getCharacterLocation()).returnCharacter().getHp()) { case 20: g2d.drawString("Health: * * * *", 320, 20); break; case 15: g2d.drawString("Health: * * * _", 320, 20); break; case 10: g2d.drawString("Health: * * _ _", 320, 20); break; case 5: g2d.drawString("Health: * _ _ _", 320, 20); break; default: g2d.drawString("Health: _ _ _ _", 320, 20); break; } } catch (NullPointerException e) { System.out.println("Caught that error"); } // Blit image and flip... graphics = buffer.getDrawGraphics(); graphics.drawImage(bi, 0, 0, null); if (!buffer.contentsLost()) { buffer.show(); } // Let the OS have a little time... Thread.yield(); } finally { // release resources if (graphics != null) graphics.dispose(); if (g2d != null) g2d.dispose(); } } }

diff --git a/src/main/java/com/imie/morpion/controller/NetworkController.java b/src/main/java/com/imie/morpion/controller/NetworkController.java index 54c4cac..ed68d58 100644 --- a/src/main/java/com/imie/morpion/controller/NetworkController.java +++ b/src/main/java/com/imie/morpion/controller/NetworkController.java @@ -1,136 +1,137 @@ package com.imie.morpion.controller; import com.imie.morpion.model.Game; import com.imie.morpion.model.Play; import com.imie.morpion.model.SquareState; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.net.Socket; import java.net.SocketException; import java.util.logging.Level; import java.util.logging.Logger; /** * @author Marc-Antoine Perennou<[email protected]> */ public abstract class NetworkController extends Thread implements BoardListener, EndGameListener { private Game game; private SquareState player; private String id; private Socket socket; private InputStream input; private ObjectOutputStream output; private boolean locked; private Object mutex = new Object(); protected NetworkController(Game game, SquareState player, String id, Socket socket) throws IOException { this.game = game; this.game.addEndGameListener(this); this.player = player; this.id = id; this.socket = socket; this.input = this.socket.getInputStream(); this.output = new ObjectOutputStream(this.socket.getOutputStream()); this.unlock(); } @Override public void run() { try { ObjectInputStream input = new ObjectInputStream(this.input); String line; while (this.socket.isConnected()) { line = input.readUTF(); if (line.startsWith("JOIN")) { this.game.join(input.readUTF(), this.player.getOtherPlayer()); } else if (line.startsWith("PLAY")) { Play play = null; try { play = (Play) input.readObject(); this.game.play(play); } catch (ClassNotFoundException ex) { Logger.getLogger(NetworkController.class.getName()).log(Level.SEVERE, null, ex); } this.unlock(); } else if (line.startsWith("BYE")) { this.socket.close(); } } } catch (SocketException e) { Logger.getLogger(NetworkController.class.getName()).info("Disconnected"); } catch (IOException ex) { Logger.getLogger(NetworkController.class.getName()).log(Level.SEVERE, null, ex); } } public void joinGame() { try { this.output.writeUTF("JOIN"); this.output.writeUTF(this.id); this.output.flush(); this.game.join(this.id, this.player); } catch (IOException ex) { Logger.getLogger(NetworkController.class.getName()).log(Level.SEVERE, null, ex); } } public void play(int x, int y) { Play play = new Play(this.id, x, y); try { this.lock(); this.output.writeUTF("PLAY"); this.output.writeObject(play); this.output.flush(); - this.game.play(play); + if (!this.game.play(play)) + this.unlock(); } catch (IOException ex) { Logger.getLogger(NetworkController.class.getName()).log(Level.SEVERE, null, ex); } } public void quit() { if (this.socket.isConnected()) { try { this.output.writeUTF("BYE"); this.output.flush(); this.output.close(); this.socket.close(); } catch (IOException ex) { } } } private void setLocked(boolean locked) { synchronized (mutex) { this.locked = locked; } } protected void lock() { this.setLocked(true); } private void unlock() { this.setLocked(false); } @Override public void onClick(int x, int y) { if (!this.locked) play(x, y); } @Override public void onGameEnd() { if (this.player == SquareState.P1) this.unlock(); else this.lock(); } } diff --git a/src/main/java/com/imie/morpion/model/Game.java b/src/main/java/com/imie/morpion/model/Game.java index 682f700..9352c2b 100644 --- a/src/main/java/com/imie/morpion/model/Game.java +++ b/src/main/java/com/imie/morpion/model/Game.java @@ -1,175 +1,176 @@ package com.imie.morpion.model; import com.imie.morpion.controller.EndGameListener; import com.imie.morpion.view.GameListener; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @author Marc-Antoine Perennou<[email protected]> */ public class Game { public List<GameListener> listeners; public List<EndGameListener> endListeners; private SquareState me; private int scoreMe; private int scoreOther; private SquareState[][] squares; private GameState state; private Map<String, SquareState> players; public Game(SquareState me) { this.listeners = new ArrayList<>(); this.endListeners = new ArrayList<>(); this.players = new HashMap<>(); this.me = me; this.scoreMe = 0; this.scoreOther = 0; squares = new SquareState[3][3]; reset(); } public void reset() { this.state = GameState.P1_TURN; for (int i = 0; i < 9; i++) { squares[i / 3][i % 3] = SquareState.EMPTY; } this.onStateUpdate(); this.onEndGame(); } public void addGameListener(GameListener listener) { this.listeners.add(listener); } public void addEndGameListener(EndGameListener listener) { this.endListeners.add(listener); } public void onEndGame() { for (EndGameListener l : this.endListeners) { l.onGameEnd(); } } public void onSquaresUpdate() { for (GameListener l : this.listeners) { l.onSquaresUpdate(this.squares); } } public void onStateUpdate() { for (GameListener l : this.listeners) { l.onStateUpdate(this.scoreMe, this.scoreOther); } } public void join(String id, SquareState player) { this.players.put(id, player); } - public void play(Play play) { + public boolean play(Play play) { if (squares[play.x][play.y] != SquareState.EMPTY) - return; + return false; SquareState player = this.players.get(play.player); if ((state == GameState.P1_TURN && player == SquareState.P1) || (state == GameState.P2_TURN && player == SquareState.P2)) { squares[play.x][play.y] = player; } calculateState(); switch (state) { case P1_WIN: if (me == SquareState.P1) scoreMe++; else scoreOther++; reset(); break; case P2_WIN: if (me == SquareState.P2) scoreMe++; else scoreOther++; reset(); break; case TIE: reset(); break; } this.onSquaresUpdate(); + return true; } private void calculateState() { for (int i = 0; i < 3; i++) { /* Horizontal check */ if (squares[0][i] == SquareState.P1 && squares[1][i] == SquareState.P1 && squares[2][i] == SquareState.P1) { state = GameState.P1_WIN; return; } else if (squares[0][i] == SquareState.P2 && squares[1][i] == SquareState.P2 && squares[2][i] == SquareState.P2) { state = GameState.P2_WIN; return; } /* Vertical check */ else if (squares[i][0] == SquareState.P1 && squares[i][1] == SquareState.P1 && squares[i][2] == SquareState.P1) { state = GameState.P1_WIN; return; } else if (squares[i][0] == SquareState.P2 && squares[i][1] == SquareState.P2 && squares[i][2] == SquareState.P2) { state = GameState.P2_WIN; return; } } /* First diagonal check */ if (squares[0][0] == SquareState.P1 && squares[1][1] == SquareState.P1 && squares[2][2] == SquareState.P1) { state = GameState.P1_WIN; return; } else if (squares[0][0] == SquareState.P2 && squares[1][1] == SquareState.P2 && squares[2][2] == SquareState.P2) { state = GameState.P2_WIN; return; } /* Second diagonal check */ if (squares[2][0] == SquareState.P1 && squares[1][1] == SquareState.P1 && squares[0][2] == SquareState.P1) { state = GameState.P1_WIN; return; } else if (squares[2][0] == SquareState.P2 && squares[1][1] == SquareState.P2 && squares[0][2] == SquareState.P2) { state = GameState.P2_WIN; return; } /* Tie check */ boolean all = true; for (int i = 0; i < 9; i++) { int x = i / 3; int y = i % 3; if (squares[i / 3][i % 3].equals(SquareState.EMPTY)) { all = false; break; } } if (all) { state = GameState.TIE; } else if (state.equals(GameState.P1_TURN)) { state = GameState.P2_TURN; } else { state = GameState.P1_TURN; } } }

diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java index d8a03bf..a26b248 100644 --- a/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java +++ b/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java @@ -1,1223 +1,1228 @@ /* * JBoss, Home of Professional Open Source * Copyright 2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.mobicents.tools.sip.balancer; import gov.nist.javax.sip.SipStackImpl; +import gov.nist.javax.sip.header.HeaderFactoryImpl; import gov.nist.javax.sip.header.SIPHeader; import java.text.ParseException; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; import java.util.logging.Logger; import javax.sip.DialogTerminatedEvent; import javax.sip.IOExceptionEvent; import javax.sip.InvalidArgumentException; import javax.sip.ListeningPoint; import javax.sip.PeerUnavailableException; import javax.sip.RequestEvent; import javax.sip.ResponseEvent; import javax.sip.SipException; import javax.sip.SipFactory; import javax.sip.SipListener; import javax.sip.SipProvider; import javax.sip.TimeoutEvent; import javax.sip.Transaction; import javax.sip.TransactionTerminatedEvent; import javax.sip.TransactionUnavailableException; import javax.sip.address.Address; import javax.sip.address.SipURI; import javax.sip.address.URI; import javax.sip.header.CallIdHeader; import javax.sip.header.MaxForwardsHeader; import javax.sip.header.RecordRouteHeader; import javax.sip.header.RouteHeader; import javax.sip.header.ViaHeader; import javax.sip.message.Message; import javax.sip.message.Request; import javax.sip.message.Response; /** * A transaction stateful UDP Forwarder that listens at a port and forwards to multiple * outbound addresses. It keeps a timer thread around that pings the list of * proxy servers and sends to the first proxy server. * * It uses double record routing to be able to listen on one transport and sends on another transport * or allows support for multihoming. * * @author M. Ranganathan * @author baranowb * @author <A HREF="mailto:[email protected]">Jean Deruelle</A> */ public class SIPBalancerForwarder implements SipListener { private static final Logger logger = Logger.getLogger(SIPBalancerForwarder.class .getCanonicalName()); /* * Those parameters is to indicate to the SIP Load Balancer, from which node comes from the request * so that it can stick the Call Id to this node and correctly route the subsequent requests. */ public static final String ROUTE_PARAM_NODE_HOST = "node_host"; public static final String ROUTE_PARAM_NODE_PORT = "node_port"; public static final int UDP = 0; public static final int TCP = 1; BalancerRunner balancerRunner; protected static final HashSet<String> dialogCreationMethods=new HashSet<String>(2); static{ dialogCreationMethods.add(Request.INVITE); dialogCreationMethods.add(Request.SUBSCRIBE); } public NodeRegister register; protected String[] extraServerAddresses; protected int[] extraServerPorts; public SIPBalancerForwarder(Properties properties, BalancerRunner balancerRunner, NodeRegister register) throws IllegalStateException{ super(); this.balancerRunner = balancerRunner; this.balancerRunner.balancerContext.forwarder = this; this.balancerRunner.balancerContext.properties = properties; this.register = register; } public void start() { SipFactory sipFactory = null; balancerRunner.balancerContext.sipStack = null; balancerRunner.balancerContext.host = balancerRunner.balancerContext.properties.getProperty("host"); balancerRunner.balancerContext.internalHost = balancerRunner.balancerContext.properties.getProperty("internalHost",balancerRunner.balancerContext.host); balancerRunner.balancerContext.externalHost = balancerRunner.balancerContext.properties.getProperty("externalHost",balancerRunner.balancerContext.host); balancerRunner.balancerContext.externalPort = Integer.parseInt(balancerRunner.balancerContext.properties.getProperty("externalPort")); if(balancerRunner.balancerContext.properties.getProperty("internalPort") != null) { balancerRunner.balancerContext.internalPort = Integer.parseInt(balancerRunner.balancerContext.properties.getProperty("internalPort")); } balancerRunner.balancerContext.externalIpLoadBalancerAddress = balancerRunner.balancerContext.properties.getProperty("externalIpLoadBalancerAddress"); balancerRunner.balancerContext.internalIpLoadBalancerAddress = balancerRunner.balancerContext.properties.getProperty("internalIpLoadBalancerAddress"); if(balancerRunner.balancerContext.properties.getProperty("externalLoadBalancerPort") != null) { balancerRunner.balancerContext.externalLoadBalancerPort = Integer.parseInt(balancerRunner.balancerContext.properties.getProperty("externalLoadBalancerPort")); } if(balancerRunner.balancerContext.properties.getProperty("internalLoadBalancerPort") != null) { balancerRunner.balancerContext.internalLoadBalancerPort = Integer.parseInt(balancerRunner.balancerContext.properties.getProperty("internalLoadBalancerPort")); } // We ended up with two duplicate set of properties for interna and external IP LB ports, just keep then for back-compatibility if(balancerRunner.balancerContext.properties.getProperty("externalIpLoadBalancerPort") != null) { balancerRunner.balancerContext.externalLoadBalancerPort = Integer.parseInt(balancerRunner.balancerContext.properties.getProperty("externalIpLoadBalancerPort")); } if(balancerRunner.balancerContext.properties.getProperty("internalIpLoadBalancerPort") != null) { balancerRunner.balancerContext.internalLoadBalancerPort = Integer.parseInt(balancerRunner.balancerContext.properties.getProperty("internalIpLoadBalancerPort")); } if(balancerRunner.balancerContext.isTwoEntrypoints()) { if(balancerRunner.balancerContext.externalLoadBalancerPort > 0) { if(balancerRunner.balancerContext.internalLoadBalancerPort <=0) { throw new RuntimeException("External IP load balancer specified, but not internal load balancer"); } } } if(balancerRunner.balancerContext.externalIpLoadBalancerAddress != null) { if(balancerRunner.balancerContext.externalLoadBalancerPort<=0) { throw new RuntimeException("External load balancer address specified, but not externalLoadBalancerPort"); } } if(balancerRunner.balancerContext.internalIpLoadBalancerAddress != null) { if(balancerRunner.balancerContext.internalLoadBalancerPort<=0) { throw new RuntimeException("Internal load balancer address specified, but not internalLoadBalancerPort"); } } String extraServerNodesString = balancerRunner.balancerContext.properties.getProperty("extraServerNodes"); if(extraServerNodesString != null) { extraServerAddresses = extraServerNodesString.split(","); extraServerPorts = new int[extraServerAddresses.length]; for(int q=0; q<extraServerAddresses.length; q++) { int indexOfPort = extraServerAddresses[q].indexOf(':'); if(indexOfPort > 0) { extraServerPorts[q] = Integer.parseInt(extraServerAddresses[q].substring(indexOfPort + 1, extraServerAddresses[q].length())); extraServerAddresses[q] = extraServerAddresses[q].substring(0, indexOfPort); logger.info("Extra Server: " + extraServerAddresses[q] + ":" + extraServerPorts[q]); } else { extraServerPorts[q] = 5060; } } } try { // Create SipStack object sipFactory = SipFactory.getInstance(); sipFactory.setPathName("gov.nist"); balancerRunner.balancerContext.properties.setProperty("gov.nist.javax.sip.SIP_MESSAGE_VALVE", SIPBalancerValveProcessor.class.getName()); if(balancerRunner.balancerContext.properties.getProperty("gov.nist.javax.sip.TCP_POST_PARSING_THREAD_POOL_SIZE") == null) { balancerRunner.balancerContext.properties.setProperty("gov.nist.javax.sip.TCP_POST_PARSING_THREAD_POOL_SIZE", "100"); } balancerRunner.balancerContext.sipStack = sipFactory.createSipStack(balancerRunner.balancerContext.properties); } catch (PeerUnavailableException pue) { // could not find // gov.nist.jain.protocol.ip.sip.SipStackImpl // in the classpath throw new IllegalStateException("Cant create stack due to["+pue.getMessage()+"]", pue); } try { balancerRunner.balancerContext.headerFactory = sipFactory.createHeaderFactory(); + boolean usePrettyEncoding = Boolean.valueOf(balancerRunner.balancerContext.properties.getProperty("usePrettyEncoding", "false")); + if(usePrettyEncoding) { + ((HeaderFactoryImpl)balancerRunner.balancerContext.headerFactory).setPrettyEncoding(true); + } balancerRunner.balancerContext.addressFactory = sipFactory.createAddressFactory(); balancerRunner.balancerContext.messageFactory = sipFactory.createMessageFactory(); ListeningPoint externalLp = balancerRunner.balancerContext.sipStack.createListeningPoint(balancerRunner.balancerContext.externalHost, balancerRunner.balancerContext.externalPort, "udp"); ListeningPoint externalLpTcp = balancerRunner.balancerContext.sipStack.createListeningPoint(balancerRunner.balancerContext.externalHost, balancerRunner.balancerContext.externalPort, "tcp"); balancerRunner.balancerContext.externalSipProvider = balancerRunner.balancerContext.sipStack.createSipProvider(externalLp); balancerRunner.balancerContext.externalSipProvider.addListeningPoint(externalLpTcp); balancerRunner.balancerContext.externalSipProvider.addSipListener(this); ListeningPoint internalLp = null; if(balancerRunner.balancerContext.isTwoEntrypoints()) { internalLp = balancerRunner.balancerContext.sipStack.createListeningPoint(balancerRunner.balancerContext.internalHost, balancerRunner.balancerContext.internalPort, "udp"); ListeningPoint internalLpTcp = balancerRunner.balancerContext.sipStack.createListeningPoint(balancerRunner.balancerContext.internalHost, balancerRunner.balancerContext.internalPort, "tcp"); balancerRunner.balancerContext.internalSipProvider = balancerRunner.balancerContext.sipStack.createSipProvider(internalLp); balancerRunner.balancerContext.internalSipProvider.addListeningPoint(internalLpTcp); balancerRunner.balancerContext.internalSipProvider.addSipListener(this); } //Creating the Record Route headers on startup since they can't be changed at runtime and this will avoid the overhead of creating them //for each request //We need to use double record (better option than record route rewriting) routing otherwise it is impossible : //a) to forward BYE from the callee side to the caller //b) to support different transports { SipURI externalLocalUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, externalLp.getIPAddress()); externalLocalUri.setPort(externalLp.getPort()); externalLocalUri.setTransportParam("udp"); //See RFC 3261 19.1.1 for lr parameter externalLocalUri.setLrParam(); Address externalLocalAddress = balancerRunner.balancerContext.addressFactory.createAddress(externalLocalUri); externalLocalAddress.setURI(externalLocalUri); if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :"+externalLocalAddress); } balancerRunner.balancerContext.externalRecordRouteHeader[UDP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(externalLocalAddress); } { SipURI externalLocalUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, externalLp.getIPAddress()); externalLocalUri.setPort(externalLp.getPort()); externalLocalUri.setTransportParam("tcp"); //See RFC 3261 19.1.1 for lr parameter externalLocalUri.setLrParam(); Address externalLocalAddress = balancerRunner.balancerContext.addressFactory.createAddress(externalLocalUri); externalLocalAddress.setURI(externalLocalUri); if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :"+externalLocalAddress); } balancerRunner.balancerContext.externalRecordRouteHeader[TCP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(externalLocalAddress); } if(balancerRunner.balancerContext.isTwoEntrypoints()) { { SipURI internalLocalUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, internalLp.getIPAddress()); internalLocalUri.setPort(internalLp.getPort()); internalLocalUri.setTransportParam("udp"); //See RFC 3261 19.1.1 for lr parameter internalLocalUri.setLrParam(); Address internalLocalAddress = balancerRunner.balancerContext.addressFactory.createAddress(internalLocalUri); internalLocalAddress.setURI(internalLocalUri); if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :"+internalLocalAddress); } balancerRunner.balancerContext.internalRecordRouteHeader[UDP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(internalLocalAddress); } { SipURI internalLocalUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, internalLp.getIPAddress()); internalLocalUri.setPort(internalLp.getPort()); internalLocalUri.setTransportParam("tcp"); //See RFC 3261 19.1.1 for lr parameter internalLocalUri.setLrParam(); Address internalLocalAddress = balancerRunner.balancerContext.addressFactory.createAddress(internalLocalUri); internalLocalAddress.setURI(internalLocalUri); if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :"+internalLocalAddress); } balancerRunner.balancerContext.internalRecordRouteHeader[TCP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(internalLocalAddress); } } if(balancerRunner.balancerContext.externalIpLoadBalancerAddress != null) { //UDP RR { SipURI ipLbSipUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, balancerRunner.balancerContext.externalIpLoadBalancerAddress); ipLbSipUri.setPort(balancerRunner.balancerContext.externalLoadBalancerPort); ipLbSipUri.setTransportParam("udp"); ipLbSipUri.setLrParam(); Address ipLbAdress = balancerRunner.balancerContext.addressFactory.createAddress(ipLbSipUri); ipLbAdress.setURI(ipLbSipUri); balancerRunner.balancerContext.externalIpBalancerRecordRouteHeader[UDP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(ipLbAdress); } //TCP RR { SipURI ipLbSipUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, balancerRunner.balancerContext.externalIpLoadBalancerAddress); ipLbSipUri.setPort(balancerRunner.balancerContext.externalLoadBalancerPort); ipLbSipUri.setTransportParam("tcp"); ipLbSipUri.setLrParam(); Address ipLbAdress = balancerRunner.balancerContext.addressFactory.createAddress(ipLbSipUri); ipLbAdress.setURI(ipLbSipUri); balancerRunner.balancerContext.externalIpBalancerRecordRouteHeader[TCP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(ipLbAdress); } } if(balancerRunner.balancerContext.internalIpLoadBalancerAddress != null) { { SipURI ipLbSipUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, balancerRunner.balancerContext.internalIpLoadBalancerAddress); ipLbSipUri.setPort(balancerRunner.balancerContext.internalLoadBalancerPort); ipLbSipUri.setTransportParam("udp"); ipLbSipUri.setLrParam(); Address ipLbAdress = balancerRunner.balancerContext.addressFactory.createAddress(ipLbSipUri); ipLbAdress.setURI(ipLbSipUri); balancerRunner.balancerContext.internalIpBalancerRecordRouteHeader[UDP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(ipLbAdress); } { SipURI ipLbSipUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, balancerRunner.balancerContext.internalIpLoadBalancerAddress); ipLbSipUri.setPort(balancerRunner.balancerContext.internalLoadBalancerPort); ipLbSipUri.setTransportParam("tcp"); ipLbSipUri.setLrParam(); Address ipLbAdress = balancerRunner.balancerContext.addressFactory.createAddress(ipLbSipUri); ipLbAdress.setURI(ipLbSipUri); balancerRunner.balancerContext.internalIpBalancerRecordRouteHeader[TCP] = balancerRunner.balancerContext.headerFactory .createRecordRouteHeader(ipLbAdress); } } balancerRunner.balancerContext.activeExternalHeader[UDP] = balancerRunner.balancerContext.externalIpBalancerRecordRouteHeader[UDP] != null ? balancerRunner.balancerContext.externalIpBalancerRecordRouteHeader[UDP] : balancerRunner.balancerContext.externalRecordRouteHeader[UDP]; balancerRunner.balancerContext.activeInternalHeader[UDP] = balancerRunner.balancerContext.internalIpBalancerRecordRouteHeader[UDP] != null ? balancerRunner.balancerContext.internalIpBalancerRecordRouteHeader[UDP] : balancerRunner.balancerContext.internalRecordRouteHeader[UDP]; balancerRunner.balancerContext.activeExternalHeader[TCP] = balancerRunner.balancerContext.externalIpBalancerRecordRouteHeader[TCP] != null ? balancerRunner.balancerContext.externalIpBalancerRecordRouteHeader[TCP] : balancerRunner.balancerContext.externalRecordRouteHeader[TCP]; balancerRunner.balancerContext.activeInternalHeader[TCP] = balancerRunner.balancerContext.internalIpBalancerRecordRouteHeader[TCP] != null ? balancerRunner.balancerContext.internalIpBalancerRecordRouteHeader[TCP] : balancerRunner.balancerContext.internalRecordRouteHeader[TCP]; balancerRunner.balancerContext.useIpLoadBalancerAddressInViaHeaders = Boolean.valueOf( balancerRunner.balancerContext.properties.getProperty("useIpLoadBalancerAddressInViaHeaders", "false")); if(balancerRunner.balancerContext.useIpLoadBalancerAddressInViaHeaders) { balancerRunner.balancerContext.externalViaHost = balancerRunner.balancerContext.externalIpLoadBalancerAddress; balancerRunner.balancerContext.internalViaHost = balancerRunner.balancerContext.internalIpLoadBalancerAddress; balancerRunner.balancerContext.externalViaPort = balancerRunner.balancerContext.externalLoadBalancerPort; balancerRunner.balancerContext.internalViaPort = balancerRunner.balancerContext.internalLoadBalancerPort; } else { balancerRunner.balancerContext.externalViaHost = balancerRunner.balancerContext.externalHost; balancerRunner.balancerContext.internalViaHost = balancerRunner.balancerContext.internalHost; balancerRunner.balancerContext.externalViaPort = balancerRunner.balancerContext.externalPort; balancerRunner.balancerContext.internalViaPort = balancerRunner.balancerContext.internalPort; } balancerRunner.balancerContext.sipStack.start(); SipStackImpl stackImpl = (SipStackImpl) balancerRunner.balancerContext.sipStack; SIPBalancerValveProcessor valve = (SIPBalancerValveProcessor) stackImpl.sipMessageValve; valve.balancerRunner = balancerRunner; } catch (Exception ex) { throw new IllegalStateException("Can't create sip objects and lps due to["+ex.getMessage()+"]", ex); } if(logger.isLoggable(Level.INFO)) { logger.info("Sip Balancer started on external address " + balancerRunner.balancerContext.externalHost + ", external port : " + balancerRunner.balancerContext.externalPort + ", internalPort : " + balancerRunner.balancerContext.internalPort); } } public void stop() { if(balancerRunner.balancerContext.sipStack == null) return;// already stopped Iterator<SipProvider> sipProviderIterator = balancerRunner.balancerContext.sipStack.getSipProviders(); try{ while (sipProviderIterator.hasNext()) { SipProvider sipProvider = sipProviderIterator.next(); ListeningPoint[] listeningPoints = sipProvider.getListeningPoints(); for (ListeningPoint listeningPoint : listeningPoints) { if(logger.isLoggable(Level.INFO)) { logger.info("Removing the following Listening Point " + listeningPoint); } try { sipProvider.removeListeningPoint(listeningPoint); balancerRunner.balancerContext.sipStack.deleteListeningPoint(listeningPoint); } catch (Exception e) { logger.log(Level.SEVERE, "Cant remove the listening points or sip providers", e); } } if(logger.isLoggable(Level.INFO)) { logger.info("Removing the sip provider"); } sipProvider.removeSipListener(this); balancerRunner.balancerContext.sipStack.deleteSipProvider(sipProvider); sipProviderIterator = balancerRunner.balancerContext.sipStack.getSipProviders(); } balancerRunner.balancerContext.sipStack.stop(); balancerRunner.balancerContext.sipStack = null; System.gc(); if(logger.isLoggable(Level.INFO)) { logger.info("Sip forwarder SIP stack stopped"); } } catch (Exception e) { throw new IllegalStateException("Cant remove the listening points or sip providers", e); } } public void processDialogTerminated( DialogTerminatedEvent dialogTerminatedEvent) { // We wont see those } public void processIOException(IOExceptionEvent exceptionEvent) { // Hopefully we wont see those either } /* * (non-Javadoc) * @see javax.sip.SipListener#processRequest(javax.sip.RequestEvent) */ public void processRequest(RequestEvent requestEvent) { // This will be invoked only by external endpoint final SipProvider sipProvider = (SipProvider) requestEvent.getSource(); final Request request = requestEvent.getRequest(); final String requestMethod = request.getMethod(); try { updateStats(request); forwardRequest(sipProvider,request); } catch (Throwable throwable) { logger.log(Level.SEVERE, "Unexpected exception while forwarding the request " + request, throwable); if(!Request.ACK.equalsIgnoreCase(requestMethod)) { try { Response response = balancerRunner.balancerContext.messageFactory.createResponse(Response.SERVER_INTERNAL_ERROR, request); sipProvider.sendResponse(response); } catch (Exception e) { logger.log(Level.SEVERE, "Unexpected exception while trying to send the error response for this " + request, e); } } } } private void updateStats(Message message) { if(balancerRunner.balancerContext.gatherStatistics) { if(message instanceof Request) { balancerRunner.balancerContext.requestsProcessed.incrementAndGet(); final String method = ((Request) message).getMethod(); final AtomicLong requestsProcessed = balancerRunner.balancerContext.requestsProcessedByMethod.get(method); if(requestsProcessed == null) { balancerRunner.balancerContext.requestsProcessedByMethod.put(method, new AtomicLong(0)); } else { requestsProcessed.incrementAndGet(); } } else { balancerRunner.balancerContext.responsesProcessed.incrementAndGet(); final int statusCode = ((Response)message).getStatusCode(); int statusCodeDiv = statusCode / 100; switch (statusCodeDiv) { case 1: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("1XX").incrementAndGet(); break; case 2: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("2XX").incrementAndGet(); break; case 3: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("3XX").incrementAndGet(); break; case 4: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("4XX").incrementAndGet(); break; case 5: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("5XX").incrementAndGet(); break; case 6: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("6XX").incrementAndGet(); break; case 7: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("7XX").incrementAndGet(); break; case 8: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("8XX").incrementAndGet(); break; case 9: balancerRunner.balancerContext.responsesProcessedByStatusCode.get("9XX").incrementAndGet(); break; } } } } private SIPNode getAliveNode(String host, int port, String otherTransport) { otherTransport = otherTransport.toLowerCase(); for(SIPNode node : balancerRunner.balancerContext.nodes) { if(host.equals(node.getHostName()) || host.equals(node.getIp())) { if((Integer)node.getProperties().get(otherTransport + "Port") == port) { return node; } } } return null; } private SIPNode getNodeDeadOrAlive(String host, int port, String otherTransport) { otherTransport = otherTransport.toLowerCase(); for(SIPNode node : balancerRunner.balancerContext.allNodesEver) { if(host.equals(node.getHostName()) || host.equals(node.getIp())) { if((Integer)node.getProperties().get(otherTransport + "Port") == port) { return node; } } } return null; } private boolean isViaHeaderFromServer(Request request) { ViaHeader viaHeader = ((ViaHeader)request.getHeader(ViaHeader.NAME)); String host = viaHeader.getHost(); String transport = viaHeader.getTransport(); if(transport == null) transport = "udp"; int port = viaHeader.getPort(); if(extraServerAddresses != null) { for(int q=0; q<extraServerAddresses.length; q++) { if(extraServerAddresses[q].equals(host) && extraServerPorts[q] == port) { return true; } } } if(getAliveNode(host, port, transport) != null) { return true; } return false; } private SIPNode getSourceNode(Response response) { ViaHeader viaHeader = ((ViaHeader)response.getHeader(ViaHeader.NAME)); String host = viaHeader.getHost(); String transport = viaHeader.getTransport(); if(transport == null) transport = "udp"; transport = transport.toLowerCase(); int port = viaHeader.getPort(); if(extraServerAddresses != null) { for(int q=0; q<extraServerAddresses.length; q++) { if(extraServerAddresses[q].equals(host) && extraServerPorts[q] == port) { return ExtraServerNode.extraServerNode; } } } SIPNode node = getNodeDeadOrAlive(host, port, transport); if(node != null) { return node; } return null; } public SipURI getLoopbackUri(Request request) { SipURI uri = null; RouteHeader route = (RouteHeader) request.getHeader(RouteHeader.NAME); if(route != null) { if(route.getAddress().getURI().isSipURI()) { uri = (SipURI) route.getAddress().getURI(); } } else { if(request.getRequestURI().isSipURI()) { uri = (SipURI) request.getRequestURI(); } } if(uri != null) { if( (uri.getHost().equals(balancerRunner.balancerContext.externalHost) && uri.getPort() == balancerRunner.balancerContext.externalPort) || (uri.getHost().equals(balancerRunner.balancerContext.internalHost) && uri.getPort() == balancerRunner.balancerContext.internalPort)) { return uri; } } return null; } /** * @param requestEvent * @param sipProvider * @param originalRequest * @param serverTransaction * @param request * @throws ParseException * @throws InvalidArgumentException * @throws SipException * @throws TransactionUnavailableException */ private void forwardRequest( SipProvider sipProvider, Request request) throws ParseException, InvalidArgumentException, SipException, TransactionUnavailableException { if(logger.isLoggable(Level.FINEST)) { logger.finest("got request:\n"+request); } boolean isRequestFromServer = false; if(!balancerRunner.balancerContext.isTwoEntrypoints()) { isRequestFromServer = isViaHeaderFromServer(request); } else { isRequestFromServer = sipProvider.equals(balancerRunner.balancerContext.internalSipProvider); } final boolean isCancel = Request.CANCEL.equals(request.getMethod()); if(!isCancel) { decreaseMaxForwardsHeader(sipProvider, request); } RouteHeaderHints hints = removeRouteHeadersMeantForLB(request); if(dialogCreationMethods.contains(request.getMethod())) { addLBRecordRoute(sipProvider, request, hints); } final String callID = ((CallIdHeader) request.getHeader(CallIdHeader.NAME)).getCallId(); String transport = ((ViaHeader)request.getHeader(ViaHeader.NAME)).getTransport().toLowerCase(); if(hints.serverAssignedNode !=null) { String callId = ((SIPHeader) request.getHeader("Call-ID")).getValue(); balancerRunner.balancerContext.balancerAlgorithm.assignToNode(callId, hints.serverAssignedNode); if(logger.isLoggable(Level.FINEST)) { logger.finest("Following node information has been found in one of the route Headers " + hints.serverAssignedNode); } SipURI uri = getLoopbackUri(request); if(uri != null) { uri.setHost(hints.serverAssignedNode.getIp()); uri.setPort((Integer) hints.serverAssignedNode.getProperties().get(transport + "Port")); } } SIPNode nextNode = null; if(isRequestFromServer) { balancerRunner.balancerContext.balancerAlgorithm.processInternalRequest(request); } else { // Request is NOT from app server, first check if we have hints in Route headers SIPNode assignedNode = hints.serverAssignedNode; // If there are no hints see if there is route header pointing existing node if(assignedNode == null) { RouteHeader nextNodeHeader = (RouteHeader) request.getHeader(RouteHeader.NAME); if(nextNodeHeader != null) { URI uri = nextNodeHeader.getAddress().getURI(); if(uri instanceof SipURI) { SipURI sipUri = (SipURI) uri; assignedNode = getAliveNode(sipUri.getHost(), sipUri.getPort(), transport); if(logger.isLoggable(Level.FINEST)) { logger.finest("Found SIP URI " + uri + " |Next node is " + assignedNode); } } } } SipURI assignedUri = null; //boolean nextNodeInRequestUri = false; SipURI originalRouteHeaderUri = null; if(assignedNode == null) { if(hints.subsequentRequest) { RouteHeader header = (RouteHeader) request.getHeader(RouteHeader.NAME); if(header != null) { assignedUri = (SipURI) header.getAddress().getURI(); originalRouteHeaderUri = (SipURI) assignedUri.clone(); request.removeFirst(RouteHeader.NAME); } else { if(request.getRequestURI() instanceof SipURI) { SipURI sipUri =(SipURI) request.getRequestURI(); //nextNodeInRequestUri = true; assignedNode = getAliveNode(sipUri.getHost(), sipUri.getPort(), transport); } } if(logger.isLoggable(Level.FINEST)) { logger.finest("Subsequent request -> Found Route Header " + header + " |Next node is " + assignedNode); } } else if(request.getRequestURI() instanceof SipURI) { SipURI sipUri =(SipURI) request.getRequestURI(); //nextNodeInRequestUri = true; assignedNode = getAliveNode(sipUri.getHost(), sipUri.getPort(), transport); if(logger.isLoggable(Level.FINEST)) { logger.finest("NOT Subsequent request -> using sipUri " + sipUri + " |Next node is " + assignedNode); } } } if(assignedNode == null) { if(logger.isLoggable(Level.FINEST)) { logger.finest("assignedNode is null"); } nextNode = balancerRunner.balancerContext.balancerAlgorithm.processExternalRequest(request); if(nextNode instanceof NullServerNode) { if(logger.isLoggable(Level.FINE)) { logger.fine("Algorithm returned a NullServerNode. We will not attempt to forward this request " + request); } } if(nextNode != null) { if(logger.isLoggable(Level.FINEST)) { String nodesString = ""; Object[] nodes = balancerRunner.balancerContext.nodes.toArray(); for(Object n : nodes) { nodesString +=n + " , "; } logger.finest("Next node is not null. Assigned uri is " + assignedUri + "Available nodes: " + nodesString); } //Adding Route Header pointing to the node the sip balancer wants to forward to SipURI routeSipUri; try { if(assignedUri == null) { // If a next node is NOT already assigned in the dialog from previous requests routeSipUri = balancerRunner.balancerContext.addressFactory .createSipURI(null, nextNode.getIp()); } else { // OTHERWISE, a node is already assigned and it's alive routeSipUri = assignedUri; } routeSipUri.setHost(nextNode.getIp()); Integer port = (Integer)nextNode.getProperties().get(transport + "Port"); if(port == null) { throw new RuntimeException("Port is null in the node properties for transport=" + transport); } routeSipUri.setPort(port); routeSipUri.setTransportParam(transport); routeSipUri.setLrParam(); final RouteHeader route = balancerRunner.balancerContext.headerFactory.createRouteHeader( balancerRunner.balancerContext.addressFactory.createAddress(routeSipUri)); request.addFirst(route); // If the request is meant for the AS it must recognize itself in the ruri, so update it too // For http://code.google.com/p/mobicents/issues/detail?id=2132 if(originalRouteHeaderUri != null && request.getRequestURI().isSipURI()) { SipURI uri = (SipURI) request.getRequestURI(); // we will just compare by hostport id String rurihostid = uri.getHost() + uri.getPort(); String originalhostid = originalRouteHeaderUri.getHost() + originalRouteHeaderUri.getPort(); if(rurihostid.equals(originalhostid)) { uri.setPort(routeSipUri.getPort()); uri.setHost(routeSipUri.getHost()); } } } catch (Exception e) { throw new RuntimeException("Error adding route header", e); } } } else { nextNode = balancerRunner.balancerContext.balancerAlgorithm.processAssignedExternalRequest(request, assignedNode); } if(nextNode == null) { if(logger.isLoggable(Level.FINE)) { logger.fine("No nodes available"); } if(!Request.ACK.equalsIgnoreCase(request.getMethod())) { try { Response response = balancerRunner.balancerContext.messageFactory.createResponse(Response.SERVER_INTERNAL_ERROR, request); response.setReasonPhrase("No nodes available"); sipProvider.sendResponse(response); } catch (Exception e) { logger.log(Level.SEVERE, "Unexpected exception while trying to send the error response for this " + request, e); } } return; } else { } } // Stateless proxies must not use internal state or ransom values when creating branch because they // must repeat exactly the same branches for retransmissions final ViaHeader via = (ViaHeader) request.getHeader(ViaHeader.NAME); String newBranch = via.getBranch() + callID.substring(0, Math.min(callID.length(), 5)); // Add the via header to the top of the header list. ViaHeader viaHeaderExternal = null; ViaHeader viaHeaderInternal = null; viaHeaderExternal = balancerRunner.balancerContext.headerFactory.createViaHeader( balancerRunner.balancerContext.externalViaHost, balancerRunner.balancerContext.externalViaPort, transport, newBranch); if(balancerRunner.balancerContext.isTwoEntrypoints()) { viaHeaderInternal = balancerRunner.balancerContext.headerFactory.createViaHeader( balancerRunner.balancerContext.internalViaHost, balancerRunner.balancerContext.internalViaPort, transport, newBranch + "zsd"); } if(logger.isLoggable(Level.FINEST)) { logger.finest("ViaHeaders will be added " + viaHeaderExternal + " and " + viaHeaderInternal); logger.finest("Sending the request:\n" + request + "\n on the other side"); } if(getLoopbackUri(request) != null) { logger.warning("Drop. Cannot forward to loopback the following request: " + request); return; } if(!isRequestFromServer && balancerRunner.balancerContext.isTwoEntrypoints()) { request.addHeader(viaHeaderExternal); if(viaHeaderInternal != null) request.addHeader(viaHeaderInternal); balancerRunner.balancerContext.internalSipProvider.sendRequest(request); } else { // Check if the next hop is actually the load balancer again if(viaHeaderInternal != null) request.addHeader(viaHeaderInternal); request.addHeader(viaHeaderExternal); balancerRunner.balancerContext.externalSipProvider.sendRequest(request); } } /** * @param sipProvider * @param request * @param hints * @throws ParseException */ private void addLBRecordRoute(SipProvider sipProvider, Request request, RouteHeaderHints hints) throws ParseException { if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :" + balancerRunner.balancerContext.activeExternalHeader); } String transport = ((ViaHeader)request.getHeader(ViaHeader.NAME)).getTransport().toLowerCase(); int transportIndex = transport.equalsIgnoreCase("udp")?0:1; if(balancerRunner.balancerContext.isTwoEntrypoints()) { if(sipProvider.equals(balancerRunner.balancerContext.externalSipProvider)) { if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :" + balancerRunner.balancerContext.activeExternalHeader); } request.addHeader(balancerRunner.balancerContext.activeExternalHeader[transportIndex]); if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :" + balancerRunner.balancerContext.activeInternalHeader); } request.addHeader(balancerRunner.balancerContext.activeInternalHeader[transportIndex]); } else { if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :" + balancerRunner.balancerContext.activeInternalHeader); } request.addHeader(balancerRunner.balancerContext.activeInternalHeader[transportIndex]); if(logger.isLoggable(Level.FINEST)) { logger.finest("adding Record Router Header :" + balancerRunner.balancerContext.activeExternalHeader); } RecordRouteHeader recordRouteHeader = balancerRunner.balancerContext.activeExternalHeader[transportIndex]; if(hints.serverAssignedNode != null) { recordRouteHeader = (RecordRouteHeader) recordRouteHeader.clone(); SipURI sipuri = (SipURI) recordRouteHeader.getAddress().getURI(); sipuri.setParameter(ROUTE_PARAM_NODE_HOST, hints.serverAssignedNode.getIp()); sipuri.setParameter(ROUTE_PARAM_NODE_PORT, hints.serverAssignedNode.getProperties().get(transport.toLowerCase()+"Port").toString()); } request.addHeader(recordRouteHeader); } } else { RecordRouteHeader recordRouteHeader = balancerRunner.balancerContext.activeExternalHeader[transportIndex]; if(hints.serverAssignedNode != null) { recordRouteHeader = (RecordRouteHeader) recordRouteHeader.clone(); SipURI sipuri = (SipURI) recordRouteHeader.getAddress().getURI(); sipuri.setParameter(ROUTE_PARAM_NODE_HOST, hints.serverAssignedNode.getIp()); sipuri.setParameter(ROUTE_PARAM_NODE_PORT, hints.serverAssignedNode.getProperties().get(transport.toLowerCase()+"Port").toString()); } request.addHeader(recordRouteHeader); } } /** * This will check if in the route header there is information on which node from the cluster send the request. * If the request is not received from the cluster, this information will not be present. * @param routeHeader the route header to check * @return the corresponding Sip Node */ private SIPNode checkRouteHeaderForSipNode(SipURI routeSipUri) { SIPNode node = null; String hostNode = routeSipUri.getParameter(ROUTE_PARAM_NODE_HOST); String hostPort = routeSipUri.getParameter(ROUTE_PARAM_NODE_PORT); if(hostNode != null && hostPort != null) { int port = Integer.parseInt(hostPort); String transport = routeSipUri.getTransportParam(); if(transport == null) transport = "udp"; node = register.getNode(hostNode, port, transport); } return node; } /** * Remove the different route headers that are meant for the Load balancer. * There is two cases here : * <ul> * <li>* Requests coming from external and going to the cluster : dialog creating requests can have route header so that they go through the LB and subsequent requests * will have route headers since the LB record routed</li> * <li>* Requests coming from the cluster and going to external : dialog creating requests can have route header so that they go through the LB - those requests will define in the route header * the originating node of the request so that that subsequent requests are routed to the originating node if still alive</li> * </ul> * * @param request */ private RouteHeaderHints removeRouteHeadersMeantForLB(Request request) { if(logger.isLoggable(Level.FINEST)) { logger.finest("Checking if there is any route headers meant for the LB to remove..."); } SIPNode node = null; boolean subsequent = false; //Removing first routeHeader if it is for the sip balancer RouteHeader routeHeader = (RouteHeader) request.getHeader(RouteHeader.NAME); if(routeHeader != null) { SipURI routeUri = (SipURI)routeHeader.getAddress().getURI(); // We determine if request is subsequent if both internal and external LB RR headers are present. // If only one, this probably means that this dialog never passed through the SIP LB. SIPP however, // removes the first Route header and we must check if the route header is the internal port, which // the caller or the calle would know only if they have passed through the L before. if(routeUri.getPort() == balancerRunner.balancerContext.internalPort && routeUri.getHost().equals(balancerRunner.balancerContext.internalHost)) subsequent = true; //FIXME check against a list of host we may have too if(!isRouteHeaderExternal(routeUri.getHost(), routeUri.getPort())) { if(logger.isLoggable(Level.FINEST)) { logger.finest("this route header is for the LB removing it " + routeUri); } request.removeFirst(RouteHeader.NAME); routeHeader = (RouteHeader) request.getHeader(RouteHeader.NAME); //since we used double record routing we may have 2 routes corresponding to us here // for ACK and BYE from caller for example node = checkRouteHeaderForSipNode(routeUri); if(routeHeader != null) { routeUri = (SipURI)routeHeader.getAddress().getURI(); //FIXME check against a list of host we may have too if(!isRouteHeaderExternal(routeUri.getHost(), routeUri.getPort())) { if(logger.isLoggable(Level.FINEST)) { logger.finest("this route header is for the LB removing it " + routeUri); } request.removeFirst(RouteHeader.NAME); if(node == null) { node = checkRouteHeaderForSipNode(routeUri); } subsequent = true; // SIPP sometimes appends more headers and lets remove them here. There is no legitimate reason // more than two SIP LB headers to be place next to each-other, so this cleanup is SAFE! boolean moreHeaders = true; while(moreHeaders) { RouteHeader extraHeader = (RouteHeader) request.getHeader(RouteHeader.NAME); if(extraHeader != null) { SipURI u = (SipURI)extraHeader.getAddress().getURI(); if(!isRouteHeaderExternal(u.getHost(), u.getPort())) { request.removeFirst(RouteHeader.NAME); } else { moreHeaders = false; } } else { moreHeaders = false; } } } } } } if(node == null) { if(request.getRequestURI().isSipURI()) { node = checkRouteHeaderForSipNode((SipURI) request.getRequestURI()); } } //logger.info(request.ge + " has this hint " + node); return new RouteHeaderHints(node, subsequent); } /** * Check if the sip uri is meant for the LB same host and same port * @param sipUri sip Uri to check * @return */ private boolean isRouteHeaderExternal(String host, int port) { //FIXME check against a list of host we may have too and add transport if((host.equalsIgnoreCase(balancerRunner.balancerContext.externalHost) || host.equalsIgnoreCase(balancerRunner.balancerContext.internalHost)) && (port == balancerRunner.balancerContext.externalPort || port == balancerRunner.balancerContext.internalPort)) { return false; } if((host.equalsIgnoreCase(balancerRunner.balancerContext.externalIpLoadBalancerAddress) && port == balancerRunner.balancerContext.externalLoadBalancerPort)) { return false; } if((host.equalsIgnoreCase(balancerRunner.balancerContext.internalIpLoadBalancerAddress) && port == balancerRunner.balancerContext.internalLoadBalancerPort)) { return false; } return true; } /** * @param sipProvider * @param request * @throws InvalidArgumentException * @throws ParseException * @throws SipException */ private void decreaseMaxForwardsHeader(SipProvider sipProvider, Request request) throws InvalidArgumentException, ParseException, SipException { // Decreasing the Max Forward Header if(logger.isLoggable(Level.FINEST)) { logger.finest("Decreasing the Max Forward Header "); } MaxForwardsHeader maxForwardsHeader = (MaxForwardsHeader) request.getHeader(MaxForwardsHeader.NAME); if (maxForwardsHeader == null) { maxForwardsHeader = balancerRunner.balancerContext.headerFactory.createMaxForwardsHeader(70); request.addHeader(maxForwardsHeader); } else { if(maxForwardsHeader.getMaxForwards() - 1 > 0) { maxForwardsHeader.setMaxForwards(maxForwardsHeader.getMaxForwards() - 1); } else { //Max forward header equals to 0, thus sending too many hops response Response response = balancerRunner.balancerContext.messageFactory.createResponse (Response.TOO_MANY_HOPS,request); sipProvider.sendResponse(response); } } } /** * @param originalRequest * @param serverTransaction * @throws ParseException * @throws SipException * @throws InvalidArgumentException * @throws TransactionUnavailableException */ /* * (non-Javadoc) * @see javax.sip.SipListener#processResponse(javax.sip.ResponseEvent) */ public void processResponse(ResponseEvent responseEvent) { SipProvider sipProvider = (SipProvider) responseEvent.getSource(); Response originalResponse = responseEvent.getResponse(); if(logger.isLoggable(Level.FINEST)) { logger.finest("got response :\n" + originalResponse); } updateStats(originalResponse); final Response response = originalResponse; // Topmost via headers is me. As it is response to external request ViaHeader viaHeader = (ViaHeader) response.getHeader(ViaHeader.NAME); if(viaHeader!=null && !isRouteHeaderExternal(viaHeader.getHost(), viaHeader.getPort())) { response.removeFirst(ViaHeader.NAME); } viaHeader = (ViaHeader) response.getHeader(ViaHeader.NAME); if(viaHeader!=null && !isRouteHeaderExternal(viaHeader.getHost(), viaHeader.getPort())) { response.removeFirst(ViaHeader.NAME); } boolean fromServer = false; if(balancerRunner.balancerContext.isTwoEntrypoints()) { fromServer = sipProvider.equals(balancerRunner.balancerContext.internalSipProvider); } else { fromServer = getSourceNode(response) == null; } if(fromServer) { /* if("true".equals(balancerRunner.balancerContext.properties.getProperty("removeNodesOn500Response")) && response.getStatusCode() == 500) { // If the server is broken remove it from the list and try another one with the next retransmission if(!(sourceNode instanceof ExtraServerNode)) { if(balancerRunner.balancerContext.nodes.size()>1) { balancerRunner.balancerContext.nodes.remove(sourceNode); balancerRunner.balancerContext.balancerAlgorithm.nodeRemoved(sourceNode); } } }*/ balancerRunner.balancerContext.balancerAlgorithm.processInternalResponse(response); try { if(logger.isLoggable(Level.FINEST)) { logger.finest("from server sending response externally " + response); } balancerRunner.balancerContext.externalSipProvider.sendResponse(response); } catch (Exception ex) { logger.log(Level.SEVERE, "Unexpected exception while forwarding the response \n" + response, ex); } } else { balancerRunner.balancerContext.balancerAlgorithm.processExternalResponse(response); try { if(balancerRunner.balancerContext.isTwoEntrypoints()) { if(logger.isLoggable(Level.FINEST)) { logger.finest("from external sending response " + response); } balancerRunner.balancerContext.internalSipProvider.sendResponse(response); } else { if(logger.isLoggable(Level.FINEST)) { logger.finest("from external sending response " + response); } balancerRunner.balancerContext.externalSipProvider.sendResponse(response); } } catch (Exception ex) { logger.log(Level.SEVERE, "Unexpected exception while forwarding the response \n" + response, ex); } } } /* * (non-Javadoc) * @see javax.sip.SipListener#processTimeout(javax.sip.TimeoutEvent) */ public void processTimeout(TimeoutEvent timeoutEvent) { Transaction transaction = null; if(timeoutEvent.isServerTransaction()) { transaction = timeoutEvent.getServerTransaction(); if(logger.isLoggable(Level.FINEST)) { logger.finest("timeout => " + transaction.getRequest().toString()); } } else { transaction = timeoutEvent.getClientTransaction(); if(logger.isLoggable(Level.FINEST)) { logger.finest("timeout => " + transaction.getRequest().toString()); } } String callId = ((CallIdHeader)transaction.getRequest().getHeader(CallIdHeader.NAME)).getCallId(); register.unStickSessionFromNode(callId); } /* * (non-Javadoc) * @see javax.sip.SipListener#processTransactionTerminated(javax.sip.TransactionTerminatedEvent) */ public void processTransactionTerminated( TransactionTerminatedEvent transactionTerminatedEvent) { Transaction transaction = null; if(transactionTerminatedEvent.isServerTransaction()) { transaction = transactionTerminatedEvent.getServerTransaction(); if(logger.isLoggable(Level.FINEST)) { logger.finest("timeout => " + transaction.getRequest().toString()); } } else { transaction = transactionTerminatedEvent.getClientTransaction(); if(logger.isLoggable(Level.FINEST)) { logger.finest("timeout => " + transaction.getRequest().toString()); } } if(Request.BYE.equals(transaction.getRequest().getMethod())) { String callId = ((CallIdHeader)transaction.getRequest().getHeader(CallIdHeader.NAME)).getCallId(); register.unStickSessionFromNode(callId); } } /** * @return the requestsProcessed */ public long getNumberOfRequestsProcessed() { return balancerRunner.balancerContext.requestsProcessed.get(); } /** * @return the requestsProcessed */ public long getNumberOfResponsesProcessed() { return balancerRunner.balancerContext.responsesProcessed.get(); } /** * @return the requestsProcessed */ public long getRequestsProcessedByMethod(String method) { AtomicLong requestsProcessed = balancerRunner.balancerContext.requestsProcessedByMethod.get(method); if(requestsProcessed != null) { return requestsProcessed.get(); } return 0; } public long getResponsesProcessedByStatusCode(String statusCode) { AtomicLong responsesProcessed = balancerRunner.balancerContext.responsesProcessedByStatusCode.get(statusCode); if(responsesProcessed != null) { return responsesProcessed.get(); } return 0; } public Map<String, AtomicLong> getNumberOfRequestsProcessedByMethod() { return balancerRunner.balancerContext.requestsProcessedByMethod; } public Map<String, AtomicLong> getNumberOfResponsesProcessedByStatusCode() { return balancerRunner.balancerContext.responsesProcessedByStatusCode; } public BalancerContext getBalancerAlgorithmContext() { return balancerRunner.balancerContext; } public void setBalancerAlgorithmContext( BalancerContext balancerAlgorithmContext) { balancerRunner.balancerContext = balancerAlgorithmContext; } /** * @param skipStatistics the skipStatistics to set */ public void setGatherStatistics(boolean skipStatistics) { balancerRunner.balancerContext.gatherStatistics = skipStatistics; } /** * @return the skipStatistics */ public boolean isGatherStatistics() { return balancerRunner.balancerContext.gatherStatistics; } } diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/test/SipBalancerUdpTest.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/test/SipBalancerUdpTest.java index 5f538a6..07261a6 100644 --- a/jar/src/main/java/org/mobicents/tools/sip/balancer/test/SipBalancerUdpTest.java +++ b/jar/src/main/java/org/mobicents/tools/sip/balancer/test/SipBalancerUdpTest.java @@ -1,213 +1,214 @@ /* * JBoss, Home of Professional Open Source * Copyright 2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.mobicents.tools.sip.balancer.test; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Properties; import org.mobicents.tools.sip.balancer.BalancerRunner; public class SipBalancerUdpTest { static final String inviteRequest = "INVITE sip:[email protected] SIP/2.0\r\n"+ "To: sip:[email protected]\r\n"+ "From: sip:[email protected] ;tag=1234\r\n"+ "Call-ID: [email protected]\r\n"+ "CSeq: 9 INVITE\r\n"+ "Via: SIP/2.0/UDP 135.180.130.133\r\n"+ "Content-Type: application/sdp\r\n"+ "\r\n"+ "v=0\r\n"+ "o=mhandley 29739 7272939 IN IP4 126.5.4.3\r\n" + "c=IN IP4 135.180.130.88\r\n" + "m=video 3227 RTP/AVP 31\r\n" + "m=audio 4921 RTP/AVP 12\r\n" + "a=rtpmap:31 LPC\r\n"; static byte[] inviteRequestBytes = inviteRequest.getBytes(); static final String ringing = "SIP/2.0 180 Ringing\n" + "To: <sip:[email protected]>;tag=5432\n" + "Via: SIP/2.0/UDP 127.0.0.1:5065;branch=z9hG4bK-3530-488ff2840f609639903eff914df9870f202e2zsd,SIP/2.0/UDP 127.0.0.1:5060;branch=z9hG4bK-3530-488ff2840f609639903eff914df9870f202e2,SIP/2.0/UDP 127.0.0.1:5033;branch=z9hG4bK-3530-488ff2840f609639903eff914df9870f\n"+ "Record-Route: <sip:127.0.0.1:5065;transport=udp;lr>,<sip:127.0.0.1:5060;transport=udp;lr>\n"+ "CSeq: 1 INVITE\n"+ "Call-ID: [email protected]\n"+ "From: <sip:[email protected]>;tag=12345\n"+ "Content-Length: 0\n"; static byte[] ringingBytes = ringing.getBytes(); BalancerRunner balancer; int numNodes = 2; BlackholeAppServer server; /* (non-Javadoc) * @see junit.framework.TestCase#setUp() */ protected void setUp() throws Exception { balancer = new BalancerRunner(); Properties properties = new Properties(); properties.setProperty("javax.sip.STACK_NAME", "SipBalancerForwarder"); properties.setProperty("javax.sip.AUTOMATIC_DIALOG_SUPPORT", "off"); // You need 16 for logging traces. 32 for debug + traces. // Your code will limp at 32 but it is best for debugging. properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "0"); properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", "logs/sipbalancerforwarderdebug.txt"); properties.setProperty("gov.nist.javax.sip.SERVER_LOG", "logs/sipbalancerforwarder.xml"); properties.setProperty("gov.nist.javax.sip.THREAD_POOL_SIZE", "100"); properties.setProperty("gov.nist.javax.sip.REENTRANT_LISTENER", "true"); - properties.setProperty("gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED", "false"); + properties.setProperty("gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED", "false"); properties.setProperty("host", "127.0.0.1"); properties.setProperty("externalHost", "127.0.0.1"); properties.setProperty("internalHost", "127.0.0.1"); properties.setProperty("internalPort", "5065"); properties.setProperty("externalPort", "5060"); + properties.setProperty("usePrettyEncoding", "true"); balancer.start(properties); server = new BlackholeAppServer("blackhole", 18452, "127.0.0.1"); server.start(); Thread.sleep(5000); } static InetAddress localhost; static int callIdByteStart = -1; static {try { localhost = InetAddress.getByName("127.0.0.1"); byte[] callid = "0ha0isn".getBytes(); for(int q=0;q<1000; q++) { int found = -1;; for(int w=0;w<callid.length;w++) { if(callid[w] != inviteRequestBytes[q+w]) { break; } found = w; } if(found >0) {callIdByteStart = q; break;} } } catch (UnknownHostException e) { // TODO Auto-generated catch block e.printStackTrace(); }} private static long n = 0; private static void modCallId() { n++; inviteRequestBytes[callIdByteStart] = (byte) (n&0xff); inviteRequestBytes[callIdByteStart+1] = (byte) ((n>>8)&0xff); inviteRequestBytes[callIdByteStart+2] = (byte) ((n>>16)&0xff); } public void testInvitePerformanceLong() { testMessagePerformance(10*60*1000, 100000, inviteRequestBytes); } public void testInvitePerformance10sec() { testMessagePerformance(10*1000, 100, inviteRequestBytes); } public void testInvitePerformanceDiffCallId10sec() { testDiffCallIdPerformance(10*1000, 100); } public void testRingingPerformance10sec() { testMessagePerformance(10*1000, 100, ringingBytes); } private void testMessagePerformance(int timespan, int maxLostPackets, byte[] bytes) { try { DatagramSocket socket = new DatagramSocket(33276, localhost); long sentPackets = 0; long startTime = System.currentTimeMillis(); while(true) { boolean diffNotTooBig = sentPackets - server.numPacketsReceived<maxLostPackets; boolean thereIsStillTime = System.currentTimeMillis()-startTime<timespan; if(!thereIsStillTime) { break; } if(diffNotTooBig) { socket.send(new DatagramPacket(bytes,bytes.length,localhost, 5060)); sentPackets++; } else { Thread.sleep(1); } } System.out.println("Packets sent in " + timespan + " ms are " + sentPackets + "(making " + sentPackets/((double)(timespan)/1000.) + " initial requests per second)"); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } } private void testDiffCallIdPerformance(int timespan, int maxLostPackets) { try { DatagramSocket socket = new DatagramSocket(33276, localhost); long sentPackets = 0; long startTime = System.currentTimeMillis(); while(true) { boolean diffNotTooBig = sentPackets - server.numPacketsReceived<maxLostPackets; boolean thereIsStillTime = System.currentTimeMillis()-startTime<timespan; if(!thereIsStillTime) { break; } if(diffNotTooBig) { socket.send(new DatagramPacket(inviteRequestBytes,inviteRequestBytes.length,localhost, 5060)); modCallId(); sentPackets++; } else { Thread.sleep(1); } } System.out.println("Packets sent in " + timespan + " ms are " + sentPackets + "(making " + sentPackets/((double)(timespan)/1000.) + " initial requests per second)"); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } } protected void tearDown() throws Exception { server.stop(); balancer.stop(); } public static void main(String[] args) { try { SipBalancerUdpTest test = new SipBalancerUdpTest(); test.setUp(); Integer time = Integer.parseInt(args[0]); Integer maxDiff = Integer.parseInt(args[0]); test.testMessagePerformance(time*1000, maxDiff, inviteRequestBytes); test.tearDown(); System.exit(0); } catch (Exception e) { e.printStackTrace(); } } }

diff --git a/gradle-tomcat-plugin-log4j2-poc/src/main/java/info/solidsoft/rnd/gradle/tomcat/GradleTomcatLog4j2WebAppInitializer.java b/gradle-tomcat-plugin-log4j2-poc/src/main/java/info/solidsoft/rnd/gradle/tomcat/GradleTomcatLog4j2WebAppInitializer.java new file mode 100644 index 0000000..ed5a699 --- /dev/null +++ b/gradle-tomcat-plugin-log4j2-poc/src/main/java/info/solidsoft/rnd/gradle/tomcat/GradleTomcatLog4j2WebAppInitializer.java @@ -0,0 +1,25 @@ +package info.solidsoft.rnd.gradle.tomcat; + +import org.springframework.web.WebApplicationInitializer; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; + +/** + * @author Marcin Zajączkowski, 2013-12-16 + */ +public class GradleTomcatLog4j2WebAppInitializer implements WebApplicationInitializer { + + @Override + public void onStartup(ServletContext servletContext) throws ServletException { + AnnotationConfigWebApplicationContext springContext = new AnnotationConfigWebApplicationContext(); + springContext.setServletContext(servletContext); + ServletRegistration.Dynamic appServlet = servletContext.addServlet( + "poc", new DispatcherServlet(springContext)); + appServlet.setLoadOnStartup(1); + appServlet.addMapping("/"); + } +}

diff --git a/src/de/uni_koblenz/jgralab/codegenerator/SchemaCodeGenerator.java b/src/de/uni_koblenz/jgralab/codegenerator/SchemaCodeGenerator.java index 83ade36f..e1bde82e 100755 --- a/src/de/uni_koblenz/jgralab/codegenerator/SchemaCodeGenerator.java +++ b/src/de/uni_koblenz/jgralab/codegenerator/SchemaCodeGenerator.java @@ -1,636 +1,658 @@ /* * JGraLab - The Java Graph Laboratory * * Copyright (C) 2006-2010 Institute for Software Technology * University of Koblenz-Landau, Germany * [email protected] * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 3 of the License, or (at your * option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General * Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses>. * * Additional permission under GNU GPL version 3 section 7 * * If you modify this Program, or any covered work, by linking or combining * it with Eclipse (or a modified version of that program or an Eclipse * plugin), containing parts covered by the terms of the Eclipse Public * License (EPL), the licensors of this Program grant you additional * permission to convey the resulting work. Corresponding Source for a * non-source form of such a combination shall include the source code for * the parts of JGraLab used as well as that of the covered work. */ package de.uni_koblenz.jgralab.codegenerator; import java.util.List; import java.util.Stack; import de.uni_koblenz.jgralab.GraphIO; import de.uni_koblenz.jgralab.schema.Attribute; import de.uni_koblenz.jgralab.schema.AttributedElementClass; import de.uni_koblenz.jgralab.schema.CompositeDomain; import de.uni_koblenz.jgralab.schema.Constraint; import de.uni_koblenz.jgralab.schema.EdgeClass; import de.uni_koblenz.jgralab.schema.EnumDomain; import de.uni_koblenz.jgralab.schema.GraphClass; import de.uni_koblenz.jgralab.schema.GraphElementClass; import de.uni_koblenz.jgralab.schema.IncidenceClass; import de.uni_koblenz.jgralab.schema.ListDomain; import de.uni_koblenz.jgralab.schema.MapDomain; import de.uni_koblenz.jgralab.schema.NamedElementClass; import de.uni_koblenz.jgralab.schema.Package; import de.uni_koblenz.jgralab.schema.RecordDomain; import de.uni_koblenz.jgralab.schema.RecordDomain.RecordComponent; import de.uni_koblenz.jgralab.schema.Schema; import de.uni_koblenz.jgralab.schema.SetDomain; import de.uni_koblenz.jgralab.schema.TypedElementClass; import de.uni_koblenz.jgralab.schema.VertexClass; /** * TODO add comment * * @author [email protected] * */ public class SchemaCodeGenerator extends CodeGenerator { private final Schema schema; /** * Creates a new SchemaCodeGenerator which creates code for the given schema * * @param schema * the schema to create the code for * @param schemaPackageName * the package the schema is located in * @param implementationName * the special jgralab package name to use */ public SchemaCodeGenerator(Schema schema, String schemaPackageName, CodeGeneratorConfiguration config) { super(schemaPackageName, "", config); this.schema = schema; rootBlock.setVariable("simpleClassName", schema.getName()); rootBlock.setVariable("simpleImplClassName", schema.getName()); rootBlock.setVariable("baseClassName", "SchemaImpl"); rootBlock.setVariable("isAbstractClass", "false"); rootBlock.setVariable("isClassOnly", "true"); rootBlock.setVariable("isImplementationClassOnly", "false"); } @Override protected CodeBlock createHeader() { addImports("#jgSchemaImplPackage#.#baseClassName#"); addImports("#jgSchemaPackage#.VertexClass"); addImports("#jgSchemaPackage#.EdgeClass"); addImports("#jgImplPackage#.GraphFactoryImpl"); addImports("#jgPackage#.ImplementationType"); addImports("#jgDiskImplPackage#.GraphDatabaseBaseImpl"); + addImports("#jgDiskImplPackage#.CompleteGraphDatabase"); + addImports("java.net.UnknownHostException"); addImports("java.lang.ref.WeakReference"); CodeSnippet code = new CodeSnippet( true, "/**", " * The schema #simpleClassName# is implemented following the singleton pattern.", " * To get the instance, use the static method <code>instance()</code>.", " */", "public class #simpleClassName# extends #baseClassName# {"); return code; } @Override protected CodeBlock createBody() { CodeList code = new CodeList(); if (currentCycle.isClassOnly()) { code.add(createVariables()); code.add(createConstructor()); code.add(createGraphFactoryMethod()); } return code; } @Override protected CodeBlock createFooter() { CodeList footer = new CodeList(); // override equals and hashCode methods footer.add(new CodeSnippet("", "@Override", "public boolean equals(Object o) {", "\treturn super.equals(o);", "}")); footer.add(new CodeSnippet("", "@Override", "public int hashCode() {", "\treturn super.hashCode();", "}")); footer.addNoIndent(super.createFooter()); return footer; } private CodeBlock createGraphFactoryMethod() { addImports("#jgPackage#.Graph", "#jgPackage#.ProgressFunction", "#jgPackage#.GraphIO", "#jgPackage#.GraphIOException"); if (config.hasDatabaseSupport()) { addImports("#jgPackage#.GraphException"); } CodeSnippet code = new CodeSnippet( true, "/**", " * Creates a new #gcName# graph with initial vertex and edge counts <code>vMax</code>, <code>eMax</code>.", " *", " * @param vMax initial vertex count", " * @param eMax initial edge count", "*/", "public #gcName# create#gcCamelName#InMem(int vMax, int eMax) {", "\treturn (#gcCamelName#) graphFactory.createGraphInMemoryStorage(#gcCamelName#.class, GraphFactoryImpl.generateUniqueGraphId(), vMax, eMax);", "}", "", "/**", " * Creates a new #gcName# graph with the ID <code>id</code> initial vertex and edge counts <code>vMax</code>, <code>eMax</code>.", " *", " * @param id the id name of the new graph", " * @param vMax initial vertex count", " * @param eMax initial edge count", " */", "public #gcName# create#gcCamelName#InMem(String id, int vMax, int eMax) {", "\treturn (#gcCamelName#) graphFactory.createGraphInMemoryStorage(#gcCamelName#.class, id, vMax, eMax);", "}", "", "/**", " * Creates a new #gcName# graph.", "*/", "public #gcName# create#gcCamelName#InMem() {", "\treturn (#gcCamelName#) graphFactory.createGraphInMemoryStorage(#gcCamelName#.class, GraphFactoryImpl.generateUniqueGraphId());", "}", "", "/**", " * Creates a new #gcName# graph with the ID <code>id</code>.", " *", " * @param id the id name of the new graph", " */", "public #gcName# create#gcCamelName#InMem(String id) {", "\treturn (#gcCamelName#) graphFactory.createGraphInMemoryStorage(#gcCamelName#.class, id);", "}", "", // ---- disk bases storage support ---- "/**", " * Creates a new #gcName# graph using disk based storage. To be called only by the graph database class!", " *", "*/", "public #gcName# create#gcCamelName#OnDisk(String uniqueGraphId, long subgraphId, GraphDatabaseBaseImpl graphDb) {", "\treturn (#gcCamelName#) graphFactory.createGraphDiskBasedStorage(#gcCamelName#.class, uniqueGraphId, subgraphId, graphDb);", "}", "", "/**", " * Creates a new #gcName# graph using disk based storage. This method should be called by a user to create a " + - " * new #gcName#-graph instance.", + " * new #gcName#-graph instance. The local hostname is detected automatically", " *", "*/", "public #gcName# create#gcCamelName#OnDisk() {", "\tString uniqueGraphId = GraphFactoryImpl.generateUniqueGraphId();", + "\tString hostname = null;", + "\ttry {", + "\t\thostname = InetAddress.getLocalHost().getHostAddress();", + "\t} catch (UnknownHostException ex) {", + "\t\tthrow new RuntimeException(ex);", + "\t}", + "\tlong subgraphId = GraphDatabaseBaseImpl.GLOBAL_GRAPH_ID;", + "\tGraphDatabaseBaseImpl graphDb = new CompleteGraphDatabase(this, uniqueGraphId, hostname);", + "\treturn (#gcCamelName#) graphFactory.createGraphDiskBasedStorage(#gcCamelName#.class, uniqueGraphId, subgraphId, graphDb);", + "}", + "", + "/**", + " * Creates a new #gcName# graph using disk based storage. This method should be called by a user to create a " + + " * new #gcName#-graph instance.", + " * @param hostAddress the address or resolvable hostname of the local host", + " *", + "*/", + "public #gcName# create#gcCamelName#OnDisk(String localHostAddress) {", + "\tString uniqueGraphId = GraphFactoryImpl.generateUniqueGraphId();", "\tlong subgraphId = GraphDatabaseBaseImpl.GLOBAL_GRAPH_ID;", - "\tGraphDabaseBaseImpl = new GraphDatabaseBaseImpl(this, uniqueGraphId, 0, subgraphId);", + "\tGraphDatabaseBaseImpl graphDb = new CompleteGraphDatabase(this, uniqueGraphId, localHostAddress);", "\treturn (#gcCamelName#) graphFactory.createGraphDiskBasedStorage(#gcCamelName#.class, uniqueGraphId, subgraphId, graphDb);", "}", "", // "/**", // " * Creates a new #gcName# graph with savemem support with the ID <code>id</code> initial vertex and edge counts <code>vMax</code>, <code>eMax</code>.", // " *", // " * @param id the id name of the new graph", // " * @param vMax initial vertex count", // " * @param eMax initial edge count", // " */", // "public #gcName# create#gcCamelName#Proxy(String uniqueGraphId, long subgraphId, GraphDatabaseBaseImpl graphDb, RemoteGraphDatabase remoteGraphDb) {", // "\treturn (#gcCamelName#) graphFactory.createGraphDiskBasedStorage(#gcCamelName#.class, uniqueGraphId, subgraphId, graphDb, remoteGraphDb);", // "}", // ---- file handling methods ---- "/**", " * Loads a #gcName# graph from the file <code>filename</code>.", " *", " * @param filename the name of the file", " * @return the loaded #gcName#", " * @throws GraphIOException if the graph cannot be loaded", " */", "public #gcName# load#gcCamelName#(String filename, ImplementationType implType) throws GraphIOException {", "\treturn load#gcCamelName#(filename, implType, null);", "}", "", "/**", " * Loads a #gcName# graph from the file <code>filename</code> usign the in-memory storage.", " *", " * @param filename the name of the file", " * @param pf a progress function to monitor graph loading", " * @return the loaded #gcName#", " * @throws GraphIOException if the graph cannot be loaded", " */", "public #gcName# load#gcCamelName#(String filename, ImplementationType implType, ProgressFunction pf) throws GraphIOException {", - "\tGraph graph = GraphIO.loadGraphFromFile(filename, this, pf, type);\n" + "\tGraph graph = GraphIO.loadGraphFromFile(filename, this, pf, implType);\n" + "\tif (!(graph instanceof #gcName#)) {\n" + "\t\tthrow new GraphIOException(\"Graph in file '\" + filename + \"' is not an instance of GraphClass #gcName#\");\n" + "\t}" + "\treturn (#gcName#) graph;\n", "}", "" ); code.setVariable("gcName", schema.getGraphClass().getQualifiedName()); code.setVariable("gcCamelName", camelCase(schema.getGraphClass() .getQualifiedName())); code.setVariable("gcImplName", schema.getGraphClass() .getQualifiedName() + "Impl"); + addImports("java.net.InetAddress"); return code; } private CodeBlock createConstructor() { CodeList code = new CodeList(); code .addNoIndent(new CodeSnippet( true, "/**", " * the weak reference to the singleton instance", " */", "static WeakReference<#simpleClassName#> theInstance = new WeakReference<#simpleClassName#>(null);", "", "/**", " * @return the singleton instance of #simpleClassName#", " */", "public static #simpleClassName# instance() {", "\t#simpleClassName# s = theInstance.get();", "\tif (s != null) {", "\t\treturn s;", "\t}", "\tsynchronized (#simpleClassName#.class) {", "\t\ts = theInstance.get();", "\t\tif (s != null) {", "\t\t\treturn s;", "\t\t}", "\t\ts = new #simpleClassName#();", "\t\ttheInstance = new WeakReference<#simpleClassName#>(s);", "\t}", "\treturn s;", "}", "", "/**", " * Creates a #simpleClassName# and builds its schema classes.", " * This constructor is private. Use the <code>instance()</code> method", " * to acess the schema.", " */", "private #simpleClassName#() {", "\tsuper(\"#simpleClassName#\", \"#schemaPackage#\");")); code.add(createEnumDomains()); code.add(createCompositeDomains()); code.add(createGraphClass()); code.add(createPackageComments()); addImports("#schemaPackage#.#simpleClassName#Factory"); code.add(new CodeSnippet(true, "graphFactory = new #simpleClassName#Factory();")); code.addNoIndent(new CodeSnippet(true, "}")); return code; } private CodeBlock createPackageComments() { CodeList code = new CodeList(); Package pkg = schema.getDefaultPackage(); Stack<Package> s = new Stack<Package>(); s.push(pkg); boolean hasComment = false; while (!s.isEmpty()) { pkg = s.pop(); for (Package sub : pkg.getSubPackages().values()) { s.push(sub); } List<String> comments = pkg.getComments(); if (comments.isEmpty()) { continue; } if (!hasComment) { code.addNoIndent(new CodeSnippet(true, "{")); hasComment = true; } if (comments.size() == 1) { code.add(new CodeSnippet("getPackage(\"" + pkg.getQualifiedName() + "\").addComment(\"" + stringQuote(comments.get(0)) + "\");")); } else { int n = 0; code.add(new CodeSnippet("getPackage(\"" + pkg.getQualifiedName() + "\").addComment(")); for (String comment : comments) { code.add(new CodeSnippet("\t\"" + stringQuote(comment) + "\"" + (++n == comments.size() ? ");" : ","))); } } } if (hasComment) { code.addNoIndent(new CodeSnippet(false, "}")); } return code; } private CodeBlock createGraphClass() { GraphClass gc = schema.getGraphClass(); CodeList code = new CodeList(); addImports("#jgSchemaPackage#.GraphClass"); code.setVariable("gcName", gc.getQualifiedName()); code.setVariable("gcVariable", "gc"); code.setVariable("aecVariable", "gc"); code.setVariable("schemaVariable", gc.getVariableName()); code.setVariable("gcAbstract", gc.isAbstract() ? "true" : "false"); code.addNoIndent(new CodeSnippet( true, "{", "\tGraphClass #gcVariable# = #schemaVariable# = createGraphClass(\"#gcName#\");", "\t#gcVariable#.setAbstract(#gcAbstract#);")); code.add(createAttributes(gc)); code.add(createConstraints(gc)); code.add(createComments("gc", gc)); code.add(createVertexClasses(gc)); code.add(createEdgeClasses(gc)); code.add(createIncidenceClasses(gc)); code.addNoIndent(new CodeSnippet(false, "}")); return code; } private CodeBlock createComments(String variableName, NamedElementClass ne) { CodeList code = new CodeList(); code.setVariable("namedElement", variableName); for (String comment : ne.getComments()) { code.addNoIndent(new CodeSnippet("#namedElement#.addComment(" + GraphIO.toUtfString(comment) + ");")); } return code; } private CodeBlock createVariables() { CodeList code = new CodeList(); code.addNoIndent(new CodeSnippet("public final GraphClass " + schema.getGraphClass().getVariableName() + ";")); for (VertexClass vc : schema.getVertexClassesInTopologicalOrder()) { if (!vc.isInternal()) { code.addNoIndent(new CodeSnippet("public final VertexClass " + vc.getVariableName() + ";")); } } for (EdgeClass ec : schema.getEdgeClassesInTopologicalOrder()) { if (!ec.isInternal()) { if (ec.isBinary()) { addImports("#jgSchemaPackage#.BinaryEdgeClass"); code.addNoIndent(new CodeSnippet("public final BinaryEdgeClass " + ec.getVariableName() + ";")); } else { code.addNoIndent(new CodeSnippet("public final EdgeClass " + ec.getVariableName() + ";")); } } } for (IncidenceClass ic : schema.getIncidenceClassesInTopologicalOrder()) { if (!ic.isInternal()) { code.addNoIndent(new CodeSnippet("public final IncidenceClass " + ic.getVariableName() + ";")); } } return code; } private CodeBlock createIncidenceClass(IncidenceClass ic) { CodeList code = new CodeList(); addImports("#jgSchemaPackage#.IncidenceClass"); addImports("#jgSchemaPackage#.IncidenceType"); addImports("#jgPackage#.Direction"); code.setVariable("icName", ic.getQualifiedName()); code.setVariable("schemaVariable", ic.getVariableName()); code.setVariable("icVariable", "ic"); code.setVariable("icEdgeClass", ic.getEdgeClass().getQualifiedName()); code.setVariable("icVertexClass", ic.getVertexClass().getQualifiedName()); code.setVariable("icAbstract", ic.isAbstract() ? "true" : "false"); code.setVariable("icRoleName", ic.getRolename() != null ? ic.getRolename() : ""); code.setVariable("dir", ic.getDirection().toString()); code.setVariable("schemaVariable", ic.getVariableName()); code.setVariable("incidenceType", ic.getIncidenceType().toString()); code.setVariable("minEdgesAtVertex", Integer.toString(ic.getMinEdgesAtVertex())); code.setVariable("minVerticesAtEdge", Integer.toString(ic.getMinVerticesAtEdge())); code.setVariable("maxEdgesAtVertex", Integer.toString(ic.getMaxEdgesAtVertex())); code.setVariable("maxVerticesAtEdge", Integer.toString(ic.getMaxVerticesAtEdge())); code.addNoIndent(new CodeSnippet( true, "{", - "\tIncidenceClass #icVariable# = #schemaVariable# = #gcVariable#.createIncidenceClass(", + /*"\tIncidenceClass #icVariable# =*/ "#schemaVariable# = #gcVariable#.createIncidenceClass(", "\t\t#gcVariable#.getEdgeClass(\"#icEdgeClass#\"),", "\t\t#gcVariable#.getVertexClass(\"#icVertexClass#\"),", "\t\t\"#icRoleName#\",#icAbstract#,#minEdgesAtVertex#,#maxEdgesAtVertex#,", "\t\t#minVerticesAtEdge#,#maxVerticesAtEdge#,Direction.#dir#,IncidenceType.#incidenceType#);")); for (IncidenceClass superClass : ic.getDirectSuperClasses()) { if (superClass.isInternal()) { continue; } CodeSnippet s = new CodeSnippet( "#icVariable#.addSuperClass(#superClassName#);"); s.setVariable("superClassName", superClass.getVariableName()); code.add(s); } code.add(createConstraints(ic)); code.add(createComments("ic", ic)); code.addNoIndent(new CodeSnippet("}")); return code; } private CodeBlock createIncidenceClasses(GraphClass gc) { CodeList code = new CodeList(); for (IncidenceClass ic : schema.getIncidenceClassesInTopologicalOrder()) { if (!ic.isInternal()) { code.addNoIndent(createIncidenceClass(ic)); } } return code; } private CodeBlock createVertexClasses(GraphClass gc) { CodeList code = new CodeList(); for (VertexClass vc : schema.getVertexClassesInTopologicalOrder()) { // if (vc.isInternal()) { // CodeSnippet s = new CodeSnippet(); // s.setVariable("schemaVariable", vc.getVariableName()); // s.add("@SuppressWarnings(\"unused\")"); // s.add("VertexClass #schemaVariable# = getDefaultVertexClass();"); // code.addNoIndent(s); // } // else if (!vc.isInternal() && vc.getGraphClass() == gc) { code.addNoIndent(createGraphElementClass(vc, "Vertex")); } } return code; } private CodeBlock createEdgeClasses(GraphClass gc) { CodeList code = new CodeList(); for (EdgeClass ec : schema.getEdgeClassesInTopologicalOrder()) { if (!ec.isInternal() && (ec.getGraphClass() == gc)) { if (ec.isBinary()) { code.addNoIndent(createGraphElementClass(ec, "BinaryEdge")); } else { code.addNoIndent(createGraphElementClass(ec, "Edge")); } } } return code; } /** * Generates the code snippet to create the metaclass gec in the schema as soon as the * schema-impl is loaded. * @param gec the MetaClass to be generated * @param typeName the name of the type of the MetaClass, i.e. Vertex or Edge * @return */ private CodeBlock createGraphElementClass(GraphElementClass<?,?> gec, String typeName ) { CodeList code = new CodeList(); code.setVariable("gecName", gec.getQualifiedName()); code.setVariable("gecVariable", "gec"); code.setVariable("gecType", typeName); code.setVariable("schemaVariable", gec.getVariableName()); code.setVariable("gecAbstract", gec.isAbstract() ? "true" : "false"); code.addNoIndent(new CodeSnippet( true, "{", "\t#gecType#Class #gecVariable# = #schemaVariable# = gc.create#gecType#Class(\"#gecName#\");", "\t#gecVariable#.setAbstract(#gecAbstract#);")); for (GraphElementClass<?,?> superClass : gec.getDirectSuperClasses()) { if (superClass.isInternal()) { continue; } CodeSnippet s = new CodeSnippet( "#gecVariable#.addSuperClass(#superClassName#);"); s.setVariable("superClassName", superClass.getVariableName()); code.add(s); } code.add(createAttributes(gec)); code.add(createConstraints(gec)); code.add(createComments("gec", gec)); code.addNoIndent(new CodeSnippet("}")); return code; } private CodeBlock createAttributes(AttributedElementClass<?, ?> aec) { CodeList code = new CodeList(); for (Attribute attr : aec.getOwnAttributeList()) { CodeSnippet s = new CodeSnippet( false, "#gecVariable#.addAttribute(createAttribute(\"#attrName#\", getDomain(\"#domainName#\"), getAttributedElementClass(\"#aecName#\"), #defaultValue#));"); s.setVariable("attrName", attr.getName()); s.setVariable("domainName", attr.getDomain().getQualifiedName()); s.setVariable("aecName", aec.getQualifiedName()); if (attr.getDefaultValueAsString() == null) { s.setVariable("defaultValue", "null"); } else { s.setVariable("defaultValue", "\"" + attr.getDefaultValueAsString().replaceAll("([\\\"])", "\\\\$1") + "\""); } code.addNoIndent(s); } return code; } private CodeBlock createConstraints(TypedElementClass<?, ?> aec) { CodeList code = new CodeList(); for (Constraint constraint : aec.getConstraints()) { addImports("#jgSchemaImplPackage#.ConstraintImpl"); CodeSnippet constraintSnippet = new CodeSnippet(false); constraintSnippet .add("#aecVariable#.addConstraint(" + "new ConstraintImpl(#message#, #predicate#, #offendingElements#));"); constraintSnippet.setVariable("message", "\"" + stringQuote(constraint.getMessage()) + "\""); constraintSnippet.setVariable("predicate", "\"" + stringQuote(constraint.getPredicate()) + "\""); if (constraint.getOffendingElementsQuery() != null) { constraintSnippet.setVariable("offendingElements", "\"" + stringQuote(constraint.getOffendingElementsQuery()) + "\""); } else { constraintSnippet.setVariable("offendingElements", "null"); } code.addNoIndent(constraintSnippet); } return code; } private CodeBlock createEnumDomains() { CodeList code = new CodeList(); for (EnumDomain dom : schema.getEnumDomains()) { CodeSnippet s = new CodeSnippet(true); s.setVariable("domName", dom.getQualifiedName()); code.addNoIndent(s); addImports("#jgSchemaPackage#.EnumDomain"); s.add("{", "\tEnumDomain dom = createEnumDomain(\"#domName#\");"); for (String c : dom.getConsts()) { s.add("\tdom.addConst(\"" + c + "\");"); } code.add(createComments("dom", dom)); code.addNoIndent(new CodeSnippet("}")); } return code; } private CodeBlock createCompositeDomains() { CodeList code = new CodeList(); for (CompositeDomain dom : schema .getCompositeDomainsInTopologicalOrder()) { CodeSnippet s = new CodeSnippet(true); s.setVariable("domName", dom.getQualifiedName()); code.addNoIndent(s); if (dom instanceof ListDomain) { s.setVariable("componentDomainName", ((ListDomain) dom) .getBaseDomain().getQualifiedName()); s .add("createListDomain(getDomain(\"#componentDomainName#\"));"); } else if (dom instanceof SetDomain) { s.setVariable("componentDomainName", ((SetDomain) dom) .getBaseDomain().getQualifiedName()); s.add("createSetDomain(getDomain(\"#componentDomainName#\"));"); } else if (dom instanceof MapDomain) { MapDomain mapDom = (MapDomain) dom; s.setVariable("keyDomainName", mapDom.getKeyDomain() .getQualifiedName()); s.setVariable("valueDomainName", mapDom.getValueDomain() .getQualifiedName()); s .add("createMapDomain(getDomain(\"#keyDomainName#\"), getDomain(\"#valueDomainName#\"));"); } else if (dom instanceof RecordDomain) { addImports("#jgSchemaPackage#.RecordDomain"); s .add("{", "\tRecordDomain dom = createRecordDomain(\"#domName#\");"); RecordDomain rd = (RecordDomain) dom; for (RecordComponent c : rd.getComponents()) { s.add("\tdom.addComponent(\"" + c.getName() + "\", getDomain(\"" + c.getDomain().getQualifiedName() + "\"));"); } code.add(createComments("dom", rd)); code.addNoIndent(new CodeSnippet("}")); } else { throw new RuntimeException("FIXME!"); // never reachable } } return code; } }

diff --git a/src/java/cz/zcu/kiv/eegdatabase/logic/controller/group/BookingRoomController.java b/src/java/cz/zcu/kiv/eegdatabase/logic/controller/group/BookingRoomController.java index 89e769a..7c5f28b 100644 --- a/src/java/cz/zcu/kiv/eegdatabase/logic/controller/group/BookingRoomController.java +++ b/src/java/cz/zcu/kiv/eegdatabase/logic/controller/group/BookingRoomController.java @@ -1,204 +1,204 @@ package cz.zcu.kiv.eegdatabase.logic.controller.group; import cz.zcu.kiv.eegdatabase.data.dao.GenericDao; import cz.zcu.kiv.eegdatabase.data.dao.PersonDao; import cz.zcu.kiv.eegdatabase.data.dao.ResearchGroupDao; import cz.zcu.kiv.eegdatabase.data.dao.ReservationDao; import cz.zcu.kiv.eegdatabase.data.pojo.GroupPermissionRequest; import cz.zcu.kiv.eegdatabase.data.pojo.ResearchGroup; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.HierarchicalMessageSource; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.validation.BindException; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; import java.util.Map; public class BookingRoomController extends SimpleFormController { private Log log = LogFactory.getLog(getClass()); private PersonDao personDao; private ResearchGroupDao researchGroupDao; - private ReservationDao reservationDao; + //private ReservationDao reservationDao; private GenericDao<GroupPermissionRequest, Integer> groupPermissionRequestDao; /** * Source of localized messages defined in persistence.xml */ private HierarchicalMessageSource messageSource; /** * Domain from configuration file defined in persistence.xml */ private String domain; private JavaMailSenderImpl mailSender; public BookingRoomController() { setCommandClass(BookRoomCommand.class); setCommandName("bookRoomCommand"); } @Override protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException bindException) throws Exception { BookRoomCommand bookRoomCommand = (BookRoomCommand) command; /* Person user = personDao.getPerson(ControllerUtils.getLoggedUserName()); GroupPermissionRequest gpr = new GroupPermissionRequest(); gpr.setPerson(user); String requestRole = groupRoleCommand.getRole(); gpr.setRequestedPermission(requestRole); gpr.setResearchGroup(researchGroupDao.read(groupRoleCommand.getEditedGroup())); groupPermissionRequestDao.create(gpr); int requestId = gpr.getRequestId(); String userName ="<b>"+ user.getUsername() +"</b>"; String researchGroup ="<b>"+ researchGroupDao.read(groupRoleCommand.getEditedGroup()).getTitle()+"</b>"; String emailAdmin =researchGroupDao.read(groupRoleCommand.getEditedGroup()).getPerson().getEmail(); log.debug("Creating email content"); //Email body is obtained from resource bunde. Url of domain is obtained from //configuration property file defined in persistence.xml //Locale is from request it ensures that user obtain localized email according to //his/her browser setting String emailBody = "<html><body>"; emailBody += "<h4>" + messageSource.getMessage("editgrouprole.email.body.hello", null, RequestContextUtils.getLocale(request)) + "</h4>"; emailBody += "<p>" + messageSource.getMessage("editgrouprole.email.body.text.part1", new String[]{userName, researchGroup}, RequestContextUtils.getLocale(request)) + "</p>"; emailBody += "<p>" + messageSource.getMessage("editgrouprole.email.body.text.part2", null, RequestContextUtils.getLocale(request))+"<br/>"; emailBody += "<a href=\"http://" + domain + "/groups/accept-role-request.html?id=" + requestId + "\">" + "http://" + domain + "/groups/accept-role-request.html?id=" + requestId + "" + "</a>" + "</p>"; emailBody += "</body></html>"; log.debug("email body: " + emailBody); log.debug("Composing e-mail message"); MimeMessage message = mailSender.createMimeMessage(); //message.setContent(confirmLink, "text/html"); MimeMessageHelper helper = new MimeMessageHelper(message, true); helper.setTo(emailAdmin); helper.setFrom(messageSource.getMessage("editgrouprole.email.from",null, RequestContextUtils.getLocale(request))); helper.setSubject(messageSource.getMessage("editgrouprole.email.subject",null, RequestContextUtils.getLocale(request))); helper.setText(emailBody, true); try { log.debug("Sending e-mail"); mailSender.send(message); log.debug("E-mail was sent"); } catch (MailException e) { log.debug("E-mail was NOT sent"); e.printStackTrace(); } log.debug("Returning MAV"); ModelAndView mav = new ModelAndView("groups/requestSent"); return mav; */ return null; } @Override protected Map referenceData(HttpServletRequest request) throws Exception { Map map = new HashMap<String, Object>(); List<ResearchGroup> researchGroupList = researchGroupDao.getResearchGroupsWhereAbleToWriteInto(personDao.getLoggedPerson()); ResearchGroup defaultGroup = personDao.getLoggedPerson().getDefaultGroup(); int defaultGroupId = (defaultGroup != null) ? defaultGroup.getResearchGroupId() : 0; map.put("defaultGroupId", defaultGroupId); map.put("researchGroupList", researchGroupList); return map; } public PersonDao getPersonDao() { return personDao; } public void setPersonDao(PersonDao personDao) { this.personDao = personDao; } public ResearchGroupDao getResearchGroupDao() { return researchGroupDao; } public void setResearchGroupDao(ResearchGroupDao researchGroupDao) { this.researchGroupDao = researchGroupDao; } public GenericDao<GroupPermissionRequest, Integer> getGroupPermissionRequestDao() { return groupPermissionRequestDao; } public void setGroupPermissionRequestDao(GenericDao<GroupPermissionRequest, Integer> groupPermissionRequestDao) { this.groupPermissionRequestDao = groupPermissionRequestDao; } public JavaMailSenderImpl getMailSender() { return mailSender; } public void setMailSender(JavaMailSenderImpl mailSender) { this.mailSender = mailSender; } /** * @return the domain */ public String getDomain() { return domain; } /** * @param domain the domain to set */ public void setDomain(String domain) { this.domain = domain; } /** * @return the messageSource */ public HierarchicalMessageSource getMessageSource() { return messageSource; } /** * @param messageSource the messageSource to set */ public void setMessageSource(HierarchicalMessageSource messageSource) { this.messageSource = messageSource; } - + /* public ReservationDao getReservationDao() { return reservationDao; } public void setReservationDao(ReservationDao reservationDao) { this.reservationDao = reservationDao; - } + } */ }

diff --git a/code/src/vms/gui/AlertPanel.java b/code/src/vms/gui/AlertPanel.java index 6d659ff..724dab2 100644 --- a/code/src/vms/gui/AlertPanel.java +++ b/code/src/vms/gui/AlertPanel.java @@ -1,55 +1,57 @@ package vms.gui; import java.awt.Color; +import java.awt.Dimension; import java.awt.Graphics2D; import javax.swing.JLabel; import javax.swing.JPanel; import vms.*; import vms.Alert.AlertType; import common.*; import java.awt.Graphics; import java.util.ArrayList; import java.util.List; public class AlertPanel extends JPanel { private List<Alert> _Alerts; public AlertPanel() { _Alerts = new ArrayList<Alert>(); + this.setMaximumSize(new Dimension(280, 140)); } public void update(final List<Alert> alerts) { _Alerts = alerts; this.repaint(); } public void paintComponent(Graphics g) { Graphics2D g2 = (Graphics2D)g; super.paintComponent(g); int wWidth = 140; int wHeight = 140; Alert worstAlert = null; for (Alert a : _Alerts) { if (worstAlert == null || a.getType() == AlertType.HIGHRISK) { worstAlert = a; break; } } // Draw circle green if none of the if statements are active g2.setColor(Color.green); // Draws circles around the ships; adds color if there is a high-risk or low-risk alert if (worstAlert != null && worstAlert.getType() == AlertType.HIGHRISK) g2.setColor(Color.red); if (worstAlert != null && worstAlert.getType() == AlertType.LOWRISK) g2.setColor(Color.yellow); - g2.fillOval(wWidth/2, wHeight/2, wWidth, wHeight); + g2.fillOval(0, 0, wWidth, wHeight); } } \ No newline at end of file diff --git a/code/src/vms/gui/RadarDisplay.java b/code/src/vms/gui/RadarDisplay.java index d6e4533..8fe0f7f 100644 --- a/code/src/vms/gui/RadarDisplay.java +++ b/code/src/vms/gui/RadarDisplay.java @@ -1,126 +1,126 @@ package vms.gui; import java.awt.BorderLayout; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.swing.BoxLayout; import javax.swing.JFrame; import javax.swing.JTabbedPane; import javax.swing.JPanel; import common.Vessel; import common.Vessel.VesselType; import vms.*; public class RadarDisplay implements WindowListener { private final String VIEW[] = { "Table view", "Map view"}; MainGUI _Main; JFrame _Frame; JPanel _LeftPane; FilterPanel _FilterPanel; TablePanel _TablePanel; MapPanel _MapPanel; JTabbedPane _TabbedPane; AlertPanel _AlertPanel; MainGUI.UserIdentity _CurrentIdentity; public RadarDisplay(MainGUI main) { _Main = main; _Frame = new JFrame("Vessel Monitoring System"); _Frame.addWindowListener(this); _Frame.setSize(700,600); _Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); _FilterPanel = new FilterPanel(); _AlertPanel = new AlertPanel(); _TablePanel = new TablePanel(); _MapPanel = new MapPanel(); _LeftPane = new JPanel(); _TabbedPane = new JTabbedPane(); _TabbedPane.add(_TablePanel, VIEW[0]); _TabbedPane.add(_MapPanel,VIEW[1]); - _LeftPane.setLayout(new BoxLayout(_LeftPane, BoxLayout.LINE_AXIS)); + _LeftPane.setLayout(new BoxLayout(_LeftPane, BoxLayout.Y_AXIS)); _LeftPane.add(_AlertPanel); _LeftPane.add(_FilterPanel); _Frame.setJMenuBar(new MenuBar(_Frame)); _Frame.add(_LeftPane, BorderLayout.WEST); _Frame.add(_TabbedPane, BorderLayout.CENTER); } public void show(MainGUI.UserIdentity identity) { _CurrentIdentity = identity; if (_CurrentIdentity == MainGUI.UserIdentity.NORMAL_USER) { _FilterPanel.setVisible(false); } else { _FilterPanel.setVisible(true); } _TablePanel.changeIdentity(identity); _Frame.setVisible(true); } public void refresh(List<Alert> alerts, List<Vessel> vessels) { vessels = filterData(vessels); _TablePanel.update(alerts, vessels); _MapPanel.update(alerts, vessels); _AlertPanel.update(alerts); } public List<Vessel> filterData(List<Vessel> vessels) { if (_CurrentIdentity == MainGUI.UserIdentity.NORMAL_USER) { return vessels; //No filtering } List<Vessel> copy = new ArrayList<Vessel>(); Map<VesselType, Boolean> filters = _FilterPanel.getActiveFilters(); for (Vessel v : vessels) { if (filters.get(v.getType())) copy.add(v); } return vessels; } @Override public void windowActivated(WindowEvent e) { // TODO Auto-generated method stub } @Override public void windowClosed(WindowEvent e) { // TODO Auto-generated method stub } @Override public void windowClosing(WindowEvent e) { _Main.stopServer(); } @Override public void windowDeactivated(WindowEvent e) { // TODO Auto-generated method stub } @Override public void windowDeiconified(WindowEvent e) { // TODO Auto-generated method stub } @Override public void windowIconified(WindowEvent e) { // TODO Auto-generated method stub } @Override public void windowOpened(WindowEvent e) { // TODO Auto-generated method stub } }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java index 40a1358a8..20eb90b7d 100644 --- a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java +++ b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java @@ -1,105 +1,107 @@ /* * Copyright 2010-2011 Ning, Inc. * * Ning licenses this file to you 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 com.ning.billing.account.dao; import com.ning.billing.account.api.Account; import com.ning.billing.account.api.user.AccountBuilder; import com.ning.billing.catalog.api.Currency; import com.ning.billing.util.UuidMapper; import com.ning.billing.util.entity.EntityDao; import org.skife.jdbi.v2.SQLStatement; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.sqlobject.Bind; import org.skife.jdbi.v2.sqlobject.Binder; import org.skife.jdbi.v2.sqlobject.BinderFactory; import org.skife.jdbi.v2.sqlobject.BindingAnnotation; import org.skife.jdbi.v2.sqlobject.SqlQuery; import org.skife.jdbi.v2.sqlobject.SqlUpdate; import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper; import org.skife.jdbi.v2.sqlobject.mixins.Transactional; import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier; import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3; import org.skife.jdbi.v2.tweak.ResultSetMapper; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; import java.util.UUID; @ExternalizedSqlViaStringTemplate3 @RegisterMapper({UuidMapper.class, AccountSqlDao.AccountMapper.class}) public interface AccountSqlDao extends EntityDao<Account>, Transactional<AccountSqlDao>, Transmogrifier { @SqlQuery public Account getAccountByKey(@Bind("externalKey") final String key); @SqlQuery public UUID getIdFromKey(@Bind("externalKey") final String key); @Override @SqlUpdate public void save(@AccountBinder Account account); public static class AccountMapper implements ResultSetMapper<Account> { @Override public Account map(int index, ResultSet result, StatementContext context) throws SQLException { UUID id = UUID.fromString(result.getString("id")); String externalKey = result.getString("external_key"); String email = result.getString("email"); String name = result.getString("name"); int firstNameLength = result.getInt("first_name_length"); String phone = result.getString("phone"); int billingCycleDay = result.getInt("billing_cycle_day"); - Currency currency = Currency.valueOf(result.getString("currency")); + String currencyString = result.getString("currency"); + Currency currency = (currencyString == null) ? null : Currency.valueOf(currencyString); String paymentProviderName = result.getString("payment_provider_name"); return new AccountBuilder(id).externalKey(externalKey).email(email) .name(name).firstNameLength(firstNameLength) .phone(phone).currency(currency) .billingCycleDay(billingCycleDay) .paymentProviderName(paymentProviderName) .build(); } } @BindingAnnotation(AccountBinder.AccountBinderFactory.class) @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.PARAMETER}) public @interface AccountBinder { public static class AccountBinderFactory implements BinderFactory { public Binder build(Annotation annotation) { return new Binder<AccountBinder, Account>() { public void bind(SQLStatement q, AccountBinder bind, Account account) { q.bind("id", account.getId().toString()); q.bind("externalKey", account.getExternalKey()); q.bind("email", account.getEmail()); q.bind("name", account.getName()); q.bind("firstNameLength", account.getFirstNameLength()); q.bind("phone", account.getPhone()); - q.bind("currency", account.getCurrency().toString()); + Currency currency = account.getCurrency(); + q.bind("currency", (currency == null) ? null : currency.toString()); q.bind("billingCycleDay", account.getBillCycleDay()); q.bind("paymentProviderName", account.getPaymentProviderName()); } }; } } } }

diff --git a/src/main/java/eu/europeana/portal2/web/presentation/model/SearchPage.java b/src/main/java/eu/europeana/portal2/web/presentation/model/SearchPage.java index d9b942df..d538ae6c 100644 --- a/src/main/java/eu/europeana/portal2/web/presentation/model/SearchPage.java +++ b/src/main/java/eu/europeana/portal2/web/presentation/model/SearchPage.java @@ -1,429 +1,429 @@ /* * Copyright 2007-2012 The Europeana Foundation * * Licenced under the EUPL, Version 1.1 (the "Licence") and subsequent versions as approved * by the European Commission; * You may not use this work except in compliance with the Licence. * * You may obtain a copy of the Licence at: * http://joinup.ec.europa.eu/software/page/eupl * * Unless required by applicable law or agreed to in writing, software distributed under * the Licence is distributed on an "AS IS" basis, without warranties or conditions of * any kind, either express or implied. * See the Licence for the specific language governing permissions and limitations under * the Licence. */ package eu.europeana.portal2.web.presentation.model; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import eu.europeana.portal2.web.presentation.Configuration; import eu.europeana.portal2.web.presentation.PortalLanguage; import eu.europeana.portal2.web.presentation.PortalPageInfo; import eu.europeana.portal2.web.presentation.SearchPageEnum; import eu.europeana.portal2.web.presentation.model.preparation.SearchPreparation; import eu.europeana.portal2.web.presentation.utils.UrlBuilder; public class SearchPage extends SearchPreparation { private final Logger log = Logger.getLogger(getClass().getName()); @Override public boolean isIndexable() { return false; } /** * Formats any url adding in any required addition parameters required for * the brief view page. Useful for embedded version which must keep track of * its configuration * * @param url * - Url to be formatted * @return * @throws UnsupportedEncodingException */ @Override public UrlBuilder getPortalFormattedUrl(UrlBuilder url) { /** * If page is to be embedded into an external site adds the related * attributes to the url */ if (isEmbedded()) { url.addParam("embedded", "true", false); url.addParam("lang", getEmbeddedLang(), true); url.addParam("bt", "sw", false); url.addParam("rswDefqry", getRswDefqry(), false); url.addParam("embeddedBgColor", getEmbeddedBgColor().replace("#", "%23"), false); url.addParam("embeddedForeColor", getEmbeddedForeColor().replace("#", "%23"), false); url.addParam("embeddedLogo", getEmbeddedLogo(), false); url.addParam("rswUserId", getRswUserId(), false); } // remove default values to clean up url... url.removeDefault("view", "table"); // url.removeDefault("start", "1"); // url.removeDefault("startPage", "1"); url.removeDefault("embedded", "false"); return url; } @Override public UrlBuilder enrichFullDocUrl(UrlBuilder builder) throws UnsupportedEncodingException { builder.addParamsFromURL(getBriefBeanView().getPagination().getPresentationQuery().getQueryForPresentation()); builder.addParam("startPage", Integer.toString(getBriefBeanView().getPagination().getStart()), true); builder = getPortalFormattedUrl(builder); if (isEmbedded()) { builder.removeParam("embedded"); builder.removeParam("embeddedBgColor"); builder.removeParam("embeddedForeColor"); builder.removeParam("embeddedLogo"); } return builder; } @Override public String getPageTitle() { if (StringUtils.isNotBlank(getQuery())) { StringBuilder sb = new StringBuilder(); sb.append(getQuery()); sb.append(" - "); sb.append(super.getPageTitle()); return sb.toString(); } return super.getPageTitle(); } /** * Generates the url for the map kml link to show the results on the map * * @param portalName * - name of the portal * @return - Mapview url */ public String getMapKmlUrl() throws UnsupportedEncodingException { return StringUtils.replace( getPortalFormattedUrl( getViewUrl(PortalPageInfo.SEARCH_KML.getPageName())) .toString(), "&amp;", "&"); } /** * Generates the url for the map json link to show the results on the map * * @param portalName * - name of the portal * @return - Mapview url */ public String getMapJsonUrl() throws UnsupportedEncodingException { UrlBuilder url = getPortalFormattedUrl(getViewUrl(PortalPageInfo.MAP_JSON .getPageName())); if (coords != null) { url.addParam("coords", coords, true); } return StringUtils.replace(url.toString(), "&amp;", "&"); } /** * Returns the URL to navigate back to the previous page of results * * @param viewType * - How to display the results * @return - The URL to navigate back to the previous page of results * @throws UnsupportedEncodingException */ public String getNextPageUrl() throws UnsupportedEncodingException { return createNavigationUrl(briefBeanView.getPagination().getNextPage()); } /** * Returns the URL to go back to the previous page of results * * @param viewType * - What format the view should be displayed in * @return - URL to go back to previous page of results * @throws UnsupportedEncodingException */ public String getPreviousPageUrl() throws UnsupportedEncodingException { return createNavigationUrl(briefBeanView.getPagination().getPreviousPage()); } /** * Returns the URL to navigate to the first page of results * * @param viewType * - How to display the results * @return - The URL to navigate back to the previous page of results * @throws UnsupportedEncodingException */ public String getFirstPageUrl() throws UnsupportedEncodingException { return createNavigationUrl(briefBeanView.getPagination().getFirstPage()); } /** * Returns the URL to navigate to the last page of results * * @param viewType * - How to display the results * @return - The URL to navigate back to the previous page of results * @throws UnsupportedEncodingException */ public String getLastPageUrl() throws UnsupportedEncodingException { - return createNavigationUrl(briefBeanView.getPagination().getLastPage()); + return createNavigationUrl(briefBeanView.getPagination().getLastPage() + 1); } /** * Creates the navigation URL (first, last, prev, next) * * @param start * The start parameter * @return * The URL of the page * @throws UnsupportedEncodingException */ private String createNavigationUrl(int start) throws UnsupportedEncodingException { if (briefBeanView == null) { return null; } UrlBuilder builder = createSearchUrl(getQuery(), getRefinements(), Integer.toString(start)); builder.addParam("rows", Integer.toString(getRows()), true); builder.addParamsFromURL( briefBeanView.getPagination().getPresentationQuery().getQueryForPresentation(), "query", "qf", "start", "rows"); return getPortalFormattedUrl(builder).toString(); } public int getNumberOfPages(){ if (briefBeanView == null) { return 0; } return briefBeanView.getPagination().getNumberOfPages(); } public int getPageNumber(){ if (briefBeanView == null) { return 0; } return briefBeanView.getPagination().getPageNumber(); } public List<String> getProvidersForInclusion() { List<String> providersForInclusion = new ArrayList<String>(); if (getRefinements() != null) { for (String provider : getRefinements()) { if (provider.contains("PROVIDER:")) { providersForInclusion.add(provider); } } } return providersForInclusion; } /** * Returns the url used by the refine search box * * @param portalName * @return * @throws Exception */ public String getRefineSearchUrl() throws Exception { StringBuilder url = new StringBuilder(); url.append("/").append(getPageName()).append("/search.html"); UrlBuilder builder = new UrlBuilder(url.toString()); return getPortalFormattedUrl(builder).toString(); } /** * Generates the url for the mapview link to show the results on the map * * @param portalName * - name of the portal * @return - Mapview url */ public String getViewUrlMap() throws UnsupportedEncodingException { return getPortalFormattedUrl( getViewUrl(PortalPageInfo.MAP.getPageName())).toString(); } public String getViewUrlTable() throws UnsupportedEncodingException { return getPortalFormattedUrl( getViewUrl(PortalPageInfo.SEARCH_HTML.getPageName())) .toString(); } public String getJsonUrlMap() throws UnsupportedEncodingException { return StringUtils.replace( getPortalFormattedUrl( getViewUrl(PortalPageInfo.MAP_JSON.getPageName())) .toString(), "&amp;", "&"); } public String getQueryForPresentation() { if (briefBeanView == null) { return null; } return briefBeanView.getPagination().getPresentationQuery() .getQueryForPresentation(); } /** * Generates the url for the timeline link to show the results on the * timeline * * @param portalName * - name of the portal * @return - Timeline url */ public String getViewUrlTimeline() throws UnsupportedEncodingException { return getPortalFormattedUrl(getViewUrl(PortalPageInfo.TIMELINE.getPageName())).toString(); } public String getJsonUrlTimeline() throws UnsupportedEncodingException { return StringUtils.replace( getPortalFormattedUrl( getViewUrl(PortalPageInfo.TIMELINE_JSON.getPageName()) ).toString(), "&amp;", "&"); } public boolean isShowTimeLine() { boolean startsWithEuropeanaUri = true; if (getQuery().length() >= 14) { startsWithEuropeanaUri = !getQuery().substring(0, 14).equals( "europeana_uri:"); } return startsWithEuropeanaUri; } @Override public boolean isShowDidYouMean() { if (isEmbedded() || (getBriefBeanView() == null)) { return false; } if ((getBriefBeanView().getPagination() != null) && (getBriefBeanView().getPagination().getNumFound() > 0)) { return false; } if ((getBriefBeanView().getSpellCheck() != null) && (getBriefBeanView().getSpellCheck().suggestions != null) && !getBriefBeanView().getSpellCheck().correctlySpelled) { return true; } return false; } @Override public String[] getRefinements() { String qf[] = super.getRefinements(); // add refinement keyword to refinement list if needed if (briefBeanView == null && StringUtils.isNotBlank(getRefineKeyword())) { String refine = getRefineKeyword(); String cleanedRefine = refine; // QueryAnalyzer.sanitize(refine); refine = StringUtils.contains(refine, ":") ? cleanedRefine : (StringUtils.startsWith(refine, "-") ? "-text:" : "text:") + cleanedRefine; qf = (String[]) ArrayUtils.add(qf, refine); } return qf; } /** * Generates a url to see the results shown in a specific view. That is a * url to determine how the results should be displayed * * @param portalName * - Name of the portal * @param pageName * - Name of the page * @param viewType * - Which view to use to show the results * @return - Url to show results in specified view */ private UrlBuilder getViewUrl(String pageName) throws UnsupportedEncodingException { String queryForPresentation = null; if (briefBeanView != null) { queryForPresentation = briefBeanView.getPagination().getPresentationQuery().getQueryForPresentation(); } else { if (StringUtils.isNotBlank(getQuery())) { queryForPresentation = "query=" + URLEncoder.encode(getQuery(), "utf8"); } } StringBuilder url = new StringBuilder(); url.append("/").append(getPortalName()).append("/").append(pageName).append("?").append(queryForPresentation); UrlBuilder builder = new UrlBuilder(url.toString()); builder.addParam("start", Integer.toString(getStart()), true); builder.addParam("startPage", Integer.toString(getStartPage()), true); if (briefBeanView == null && getRefinements() != null) { // add refinements back if there is no BriefBeanView available. builder.addParam("qf", getRefinements(), true); } return builder; } @Override public UrlBuilder createSearchUrl(String searchTerm, String[] qf, String start) throws UnsupportedEncodingException { return createSearchUrl(getPortalName(), SearchPageEnum.SEARCH_HTML, searchTerm, qf, start); } public static UrlBuilder createSearchUrl(String portalname, SearchPageEnum returnTo, String searchTerm, String[] qf, String start) throws UnsupportedEncodingException { StringBuilder sb = new StringBuilder(); sb.append("/").append(portalname).append("/") .append(returnTo.getPageInfo().getPageName()); UrlBuilder url = new UrlBuilder(sb.toString()); url.addParam("query", URLEncoder.encode(searchTerm, "UTF-8"), true); if (qf != null) { url.addParam("qf", qf, true); } url.addParam("start", start, true); return url; } public boolean isUGCFilter() { if (getRefinements() != null) { for (String qf : getRefinements()) { if (StringUtils.equalsIgnoreCase(qf, Configuration.FACET_UCG_FILTER)) { return true; } } } return false; } public String getUGCUrl() { UrlBuilder url = new UrlBuilder(getCurrentUrl()); if (isUGCFilter()) { url.removeDefault("qf", Configuration.FACET_UCG_FILTER); } else { url.addMultiParam("qf", Configuration.FACET_UCG_FILTER); } return url.toString(); } public String getImageLocale() { PortalLanguage current = PortalLanguage.safeValueOf(getLocale()); if (!current.hasImageSupport()) { current = PortalLanguage.EN; } return current.getLanguageCode(); } }

diff --git a/src/java/uk/ac/rhul/cs/cl1/ui/NodeSetTableModel.java b/src/java/uk/ac/rhul/cs/cl1/ui/NodeSetTableModel.java index bc09fbf..3cf398d 100644 --- a/src/java/uk/ac/rhul/cs/cl1/ui/NodeSetTableModel.java +++ b/src/java/uk/ac/rhul/cs/cl1/ui/NodeSetTableModel.java @@ -1,222 +1,222 @@ package uk.ac.rhul.cs.cl1.ui; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.table.AbstractTableModel; import uk.ac.rhul.cs.cl1.ClusterONE; import uk.ac.rhul.cs.cl1.FruchtermanReingoldLayoutAlgorithm; import uk.ac.rhul.cs.cl1.Graph; import uk.ac.rhul.cs.cl1.GraphLayoutAlgorithm; import uk.ac.rhul.cs.cl1.NodeSet; /** * Table model that can be used to show a list of {@link NodeSet} objects * in a JTable. * * @author tamas */ public class NodeSetTableModel extends AbstractTableModel { /** Column headers for the simple mode */ String[] simpleHeaders = { "Cluster", "Details" }; /** Column classes for the simple mode */ @SuppressWarnings("unchecked") - Class[] simpleClasses = { Icon.class, NodeSetDetails.class }; + Class[] simpleClasses = { ImageIcon.class, NodeSetDetails.class }; /** Column headers for the detailed mode */ String[] detailedHeaders = { "Cluster", "Nodes", "Density", "In-weight", "Out-weight", "Quality", "P-value" }; /** Column classes for the detailed mode */ @SuppressWarnings("unchecked") Class[] detailedClasses = { - Icon.class, Integer.class, Double.class, Double.class, Double.class, Double.class, + ImageIcon.class, Integer.class, Double.class, Double.class, Double.class, Double.class, Double.class }; /** Column headers for the current mode */ String[] currentHeaders = null; /** Column classes for the current mode */ @SuppressWarnings("unchecked") Class[] currentClasses = null; /** * The list of {@link NodeSet} objects shown in this model */ protected List<NodeSet> nodeSets = null; /** * The list of rendered cluster graphs for all the {@link NodeSet} objects shown in this model */ protected List<Future<Icon>> nodeSetIcons = new ArrayList<Future<Icon>>(); /** * The list of {@link NodeSetDetails} objects to avoid having to calculate * the Details column all the time */ protected List<NodeSetDetails> nodeSetDetails = new ArrayList<NodeSetDetails>(); /** * Whether the model is in detailed mode or simple mode * * In the simple mode, only two columns are shown: the cluster members * and some basic properties (in a single column). In the detailed mode, * each property has its own column */ boolean detailedMode = true; /** * Icon showing a circular progress indicator. Loaded on demand from resources. */ private Icon progressIcon = null; /** * Internal class that represents the task that renders the cluster in the result table */ private class RendererTask extends FutureTask<Icon> { int rowIndex; public RendererTask(int rowIndex, Graph subgraph, GraphLayoutAlgorithm algorithm) { super(new GraphRenderer(subgraph, algorithm)); this.rowIndex = rowIndex; } protected void done() { fireTableCellUpdated(rowIndex, 0); } } /** * Constructs a new table model backed by the given list of nodesets */ public NodeSetTableModel(List<NodeSet> nodeSets) { this.nodeSets = new ArrayList<NodeSet>(nodeSets); updateNodeSetDetails(); this.setDetailedMode(false); } public int getColumnCount() { return currentHeaders.length; } public int getRowCount() { return nodeSets.size(); } @Override @SuppressWarnings("unchecked") public Class getColumnClass(int col) { return currentClasses[col]; } @Override public String getColumnName(int col) { return currentHeaders[col]; } public Object getValueAt(int row, int col) { NodeSet nodeSet = this.nodeSets.get(row); if (nodeSet == null) return null; if (col == 0) { /* Check whether we have a rendered image or not */ try { Future<Icon> icon = nodeSetIcons.get(row); if (icon != null && icon.isDone()) return icon.get(); } catch (InterruptedException ex) { ex.printStackTrace(); } catch (ExecutionException ex) { ex.printStackTrace(); } return this.getProgressIcon(); } if (!detailedMode) { /* Simple mode, column 1 */ return this.nodeSetDetails.get(row); } /* Detailed mode */ if (col == 1) return nodeSet.size(); if (col == 2) return nodeSet.getDensity(); if (col == 3) return nodeSet.getTotalInternalEdgeWeight(); if (col == 4) return nodeSet.getTotalBoundaryEdgeWeight(); if (col == 5) return nodeSet.getQuality(); if (col == 6) return nodeSet.getSignificance(); return "TODO"; } /** * Returns an icon showing a progress indicator */ private Icon getProgressIcon() { if (this.progressIcon == null) { this.progressIcon = new ImageIcon(this.getClass().getResource("../resources/wait.jpg")); } return this.progressIcon; } /** * Returns the {@link NodeSet} shown in the given row. * * @param row the row index * @return the corresponding {@link NodeSet} */ public NodeSet getNodeSetByIndex(int row) { return nodeSets.get(row); } /** * Returns whether the table model is in detailed mode */ public boolean isInDetailedMode() { return detailedMode; } /** * Returns whether the table model is in detailed mode */ public void setDetailedMode(boolean mode) { if (mode == detailedMode) return; detailedMode = mode; currentHeaders = detailedMode ? detailedHeaders : simpleHeaders; currentClasses = detailedMode ? detailedClasses : simpleClasses; this.fireTableStructureChanged(); } private void updateNodeSetDetails() { Executor threadPool = ClusterONE.getThreadPool(); int i = 0; nodeSetDetails.clear(); nodeSetIcons.clear(); for (NodeSet nodeSet: nodeSets) { Graph subgraph = nodeSet.getSubgraph(); RendererTask rendererTask = new RendererTask(i, subgraph, new FruchtermanReingoldLayoutAlgorithm()); threadPool.execute(rendererTask); nodeSetIcons.add(rendererTask); nodeSetDetails.add(new NodeSetDetails(nodeSet)); i++; } } }

diff --git a/Tapdex/src/com/mitsugaru/Tapdex/FormListActivity.java b/Tapdex/src/com/mitsugaru/Tapdex/FormListActivity.java index a6fff75..9872050 100644 --- a/Tapdex/src/com/mitsugaru/Tapdex/FormListActivity.java +++ b/Tapdex/src/com/mitsugaru/Tapdex/FormListActivity.java @@ -1,132 +1,136 @@ package com.mitsugaru.Tapdex; import java.util.ArrayList; import java.util.List; import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.LayoutAnimationController; import android.view.animation.TranslateAnimation; import android.widget.AdapterView; import android.widget.AdapterView.OnItemLongClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.AdapterView.OnItemClickListener; import android.widget.TextView; public class FormListActivity extends ListActivity { String formName = ""; List<String> entryNames = new ArrayList<String>();; private ArrayAdapter<String> adapter; private DatabaseHandler database; private boolean empty = false; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.formentrylist); Bundle extras = getIntent().getExtras(); if (extras != null) { formName = extras.getString("formName"); if (formName == null) { Log.e(TapdexActivity.TAG, "Null for form name"); this.finish(); } } else { Log.e(TapdexActivity.TAG, "Null extras"); this.finish(); } //Set header TextView header = (TextView) findViewById(R.id.headerText); header.setText(formName); // Database database = DatabaseHandler.getInstance(this); // Animation AnimationSet set = new AnimationSet(true); Animation animation = new AlphaAnimation(0.0f, 1.0f); animation.setDuration(50); set.addAnimation(animation); animation = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, -1.0f, Animation.RELATIVE_TO_SELF, 0.0f); animation.setDuration(100); set.addAnimation(animation); LayoutAnimationController controller = new LayoutAnimationController( set, 0.5f); ListView listView = getListView(); listView.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) { if (!empty) { // Entry list activity Intent intent = new Intent(getBaseContext(), EntryListActivity.class); intent.putExtra("formName", formName); intent.putExtra("entryName", entryNames.get(position)); startActivity(intent); } } }); listView.setLayoutAnimation(controller); } @Override public boolean onCreateOptionsMenu(Menu menu) { // Now, inflate our submenu. MenuInflater inflater = new MenuInflater(this); inflater.inflate(R.menu.formmenu, menu); return true; } @Override public void onResume() { // Adapter entryNames = database.getEntryNames(formName); if (entryNames.isEmpty()) { empty = true; entryNames.add("No entries available! :("); entryNames.add("To make a new entry:"); entryNames.add("1. Tap the menu key."); entryNames.add("2. Tap 'New Entry'"); entryNames .add("3. Name your new entry and enter data into fields."); } + else + { + empty = false; + } adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, entryNames); setListAdapter(adapter); super.onResume(); } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.addEntry: { Intent intent = new Intent(getBaseContext(), NewEntryActivity.class); intent.putExtra("formName", formName); startActivity(intent); return true; } default: { break; } } return false; } } diff --git a/Tapdex/src/com/mitsugaru/Tapdex/TapdexActivity.java b/Tapdex/src/com/mitsugaru/Tapdex/TapdexActivity.java index 8ef3823..5673a6a 100644 --- a/Tapdex/src/com/mitsugaru/Tapdex/TapdexActivity.java +++ b/Tapdex/src/com/mitsugaru/Tapdex/TapdexActivity.java @@ -1,166 +1,170 @@ package com.mitsugaru.Tapdex; import java.util.ArrayList; import java.util.List; import com.example.android.apis.graphics.CameraPreview; import android.app.Activity; import android.app.AlertDialog; import android.app.ListActivity; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.LayoutAnimationController; import android.view.animation.TranslateAnimation; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; public class TapdexActivity extends ListActivity { // Class variables private final Activity activity = this; public static final String TAG = "TAPDEX"; private DatabaseHandler database; private List<String> formNames = new ArrayList<String>(); private ArrayAdapter<String> adapter; private boolean empty = false; /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main); // Database database = new DatabaseHandler(this); // Animation AnimationSet set = new AnimationSet(true); Animation animation = new AlphaAnimation(0.0f, 1.0f); animation.setDuration(50); set.addAnimation(animation); animation = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, -1.0f, Animation.RELATIVE_TO_SELF, 0.0f); animation.setDuration(100); set.addAnimation(animation); LayoutAnimationController controller = new LayoutAnimationController( set, 0.5f); ListView listView = getListView(); listView.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) { if (!empty) { Intent intent = new Intent(getBaseContext(), FormListActivity.class); intent.putExtra("formName", formNames.get(position)); startActivity(intent); } } }); listView.setLayoutAnimation(controller); } @Override public void onResume() { // Adapter formNames = database.getFormNames(); if (formNames.isEmpty()) { empty = true; formNames.add("No forms available! :("); formNames.add("To make a new form:"); formNames.add("1. Tap the menu key."); formNames.add("2. Tap 'New Form'"); formNames .add("3. Name and design your new form with the fields you want."); } + else + { + empty = false; + } adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, formNames); setListAdapter(adapter); super.onResume(); } @Override public boolean onCreateOptionsMenu(Menu menu) { // Now, inflate our submenu. MenuInflater inflater = new MenuInflater(this); inflater.inflate(R.menu.mainmenu, menu); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { Intent intent; switch (item.getItemId()) { case R.id.newform: // Show new form activity intent = new Intent( findViewById(android.R.id.content).getContext(), NewFormActivity.class); startActivity(intent); return true; case R.id.camera: // TODO put this elsewhere, sorta // show dialog of download intent = new Intent( findViewById(android.R.id.content).getContext(), CameraPreview.class); startActivity(intent); return true; case R.id.settings: // TODO show settings view AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage("Writen by Vincent Deloso") .setCancelable(true) .setPositiveButton("OK", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } }); AlertDialog alert = builder.create(); alert.show(); return true; default: // INFO non-menuitem? IDEK return false; } } /** * Show the confirm exit dialog when the back button is pressed */ public void onBackPressed() { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage("Are you sure you want to exit?") .setCancelable(false) .setPositiveButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { activity.finish(); } }) .setNegativeButton("No", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } }); AlertDialog alert = builder.create(); alert.show(); } } \ No newline at end of file

diff --git a/mods/alice/villagerblock/item/ItemVillagerBlockelize.java b/mods/alice/villagerblock/item/ItemVillagerBlockelize.java index 7bad802..63c1aff 100644 --- a/mods/alice/villagerblock/item/ItemVillagerBlockelize.java +++ b/mods/alice/villagerblock/item/ItemVillagerBlockelize.java @@ -1,197 +1,199 @@ package mods.alice.villagerblock.item; import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mods.alice.villagerblock.ItemManager; import mods.alice.villagerblock.ModConfig; import mods.alice.villagerblock.block.BlockVillager; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.World; public class ItemVillagerBlockelize extends Item { public ItemVillagerBlockelize() { super((int)ModConfig.idItemVillagerBlockelize); setCreativeTab(CreativeTabs.tabTools); setFull3D(); setMaxDamage(42); setMaxStackSize(1); setUnlocalizedName("VillagerBlockelize"); } @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { ItemStack playerInventory[]; int index; if(player.capabilities.isCreativeMode) { return itemStack; } playerInventory = player.inventory.mainInventory; for(index = 0; index < playerInventory.length; index++) { if(playerInventory[index] == null) { continue; } if(playerInventory[index].itemID == Item.emerald.itemID) { if(playerInventory[index].stackSize > 0) { playerInventory[index].stackSize--; if(playerInventory[index].stackSize <= 0) { playerInventory[index] = null; } itemStack.setItemDamage(itemStack.getItemDamage() - 21); + + break; } } } return itemStack; } @Override public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { Block b; int damage; int id; if(world.isRemote) { return false; } id = world.getBlockId(x, y, z); b = ItemManager.getBlock(BlockVillager.class); if(id == b.blockID) { if(!player.capabilities.isCreativeMode) { damage = 2 + itemStack.getItemDamage(); if(damage > itemStack.getMaxDamage()) { return false; } } BlockVillager.dropTaggedBlock(world, x, y, z, true); world.destroyBlock(x, y, z, false); if(!player.capabilities.isCreativeMode) { itemStack.setItemDamage(itemStack.getItemDamage() + 2); } return true; } return false; } @Override public boolean onLeftClickEntity(ItemStack itemStack, EntityPlayer player, Entity entity) { EntityItem itemDrop; ItemStack newItemStack; MerchantRecipeList recipes; NBTTagCompound tagItemStack; NBTTagCompound tagVillager; Random rng; int damage; int prof; if(!(entity instanceof EntityVillager)) { return false; } if(!player.worldObj.isRemote) { if(!player.capabilities.isCreativeMode) { damage = 1 + itemStack.getItemDamage(); if(damage > itemStack.getMaxDamage()) { return false; } } if(((EntityVillager)entity).isChild()) { ((EntityVillager)entity).setGrowingAge(1); ((EntityLiving)entity).onLivingUpdate(); } newItemStack = new ItemStack(ItemManager.getBlock(BlockVillager.class), 1, 0); tagItemStack = new NBTTagCompound(); recipes = ((EntityVillager)entity).getRecipes(null); tagVillager = recipes.getRecipiesAsTags(); tagItemStack.setCompoundTag("Trade", tagVillager); prof = ((EntityVillager)entity).getProfession(); tagItemStack.setInteger("Profession", prof); newItemStack.setTagCompound(tagItemStack); itemDrop = new EntityItem(entity.worldObj, entity.posX, entity.posY, entity.posZ, newItemStack); player.worldObj.spawnEntityInWorld(itemDrop); } rng = ((EntityVillager)entity).getRNG(); for(prof = 0; prof < 5; prof++) { player.worldObj.spawnParticle("happyVillager", entity.posX - 0.5 + rng.nextDouble() * 2, entity.posY - 0.5 + rng.nextDouble() * 2, entity.posZ - 0.5 + rng.nextDouble() * 2, 0, 0, 0); } if(!player.worldObj.isRemote) { entity.setDead(); if(!player.capabilities.isCreativeMode) { itemStack.setItemDamage(itemStack.getItemDamage() + 1); } } return true; } @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconReg) { itemIcon = iconReg.registerIcon("villagerblock:VillagerBlockelize"); } @Override public boolean shouldPassSneakingClickToBlock(World world, int x, int y, int z) { Block b; int id; b = ItemManager.getBlock(BlockVillager.class); id = world.getBlockId(x, y, z); return (id != b.blockID); } }

diff --git a/src/jmetest/input/TestThirdPersonController.java b/src/jmetest/input/TestThirdPersonController.java index 186e9f28c..96ebeea79 100755 --- a/src/jmetest/input/TestThirdPersonController.java +++ b/src/jmetest/input/TestThirdPersonController.java @@ -1,238 +1,261 @@ /* * Copyright (c) 2003-2006 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * * Neither the name of 'jMonkeyEngine' nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package jmetest.input; +import java.util.ArrayList; import java.util.HashMap; import javax.swing.ImageIcon; import jmetest.terrain.TestTerrain; import com.jme.app.SimpleGame; import com.jme.bounding.BoundingBox; import com.jme.image.Texture; import com.jme.input.ChaseCamera; +import com.jme.input.InputSystem; import com.jme.input.ThirdPersonHandler; +import com.jme.input.joystick.Joystick; +import com.jme.input.joystick.JoystickInput; import com.jme.light.DirectionalLight; import com.jme.math.FastMath; import com.jme.math.Vector3f; import com.jme.renderer.ColorRGBA; import com.jme.renderer.Renderer; import com.jme.scene.Node; import com.jme.scene.shape.Box; import com.jme.scene.state.CullState; import com.jme.scene.state.FogState; import com.jme.scene.state.TextureState; import com.jme.util.LoggingSystem; import com.jme.util.TextureManager; import com.jmex.terrain.TerrainPage; import com.jmex.terrain.util.FaultFractalHeightMap; import com.jmex.terrain.util.ProceduralTextureGenerator; /** * <code>TestThirdPersonController</code> * * @author Joshua Slack - * @version $Revision: 1.16 $ + * @version $Revision: 1.17 $ */ public class TestThirdPersonController extends SimpleGame { private Node m_character; private ChaseCamera chaser; private TerrainPage page; /** * Entry point for the test, * * @param args */ public static void main(String[] args) { + try { + JoystickInput.setProvider(InputSystem.INPUT_SYSTEM_LWJGL); + } catch (Exception e) { + e.printStackTrace(); + } LoggingSystem.getLogger().setLevel(java.util.logging.Level.OFF); TestThirdPersonController app = new TestThirdPersonController(); app.setDialogBehaviour(ALWAYS_SHOW_PROPS_DIALOG); app.start(); } /** * builds the scene. * * @see com.jme.app.SimpleGame#initGame() */ protected void simpleInitGame() { display.setTitle("jME - 3rd person controller test"); setupCharacter(); setupTerrain(); setupChaseCamera(); setupInput(); } protected void simpleUpdate() { chaser.update(tpf); float camMinHeight = page.getHeight(cam.getLocation()) + 2f; if (!Float.isInfinite(camMinHeight) && !Float.isNaN(camMinHeight) && cam.getLocation().y <= camMinHeight) { cam.getLocation().y = camMinHeight; cam.update(); } float characterMinHeight = page.getHeight(m_character .getLocalTranslation())+((BoundingBox)m_character.getWorldBound()).yExtent; if (!Float.isInfinite(characterMinHeight) && !Float.isNaN(characterMinHeight)) { m_character.getLocalTranslation().y = characterMinHeight; } } private void setupCharacter() { Box b = new Box("box", new Vector3f(), 5,5,5); b.setModelBound(new BoundingBox()); b.updateModelBound(); m_character = new Node("char node"); rootNode.attachChild(m_character); m_character.attachChild(b); m_character.updateWorldBound(); // We do this to allow the camera setup access to the world bound in our setup code. TextureState ts = display.getRenderer().createTextureState(); ts.setEnabled(true); ts.setTexture( TextureManager.loadTexture( TestThirdPersonController.class.getClassLoader().getResource( "jmetest/data/images/Monkey.tga"), Texture.MM_LINEAR, Texture.FM_LINEAR)); m_character.setRenderState(ts); } private void setupTerrain() { rootNode.setRenderQueueMode(Renderer.QUEUE_OPAQUE); fpsNode.setRenderQueueMode(Renderer.QUEUE_ORTHO); display.getRenderer().setBackgroundColor( new ColorRGBA(0.5f, 0.5f, 0.5f, 1)); DirectionalLight dr = new DirectionalLight(); dr.setEnabled(true); dr.setDiffuse(new ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f)); dr.setAmbient(new ColorRGBA(0.5f, 0.5f, 0.5f, 1.0f)); dr.setDirection(new Vector3f(0.5f, -0.5f, 0)); CullState cs = display.getRenderer().createCullState(); cs.setCullMode(CullState.CS_BACK); cs.setEnabled(true); rootNode.setRenderState(cs); lightState.detachAll(); lightState.attach(dr); FaultFractalHeightMap heightMap = new FaultFractalHeightMap(257, 32, 0, 255, 0.75f); Vector3f terrainScale = new Vector3f(10, 1, 10); heightMap.setHeightScale(0.001f); page = new TerrainPage("Terrain", 33, heightMap.getSize(), terrainScale, heightMap.getHeightMap(), false); page.setDetailTexture(1, 16); rootNode.attachChild(page); ProceduralTextureGenerator pt = new ProceduralTextureGenerator( heightMap); pt.addTexture(new ImageIcon(TestTerrain.class.getClassLoader() .getResource("jmetest/data/texture/grassb.png")), -128, 0, 128); pt.addTexture(new ImageIcon(TestTerrain.class.getClassLoader() .getResource("jmetest/data/texture/dirt.jpg")), 0, 128, 255); pt.addTexture(new ImageIcon(TestTerrain.class.getClassLoader() .getResource("jmetest/data/texture/highest.jpg")), 128, 255, 384); pt.createTexture(512); TextureState ts = display.getRenderer().createTextureState(); ts.setEnabled(true); Texture t1 = TextureManager.loadTexture(pt.getImageIcon().getImage(), Texture.MM_LINEAR_LINEAR, Texture.FM_LINEAR, true); ts.setTexture(t1, 0); Texture t2 = TextureManager.loadTexture(TestThirdPersonController.class .getClassLoader() .getResource("jmetest/data/texture/Detail.jpg"), Texture.MM_LINEAR_LINEAR, Texture.FM_LINEAR); ts.setTexture(t2, 1); t2.setWrap(Texture.WM_WRAP_S_WRAP_T); t1.setApply(Texture.AM_COMBINE); t1.setCombineFuncRGB(Texture.ACF_MODULATE); t1.setCombineSrc0RGB(Texture.ACS_TEXTURE); t1.setCombineOp0RGB(Texture.ACO_SRC_COLOR); t1.setCombineSrc1RGB(Texture.ACS_PRIMARY_COLOR); t1.setCombineOp1RGB(Texture.ACO_SRC_COLOR); t1.setCombineScaleRGB(1.0f); t2.setApply(Texture.AM_COMBINE); t2.setCombineFuncRGB(Texture.ACF_ADD_SIGNED); t2.setCombineSrc0RGB(Texture.ACS_TEXTURE); t2.setCombineOp0RGB(Texture.ACO_SRC_COLOR); t2.setCombineSrc1RGB(Texture.ACS_PREVIOUS); t2.setCombineOp1RGB(Texture.ACO_SRC_COLOR); t2.setCombineScaleRGB(1.0f); rootNode.setRenderState(ts); FogState fs = display.getRenderer().createFogState(); fs.setDensity(0.5f); fs.setEnabled(true); fs.setColor(new ColorRGBA(0.5f, 0.5f, 0.5f, 0.5f)); fs.setEnd(1000); fs.setStart(500); fs.setDensityFunction(FogState.DF_LINEAR); fs.setApplyFunction(FogState.AF_PER_VERTEX); rootNode.setRenderState(fs); } private void setupChaseCamera() { Vector3f targetOffset = new Vector3f(); targetOffset.y = ((BoundingBox) m_character.getWorldBound()).yExtent * 1.5f; chaser = new ChaseCamera(cam, m_character); chaser.setTargetOffset(targetOffset); + ArrayList<Joystick> joys = JoystickInput.get().findJoysticksByAxis("Z Axis", "Z Rotation"); + Joystick joy = joys.size() >= 1 ? joys.get(0) : null; + if (joy != null) { + chaser.getMouseLook().setJoystick(joy); + chaser.getMouseLook().setJoystickXAxis(joy.findAxis("Z Axis")); + chaser.getMouseLook().setJoystickYAxis(joy.findAxis("Z Rotation")); + } } private void setupInput() { HashMap<String, Object> handlerProps = new HashMap<String, Object>(); handlerProps.put(ThirdPersonHandler.PROP_DOGRADUAL, "true"); handlerProps.put(ThirdPersonHandler.PROP_TURNSPEED, ""+(1.0f * FastMath.PI)); handlerProps.put(ThirdPersonHandler.PROP_LOCKBACKWARDS, "false"); handlerProps.put(ThirdPersonHandler.PROP_CAMERAALIGNEDMOVE, "true"); input = new ThirdPersonHandler(m_character, cam, handlerProps); input.setActionSpeed(100f); + ArrayList<Joystick> joys = JoystickInput.get().findJoysticksByAxis("X Axis", "Y Axis"); + Joystick joy = joys.size() >= 1 ? joys.get(0) : null; + if (joy != null) { + ((ThirdPersonHandler)input).setJoystick(joy); + ((ThirdPersonHandler)input).setJoystickXAxis(joy.findAxis("X Axis")); + ((ThirdPersonHandler)input).setJoystickYAxis(joy.findAxis("Y Axis")); + } } }

diff --git a/archetypes/simple-cli/src/main/java/example/ExampleItemWriter.java b/archetypes/simple-cli/src/main/java/example/ExampleItemWriter.java index 69ec6ee9d..4cbea41ee 100644 --- a/archetypes/simple-cli/src/main/java/example/ExampleItemWriter.java +++ b/archetypes/simple-cli/src/main/java/example/ExampleItemWriter.java @@ -1,25 +1,24 @@ package example; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.support.AbstractItemWriter; /** * Dummy {@link ItemWriter} which only logs data it receives. */ -public class ExampleItemWriter extends AbstractItemWriter<Object> { +public class ExampleItemWriter implements ItemWriter<Object> { private static final Log log = LogFactory.getLog(ExampleItemWriter.class); /** * @see ItemWriter#write(Object) */ public void write(List<? extends Object> data) throws Exception { log.info(data); } }

diff --git a/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java b/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java index ab209ce..c2cf07c 100644 --- a/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java +++ b/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java @@ -1,276 +1,276 @@ /* * Copyright (c) 2005 Your Corporation. All Rights Reserved. */ package org.jboss.virtual.plugins.context.jar; import java.io.IOException; import java.io.InputStream; import java.io.ByteArrayOutputStream; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.Enumeration; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.jar.JarFile; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import org.jboss.virtual.spi.VFSContext; import org.jboss.virtual.spi.VirtualFileHandler; /** * A nested jar implementation used to represent a jar within a jar. * * @author [email protected] * @author [email protected] * @version $Revision: 44334 $ */ public class NestedJarFromStream extends AbstractStructuredJarHandler<byte[]> { /** * serialVersionUID */ private static final long serialVersionUID = 1L; private transient ZipInputStream zis; private URL jarURL; private URL entryURL; private long lastModified; private long size; private AtomicBoolean inited = new AtomicBoolean(false); /** * Create a nested jar from the parent zip inputstream/zip entry. * * @param context - the context containing the jar * @param parent - the jar handler for this nested jar * @param zis - the jar zip input stream * @param jarURL - the URL to use as the jar URL * @param jar - the parent jar file for the nested jar * @param entry - the zip entry * @param entryName - the entry name * @throws IOException for any error */ public NestedJarFromStream(VFSContext context, VirtualFileHandler parent, ZipInputStream zis, URL jarURL, JarFile jar, ZipEntry entry, String entryName) throws IOException { super(context, parent, jarURL, jar, entry, entryName); this.jarURL = jarURL; this.lastModified = entry.getTime(); this.size = entry.getSize(); this.zis = zis; try { setPathName(getChildPathName(entryName, false)); setVfsUrl(getChildVfsUrl(entryName, false)); } catch (Exception e) { throw new RuntimeException(e); } } protected void initCacheLastModified() { cachedLastModified = lastModified; } /** * Initialize entries. * * @throws IOException for any error */ protected void init() throws IOException { if (inited.get() == false) { inited.set(true); try { initJarFile(new ZisEnumeration()); } finally { close(); } } } public List<VirtualFileHandler> getChildren(boolean ignoreErrors) throws IOException { init(); return super.getChildren(ignoreErrors); } public VirtualFileHandler getChild(String path) throws IOException { init(); return super.getChild(path); } public VirtualFileHandler createChildHandler(String name) throws IOException { init(); return super.createChildHandler(name); } protected void extraWrapperInfo(ZipEntryWrapper<byte[]> wrapper) throws IOException { byte[] contents; int size = (int)wrapper.getSize(); - if (size > 0) + if (size != 0) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(size); + ByteArrayOutputStream baos = size > 0 ? new ByteArrayOutputStream(size) : new ByteArrayOutputStream(); byte[] tmp = new byte[1024]; while (zis.available() > 0) { int length = zis.read(tmp); if (length > 0) baos.write(tmp, 0, length); } contents = baos.toByteArray(); } else contents = new byte[0]; wrapper.setExtra(contents); } protected VirtualFileHandler createVirtualFileHandler(VirtualFileHandler parent, ZipEntryWrapper<byte[]> wrapper, String entryName) throws IOException { try { String url = toURI().toASCIIString() + "!/" + wrapper.getName(); URL jecURL = new URL(url); VFSContext context = parent.getVFSContext(); byte[] contents = wrapper.getExtra(); return new JarEntryContents(context, parent, wrapper.getEntry(), entryName, toURL(), jecURL, contents); } catch (Throwable t) { IOException ioe = new IOException("Exception while reading nested jar entry: " + this); ioe.initCause(t); ioe.setStackTrace(t.getStackTrace()); throw ioe; } } /** * TODO: removing the entry/jar that resulted in this needs * to be detected. */ public boolean exists() throws IOException { return true; } public boolean isHidden() { return false; } public long getSize() { return size; } public long getLastModified() throws IOException { return lastModified; } // Stream accessor public InputStream openStream() throws IOException { return zis; } public void close() { if (zis != null) { try { zis.close(); } catch (IOException e) { log.error("close error", e); } zis = null; } } public URI toURI() throws URISyntaxException { try { if (entryURL == null) entryURL = new URL(jarURL, getName()); } catch (MalformedURLException e) { throw new URISyntaxException("Failed to create relative jarURL", e.getMessage()); } return entryURL.toURI(); } public String toString() { StringBuffer tmp = new StringBuffer(super.toString()); tmp.append('['); tmp.append("name="); tmp.append(getName()); tmp.append(",size="); tmp.append(getSize()); tmp.append(",lastModified="); tmp.append(lastModified); tmp.append(",URI="); try { tmp.append(toURI()); } catch (URISyntaxException e) { } tmp.append(']'); return tmp.toString(); } protected void initJarFile() throws IOException { // todo - deserialize } private class ZisEnumeration implements Enumeration<ZipEntryWrapper<byte[]>> { private boolean moved = true; private ZipEntry next = null; public boolean hasMoreElements() { if (zis == null) return false; try { if (moved) { next = zis.getNextEntry(); moved = false; } return next != null; } catch (IOException e) { throw new RuntimeException(e); } } public ZipEntryWrapper<byte[]> nextElement() { moved = true; return new ZipEntryWrapper<byte[]>(next); } } } diff --git a/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java b/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java index 92cc251..2e77ae6 100644 --- a/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java +++ b/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java @@ -1,1417 +1,1422 @@ /* * JBoss, Home of Professional Open Source * Copyright 2006, Red Hat Middleware LLC, and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.test.virtual.test; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.net.URI; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.zip.ZipInputStream; import junit.framework.Test; import junit.framework.TestSuite; import org.jboss.test.BaseTestCase; import org.jboss.test.virtual.support.ClassPathIterator; import org.jboss.test.virtual.support.ClassPathIterator.ClassPathEntry; import org.jboss.test.virtual.support.MetaDataMatchFilter; import org.jboss.virtual.VFS; import org.jboss.virtual.VFSUtils; import org.jboss.virtual.VirtualFile; import org.jboss.virtual.VisitorAttributes; import org.jboss.virtual.plugins.context.jar.NestedJarFromStream; import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter; import org.jboss.virtual.spi.LinkInfo; import org.jboss.virtual.spi.VFSContext; import org.jboss.virtual.spi.VFSContextFactory; import org.jboss.virtual.spi.VFSContextFactoryLocator; import org.jboss.virtual.spi.VirtualFileHandler; /** * Tests of the VFS implementation * * @author [email protected] * @author [email protected] * @version $Revision: 55523 $ */ public class FileVFSUnitTestCase extends BaseTestCase { public FileVFSUnitTestCase(String name) { super(name); } public static Test suite() { return new TestSuite(FileVFSUnitTestCase.class); } /** * Test that a VFSContextFactory can be created from the testcase CodeSource url * @throws Exception */ public void testVFSContextFactory() throws Exception { URL root = getClass().getProtectionDomain().getCodeSource().getLocation(); VFSContextFactory factory = VFSContextFactoryLocator.getFactory(root); assertTrue("VFSContextFactory(CodeSource.Location) != null", factory != null); } /** * Test that one can go from a file uri to VirtualFile and obtain the * same VirtualFile using VirtualFile vfsfile uri * @throws Exception */ public void testVFSFileURIFactory() throws Exception { URL rootURL = getClass().getProtectionDomain().getCodeSource().getLocation(); VFS rootVFS0 = VFS.getVFS(rootURL.toURI()); VirtualFile root0 = rootVFS0.getRoot(); VFS rootVFS1 = VFS.getVFS(root0.toURI()); VirtualFile root1 = rootVFS1.getRoot(); assertEquals(root0, root1); } /** * Test that NestedJarFromStream can provide access to nested jar content * @throws Exception */ public void testNestedJarFromStream() throws Exception { URL outer = getResource("/vfs/test/outer.jar"); String path = outer.getPath(); File outerJar = new File(path); assertTrue(outerJar.getAbsolutePath()+" exists", outerJar.exists()); JarFile jf = new JarFile(outerJar); URL rootURL = outerJar.getParentFile().toURL(); VFSContextFactory factory = VFSContextFactoryLocator.getFactory(rootURL); VFSContext context = factory.getVFS(rootURL); JarEntry jar1 = jf.getJarEntry("jar1.jar"); URL jar1URL = new URL(outerJar.toURL(), "jar1.jar"); VFSContextFactory pf1 = VFSContextFactoryLocator.getFactory(jar1URL); VFSContext parent1 = pf1.getVFS(jar1URL); ZipInputStream jis1 = new ZipInputStream(jf.getInputStream(jar1)); NestedJarFromStream njfs = new NestedJarFromStream(context, parent1.getRoot(), jis1, jar1URL, jf, jar1, "jar1.jar"); VirtualFileHandler e1 = njfs.getChild("org/jboss/test/vfs/support/jar1/ClassInJar1.class"); assertNotNull(e1); log.info("org/jboss/test/vfs/support/CommonClass.class: "+e1); VirtualFileHandler mfe1 = njfs.getChild("META-INF/MANIFEST.MF"); assertNotNull("jar1!/META-INF/MANIFEST.MF", mfe1); InputStream mfIS = mfe1.openStream(); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String title1 = mainAttrs.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("jar1", title1); mfIS.close(); njfs.close(); JarEntry jar2 = jf.getJarEntry("jar2.jar"); URL jar2URL = new URL(outerJar.toURL(), "jar2.jar"); VFSContextFactory pf2 = VFSContextFactoryLocator.getFactory(jar2URL); VFSContext parent2 = pf2.getVFS(jar2URL); ZipInputStream jis2 = new ZipInputStream(jf.getInputStream(jar2)); NestedJarFromStream njfs2 = new NestedJarFromStream(context, parent2.getRoot(), jis2, jar2URL, jf, jar2, "jar2.jar"); VirtualFileHandler e2 = njfs2.getChild("org/jboss/test/vfs/support/jar2/ClassInJar2.class"); assertNotNull(e2); log.info("org/jboss/test/vfs/support/CommonClass.class: "+e2); VirtualFileHandler mfe2 = njfs2.getChild("META-INF/MANIFEST.MF"); assertNotNull("jar2!/META-INF/MANIFEST.MF", mfe2); InputStream mf2IS = mfe2.openStream(); Manifest mf2 = new Manifest(mf2IS); Attributes mainAttrs2 = mf2.getMainAttributes(); String title2 = mainAttrs2.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("jar2", title2); mf2IS.close(); njfs2.close(); } /** * Test reading the contents of nested jar entries. * @throws Exception */ public void testInnerJarFile() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile outerjar = vfs.findChild("outer.jar"); assertTrue("outer.jar != null", outerjar != null); VirtualFile jar1 = outerjar.findChild("jar1.jar"); assertTrue("outer.jar/jar1.jar != null", jar1 != null); VirtualFile jar2 = outerjar.findChild("jar2.jar"); assertTrue("outer.jar/jar2.jar != null", jar2 != null); VirtualFile jar1MF = jar1.findChild("META-INF/MANIFEST.MF"); assertNotNull("jar1!/META-INF/MANIFEST.MF", jar1MF); InputStream mfIS = jar1MF.openStream(); Manifest mf1 = new Manifest(mfIS); Attributes mainAttrs1 = mf1.getMainAttributes(); String title1 = mainAttrs1.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("jar1", title1); jar1MF.close(); VirtualFile jar2MF = jar2.findChild("META-INF/MANIFEST.MF"); assertNotNull("jar2!/META-INF/MANIFEST.MF", jar2MF); InputStream mfIS2 = jar2MF.openStream(); Manifest mf2 = new Manifest(mfIS2); Attributes mainAttrs2 = mf2.getMainAttributes(); String title2 = mainAttrs2.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("jar2", title2); jar2MF.close(); } /** * Basic tests of accessing resources in a jar * @throws Exception */ public void testFindResource() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild("outer.jar"); assertTrue("outer.jar != null", jar != null); /* ArrayList<String> searchCtx = new ArrayList<String>(); searchCtx.add("outer.jar"); VirtualFile metaInf = vfs.resolveFile("META-INF/MANIFEST.MF", searchCtx); */ VirtualFile metaInf = jar.findChild("META-INF/MANIFEST.MF"); assertTrue("META-INF/MANIFEST.MF != null", metaInf != null); InputStream mfIS = metaInf.openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); mfIS.close(); } /** * Basic tests of accessing resources in a jar * @throws Exception */ public void testFindResourceUsingURLStream() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild("outer.jar"); assertTrue("outer.jar != null", jar != null); /* ArrayList<String> searchCtx = new ArrayList<String>(); searchCtx.add("outer.jar"); VirtualFile metaInf = vfs.resolveFile("META-INF/MANIFEST.MF", searchCtx); */ VirtualFile metaInf = jar.findChild("META-INF/MANIFEST.MF"); assertTrue("META-INF/MANIFEST.MF != null", metaInf != null); InputStream mfIS = metaInf.toURL().openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); mfIS.close(); String urlString = metaInf.toURL().toString(); URL mfURL = new URL(urlString); mfIS = mfURL.openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); mf = new Manifest(mfIS); mainAttrs = mf.getMainAttributes(); version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); mfIS.close(); } /** * Basic tests of accessing resources in a jar that does not * have parent directory entries. * @throws Exception */ public void testFindResourceInFilesOnlyJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild("jar1-filesonly.jar"); assertTrue("jar1-filesonly.jar != null", jar != null); VirtualFile metaInf = jar.findChild("META-INF/MANIFEST.MF"); assertTrue("META-INF/MANIFEST.MF != null", metaInf != null); InputStream mfIS = metaInf.toURL().openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); String title = mf.getMainAttributes().getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("jar1-filesonly", title); mfIS.close(); String urlString = metaInf.toURL().toString(); URL mfURL = new URL(urlString); mfIS = mfURL.openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); mf = new Manifest(mfIS); mainAttrs = mf.getMainAttributes(); version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); title = mf.getMainAttributes().getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("jar1-filesonly", title); mfIS.close(); } /** * Basic tests of accessing resources in a war that does not * have parent directory entries. * @throws Exception */ public void testFindResourceInFilesOnlyWar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile war2 = vfs.findChild("WarDeployApp_web.war"); assertTrue("WarDeployApp_web.war != null", war2 != null); VirtualFile classes2 = war2.findChild("WEB-INF/classes"); assertTrue("WEB-INF/classes != null", classes2 != null); assertTrue("WEB-INF/classes is not a leaf", classes2.isLeaf()==false); classes2 = war2.findChild("WEB-INF/classes"); assertTrue("WEB-INF/classes != null", classes2 != null); assertTrue("WEB-INF/classes is not a leaf", classes2.isLeaf()==false); VirtualFile HelloJavaBean = classes2.findChild("com/sun/ts/tests/webservices/deploy/warDeploy/HelloJavaBean.class"); assertTrue("HelloJavaBean.class != null", HelloJavaBean != null); assertTrue("HelloJavaBean.class is a leaf", HelloJavaBean.isLeaf()); VirtualFile war = vfs.findChild("filesonly.war"); assertTrue("filesonly.war != null", war != null); VirtualFile classes = war.findChild("WEB-INF/classes"); assertTrue("WEB-INF/classes != null", classes != null); assertTrue("WEB-INF/classes is not a leaf", classes.isLeaf()==false); VirtualFile jar1 = war.findChild("WEB-INF/lib/jar1.jar"); assertTrue("WEB-INF/lib/jar1.jar != null", jar1 != null); assertTrue("WEB-INF/lib/jar1.jar is not a leaf", jar1.isLeaf()==false); VirtualFile ClassInJar1 = jar1.findChild("org/jboss/test/vfs/support/jar1/ClassInJar1.class"); assertTrue("ClassInJar1.class != null", ClassInJar1 != null); assertTrue("ClassInJar1.class is a leaf", ClassInJar1.isLeaf()); VirtualFile metaInf = war.findChild("META-INF/MANIFEST.MF"); assertTrue("META-INF/MANIFEST.MF != null", metaInf != null); InputStream mfIS = metaInf.toURL().openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); String title = mf.getMainAttributes().getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals("filesonly-war", title); mfIS.close(); war.findChild("WEB-INF/classes"); assertTrue("WEB-INF/classes != null", classes != null); assertTrue("WEB-INF/classes is not a leaf", classes.isLeaf()==false); } /** * Validate iterating over a vfs url from a files only war. * * @throws Exception */ public void testFindClassesInFilesOnlyWar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile war = vfs.findChild("filesonly.war"); assertTrue("filesonly.war != null", war != null); VirtualFile classes = war.findChild("WEB-INF/classes"); assertTrue("WEB-INF/classes != null", classes != null); HashSet<String> names = new HashSet<String>(); ClassPathIterator iter = new ClassPathIterator(classes.toURL()); ClassPathEntry entry = null; while( (entry = iter.getNextEntry()) != null ) { names.add(entry.name); } log.debug(names); assertTrue("org/jboss/test/vfs/support/jar1", names.contains("org/jboss/test/vfs/support/jar1")); assertTrue("ClassInJar1.class", names.contains("org/jboss/test/vfs/support/jar1/ClassInJar1.class")); assertTrue("ClassInJar1$InnerClass.class", names.contains("org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class")); } public void testFindResourceUnpackedJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild("unpacked-outer.jar"); assertTrue("unpacked-outer.jar != null", jar != null); /** ArrayList<String> searchCtx = new ArrayList<String>(); searchCtx.add("unpacked-outer.jar"); VirtualFile metaInf = vfs.resolveFile("META-INF/MANIFEST.MF", searchCtx); */ VirtualFile metaInf = jar.findChild("META-INF/MANIFEST.MF"); assertTrue("META-INF/MANIFEST.MF != null", metaInf != null); InputStream mfIS = metaInf.openStream(); assertTrue("META-INF/MANIFEST.MF.openStream != null", mfIS != null); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION); assertEquals("1.0.0.GA", version); mfIS.close(); } /** * Test simple file resolution without search contexts * @throws Exception */ public void testResolveFile() throws Exception { log.info("+++ testResolveFile, cwd="+(new File(".").getCanonicalPath())); URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); // Check resolving the root file VirtualFile root = vfs.findChild(""); assertEquals("root name", "test", root.getName()); assertEquals("root path", "", root.getPathName()); assertFalse("root isDirectory", root.isLeaf()); // Find the outer.jar VirtualFile outerJar = vfs.findChild("outer.jar"); assertNotNull("outer.jar", outerJar); assertEquals("outer.jar name", "outer.jar", outerJar.getName()); assertEquals("outer.jar path", "outer.jar", outerJar.getPathName()); VirtualFile outerJarMF = vfs.findChild("outer.jar/META-INF/MANIFEST.MF"); assertNotNull("outer.jar/META-INF/MANIFEST.MF", outerJarMF); // Test a non-canonical path rootURL = getResource("/vfs/sundry/../test"); // Check resolving the root file root = vfs.findChild(""); assertEquals("root name", "test", root.getName()); assertEquals("root path", "", root.getPathName()); assertFalse("root isDirectory", root.isLeaf()); } /** * Validate resolving a .class file given a set of search contexts in the * vfs that make up a classpath. * * @throws Exception */ public void testResolveClassFileInClassPath() throws Exception { log.info("+++ testResolveFile, cwd="+(new File(".").getCanonicalPath())); URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); // Find ClassInJar1.class VirtualFile vf = vfs.findChild("jar1.jar"); VirtualFile c1 = vf.findChild("org/jboss/test/vfs/support/jar1/ClassInJar1.class"); assertNotNull("ClassInJar1.class VF", c1); log.debug("Found ClassInJar1.class: "+c1); // Find ClassInJar1$InnerClass.class VirtualFile c1i = vf.findChild("org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class"); assertNotNull("ClassInJar1$InnerClass.class VF", c1i); log.debug("Found ClassInJar1$InnerClass.class: "+c1i); // Find ClassInJar2.class vf = vfs.findChild("jar2.jar"); VirtualFile c2 = vf.findChild("org/jboss/test/vfs/support/jar2/ClassInJar2.class"); assertNotNull("ClassInJar2.class VF", c2); log.debug("Found ClassInJar2.class: "+c2); } public void testResolveFileInUnpackedJar() throws Exception { log.info("+++ testResolveFileInUnpackedJar, cwd="+(new File(".").getCanonicalPath())); URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); // Check resolving the root file VirtualFile root = vfs.findChild(""); assertEquals("root name", "test", root.getName()); assertEquals("root path", "", root.getPathName()); assertFalse("root isDirectory", root.isLeaf()); // Find the outer.jar VirtualFile outerJar = vfs.findChild("unpacked-outer.jar"); assertNotNull("unpacked-outer.jar", outerJar); assertEquals("unpacked-outer.jar name", "unpacked-outer.jar", outerJar.getName()); assertEquals("unpacked-outer.jar path", "unpacked-outer.jar", outerJar.getPathName()); VirtualFile outerJarMF = vfs.findChild("unpacked-outer.jar/META-INF/MANIFEST.MF"); assertNotNull("unpacked-outer.jar/META-INF/MANIFEST.MF", outerJarMF); // Test a non-canonical path rootURL = getResource("/test/sundry/../test"); // Check resolving the root file root = vfs.findChild(""); assertEquals("root name", "test", root.getName()); assertEquals("root path", "", root.getPathName()); assertFalse("root isDirectory", root.isLeaf()); } public void testFileNotFoundInUnpackedJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); // Find the outer.jar VirtualFile outerJar = vfs.findChild("unpacked-outer.jar"); assertNotNull("unpacked-outer.jar", outerJar); assertNull(outerJar.getChild("WEB-INF")); } /* - public void testNestedNestedParent() + public void testNoCopyNestedStream() throws Exception { URL rootURL = getResource("/vfs/seam/jboss-seam-booking.ear"); VFS vfs = VFS.getVFS(rootURL); - // Find the outer.jar - VirtualFile props = vfs.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar/seam.properties"); - assertNotNull("seam.properties", props); - VirtualFile debug = props.getParent(); - assertNotNull(debug); - VirtualFile lib = debug.getParent(); - assertNotNull(lib); + VirtualFile clazz = vfs.getChild("lib/commons-beanutils.jar/org/apache/commons/beanutils/BeanComparator.class"); + assertNotNull(clazz); + URL url = clazz.toURL(); + InputStream is = url.openStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] tmp = new byte[1024]; + int read = 0; + while ( (read = is.read(tmp)) >= 0 ) + baos.write(tmp, 0, read); + byte[] bytes = baos.toByteArray(); + int size = bytes.length; + System.out.println("size = " + size); } */ /** * Test file resolution with nested jars * @throws Exception */ public void testInnerJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile inner = vfs.findChild("outer.jar/jar1.jar"); log.info("IsFile: "+inner.isLeaf()); log.info(inner.getLastModified()); List<VirtualFile> contents = inner.getChildren(); // META-INF/*, org/jboss/test/vfs/support/jar1/* at least assertTrue("jar1.jar children.length("+contents.size()+") >= 2", contents.size() >= 2); for(VirtualFile vf : contents) { log.info(" "+vf.getName()); } VirtualFile vf = vfs.findChild("outer.jar/jar1.jar"); VirtualFile jar1MF = vf.findChild("META-INF/MANIFEST.MF"); InputStream mfIS = jar1MF.openStream(); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals(Attributes.Name.SPECIFICATION_TITLE.toString(), "jar1", version); mfIS.close(); } public void testInnerJarUsingURLStream() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile inner = vfs.findChild("outer.jar/jar1.jar"); log.info("IsFile: "+inner.isLeaf()); log.info(inner.getLastModified()); List<VirtualFile> contents = inner.getChildren(); // META-INF/*, org/jboss/test/vfs/support/jar1/* at least assertTrue("jar1.jar children.length("+contents.size()+") >= 2", contents.size() >= 2); for(VirtualFile vf : contents) { log.info(" "+vf.getName()); } VirtualFile vf = vfs.findChild("outer.jar/jar1.jar"); VirtualFile jar1MF = vf.findChild("META-INF/MANIFEST.MF"); InputStream mfIS = jar1MF.toURL().openStream(); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals(Attributes.Name.SPECIFICATION_TITLE.toString(), "jar1", version); mfIS.close(); } /** * Test a scan of the outer.jar vfs to locate all .class files * @throws Exception */ public void testClassScan() throws Exception { URL rootURL = getResource("/vfs/test/outer.jar"); VFS vfs = VFS.getVFS(rootURL); HashSet<String> expectedClasses = new HashSet<String>(); expectedClasses.add("jar1.jar/org/jboss/test/vfs/support/jar1/ClassInJar1.class"); expectedClasses.add("jar1.jar/org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class"); expectedClasses.add("jar2.jar/org/jboss/test/vfs/support/jar2/ClassInJar2.class"); expectedClasses.add("org/jboss/test/vfs/support/CommonClass.class"); super.enableTrace("org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter"); SuffixMatchFilter classVisitor = new SuffixMatchFilter(".class", VisitorAttributes.RECURSE); List<VirtualFile> classes = vfs.getChildren(classVisitor); int count = 0; for (VirtualFile cf : classes) { String path = cf.getPathName(); if( path.endsWith(".class") ) { assertTrue(path, expectedClasses.contains(path)); count ++; } } assertEquals("There were 4 classes", 4, count); } /** * Test a scan of the unpacked-outer.jar vfs to locate all .class files * @throws Exception */ public void testClassScanUnpacked() throws Exception { URL rootURL = getResource("/vfs/test/unpacked-outer.jar"); VFS vfs = VFS.getVFS(rootURL); HashSet<String> expectedClasses = new HashSet<String>(); expectedClasses.add("jar1.jar/org/jboss/test/vfs/support/jar1/ClassInJar1.class"); expectedClasses.add("jar1.jar/org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class"); expectedClasses.add("jar2.jar/org/jboss/test/vfs/support/jar2/ClassInJar2.class"); // FIXME: .class files are not being copied from the resources directory //expectedClasses.add("org/jboss/test/vfs/support/CommonClass.class"); super.enableTrace("org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter"); SuffixMatchFilter classVisitor = new SuffixMatchFilter(".class", VisitorAttributes.RECURSE); List<VirtualFile> classes = vfs.getChildren(classVisitor); int count = 0; for (VirtualFile cf : classes) { String path = cf.getPathName(); if( path.endsWith(".class") ) { assertTrue(path, expectedClasses.contains(path)); count ++; } } assertEquals("There were 3 classes", 3, count); } /** * Test a scan of the jar1-filesonly.jar vfs to locate all .class files * @throws Exception */ public void testClassScanFilesonly() throws Exception { URL rootURL = getResource("/vfs/test/jar1-filesonly.jar"); VFS vfs = VFS.getVFS(rootURL); HashSet<String> expectedClasses = new HashSet<String>(); expectedClasses.add("org/jboss/test/vfs/support/jar1/ClassInJar1.class"); expectedClasses.add("org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class"); super.enableTrace("org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter"); SuffixMatchFilter classVisitor = new SuffixMatchFilter(".class", VisitorAttributes.RECURSE); List<VirtualFile> classes = vfs.getChildren(classVisitor); int count = 0; for (VirtualFile cf : classes) { String path = cf.getPathName(); if( path.endsWith(".class") ) { assertTrue(path, expectedClasses.contains(path)); count ++; } } assertEquals("There were 2 classes", 2, count); // Make sure we can walk path-wise to the class VirtualFile jar1 = vfs.getRoot(); VirtualFile parent = jar1; String className = "org/jboss/test/vfs/support/jar1/ClassInJar1.class"; VirtualFile ClassInJar1 = vfs.findChild(className); String[] paths = className.split("/"); StringBuilder vfsPath = new StringBuilder(); for(String path : paths) { vfsPath.append(path); VirtualFile vf = parent.findChild(path); if( path.equals("ClassInJar1.class") ) assertEquals("ClassInJar1.class", ClassInJar1, vf); else { assertEquals("vfsPath", vfsPath.toString(), vf.getPathName()); assertEquals("lastModified", ClassInJar1.getLastModified(), vf.getLastModified()); } vfsPath.append('/'); parent = vf; } } /** * Test access of directories in a jar that only stores files * @throws Exception */ public void testFilesOnlyJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild("jar1-filesonly.jar"); VirtualFile metadataLocation = jar.findChild("META-INF"); assertNotNull(metadataLocation); VirtualFile mfFile = metadataLocation.findChild("MANIFEST.MF"); assertNotNull(mfFile); InputStream is = mfFile.openStream(); Manifest mf = new Manifest(is); mfFile.close(); String title = mf.getMainAttributes().getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals(Attributes.Name.SPECIFICATION_TITLE.toString(), "jar1-filesonly", title); // Retry starting from the jar root mfFile = jar.findChild("META-INF/MANIFEST.MF"); is = mfFile.openStream(); mf = new Manifest(is); mfFile.close(); title = mf.getMainAttributes().getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals(Attributes.Name.SPECIFICATION_TITLE.toString(), "jar1-filesonly", title); } /** * Test the serialization of VirtualFiles * @throws Exception */ public void testVFSerialization() throws Exception { File tmpRoot = File.createTempFile("vfs", ".root"); tmpRoot.delete(); tmpRoot.mkdir(); tmpRoot.deleteOnExit(); File tmp = new File(tmpRoot, "vfs.ser"); tmp.createNewFile(); tmp.deleteOnExit(); log.info("+++ testVFSerialization, tmp="+tmp.getCanonicalPath()); URL rootURL = tmpRoot.toURL(); VFS vfs = VFS.getVFS(rootURL); VirtualFile tmpVF = vfs.findChild("vfs.ser"); FileOutputStream fos = new FileOutputStream(tmp); ObjectOutputStream oos = new ObjectOutputStream(fos); oos.writeObject(tmpVF); oos.close(); // Check the tmpVF attributes against the tmp file long lastModified = tmp.lastModified(); long size = tmp.length(); String name = tmp.getName(); String vfsPath = tmp.getPath(); vfsPath = vfsPath.substring(tmpRoot.getPath().length()+1); URL url = new URL("vfs" + tmp.toURL()); log.debug("name: "+name); log.debug("vfsPath: "+vfsPath); log.debug("url: "+url); log.debug("lastModified: "+lastModified); log.debug("size: "+size); assertEquals("name", name, tmpVF.getName()); assertEquals("pathName", vfsPath, tmpVF.getPathName()); assertEquals("lastModified", lastModified, tmpVF.getLastModified()); assertEquals("size", size, tmpVF.getSize()); assertEquals("url", url, tmpVF.toURL()); assertEquals("isLeaf", true, tmpVF.isLeaf()); assertEquals("isHidden", false, tmpVF.isHidden()); // Read in the VF from the serialized file FileInputStream fis = new FileInputStream(tmp); ObjectInputStream ois = new ObjectInputStream(fis); VirtualFile tmpVF2 = (VirtualFile) ois.readObject(); ois.close(); // Validated the deserialized attribtes against the tmp file assertEquals("name", name, tmpVF2.getName()); assertEquals("pathName", vfsPath, tmpVF2.getPathName()); assertEquals("lastModified", lastModified, tmpVF2.getLastModified()); assertEquals("size", size, tmpVF2.getSize()); assertEquals("url", url, tmpVF2.toURL()); assertEquals("isLeaf", true, tmpVF2.isLeaf()); assertEquals("isHidden", false, tmpVF2.isHidden()); } /** * Test the serialization of VirtualFiles representing a jar * @throws Exception */ public void testVFJarSerialization() throws Exception { File tmpRoot = File.createTempFile("vfs", ".root"); tmpRoot.delete(); tmpRoot.mkdir(); tmpRoot.deleteOnExit(); // Create a test jar containing a txt file File tmpJar = new File(tmpRoot, "tst.jar"); tmpJar.createNewFile(); tmpJar.deleteOnExit(); FileOutputStream fos = new FileOutputStream(tmpJar); JarOutputStream jos = new JarOutputStream(fos); // Write a text file to include in a test jar JarEntry txtEntry = new JarEntry("tst.txt"); jos.putNextEntry(txtEntry); txtEntry.setSize("testVFJarSerialization".length()); txtEntry.setTime(System.currentTimeMillis()); jos.write("testVFJarSerialization".getBytes()); jos.close(); log.info("+++ testVFJarSerialization, tmp="+tmpJar.getCanonicalPath()); URI rootURI = tmpRoot.toURI(); VFS vfs = VFS.getVFS(rootURI); File vfsSer = new File(tmpRoot, "vfs.ser"); vfsSer.createNewFile(); vfsSer.deleteOnExit(); VirtualFile tmpVF = vfs.findChild("tst.jar"); // Validate the vf jar against the tmp file attributes long lastModified = tmpJar.lastModified(); long size = tmpJar.length(); String name = tmpJar.getName(); String vfsPath = tmpJar.getPath(); vfsPath = vfsPath.substring(tmpRoot.getPath().length()+1); URL url = new URL("vfs" + tmpJar.toURL()); //url = JarUtils.createJarURL(url); log.debug("name: "+name); log.debug("vfsPath: "+vfsPath); log.debug("url: "+url); log.debug("lastModified: "+lastModified); log.debug("size: "+size); assertEquals("name", name, tmpVF.getName()); assertEquals("pathName", vfsPath, tmpVF.getPathName()); assertEquals("lastModified", lastModified, tmpVF.getLastModified()); assertEquals("size", size, tmpVF.getSize()); assertEquals("url", url, tmpVF.toURL()); // TODO: these should pass //assertEquals("isFile", true, tmpVF.isFile()); //assertEquals("isDirectory", false, tmpVF.isDirectory()); assertEquals("isHidden", false, tmpVF.isHidden()); // Write out the vfs jar file fos = new FileOutputStream(vfsSer); ObjectOutputStream oos = new ObjectOutputStream(fos); oos.writeObject(tmpVF); oos.close(); // Read in the VF from the serialized file FileInputStream fis = new FileInputStream(vfsSer); ObjectInputStream ois = new ObjectInputStream(fis); VirtualFile tmpVF2 = (VirtualFile) ois.readObject(); ois.close(); // Validate the vf jar against the tmp file attributes assertEquals("name", name, tmpVF2.getName()); assertEquals("pathName", vfsPath, tmpVF2.getPathName()); assertEquals("lastModified", lastModified, tmpVF2.getLastModified()); assertEquals("size", size, tmpVF2.getSize()); assertEquals("url", url, tmpVF2.toURL()); // TODO: these should pass //assertEquals("isFile", true, tmpVF2.isFile()); //assertEquals("isDirectory", false, tmpVF2.isDirectory()); assertEquals("isHidden", false, tmpVF2.isHidden()); } /** * Test the serialization of VirtualFiles representing a jar * @throws Exception */ public void testVFNestedJarSerialization() throws Exception { // this expects to be run with a working dir of the container root URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile inner = vfs.findChild("outer.jar/jar1.jar"); File vfsSer = File.createTempFile("testVFNestedJarSerialization", ".ser"); vfsSer.deleteOnExit(); // Write out the vfs inner jar file FileOutputStream fos = new FileOutputStream(vfsSer); ObjectOutputStream oos = new ObjectOutputStream(fos); oos.writeObject(inner); oos.close(); // Read in the VF from the serialized file FileInputStream fis = new FileInputStream(vfsSer); ObjectInputStream ois = new ObjectInputStream(fis); inner = (VirtualFile) ois.readObject(); ois.close(); List<VirtualFile> contents = inner.getChildren(); // META-INF/*, org/jboss/test/vfs/support/jar1/* at least assertTrue("jar1.jar children.length("+contents.size()+") >= 2", contents.size() >= 2); for(VirtualFile vf : contents) { log.info(" "+vf.getName()); } VirtualFile vf = vfs.findChild("outer.jar/jar1.jar"); VirtualFile jar1MF = vf.findChild("META-INF/MANIFEST.MF"); InputStream mfIS = jar1MF.openStream(); Manifest mf = new Manifest(mfIS); Attributes mainAttrs = mf.getMainAttributes(); String version = mainAttrs.getValue(Attributes.Name.SPECIFICATION_TITLE); assertEquals(Attributes.Name.SPECIFICATION_TITLE.toString(), "jar1", version); mfIS.close(); } /** * Test parsing of a vfs link properties file. It contains test.classes.url * and test.lib.url system property references that are configured to * point to the CodeSource location of this class and /vfs/sundry/jar/ * respectively. * * @throws Exception */ public void testVfsLinkProperties() throws Exception { URL linkURL = super.getResource("/vfs/links/war1.vfslink.properties"); assertNotNull("vfs/links/war1.vfslink.properties", linkURL); // Find resources to use as the WEB-INF/{classes,lib} link targets URL classesURL = getClass().getProtectionDomain().getCodeSource().getLocation(); assertNotNull("classesURL", classesURL); System.setProperty("test.classes.url", classesURL.toString()); URL libURL = super.getResource("/vfs/sundry/jar"); assertNotNull("libURL", libURL); System.setProperty("test.lib.url", libURL.toString()); assertTrue("isLink", VFSUtils.isLink(linkURL.getPath())); Properties props = new Properties(); InputStream linkIS = linkURL.openStream(); List<LinkInfo> infos = VFSUtils.readLinkInfo(linkIS, linkURL.getPath(), props); assertEquals("LinkInfo count", 2, infos.size()); LinkInfo classesInfo = null; LinkInfo libInfo = null; for(LinkInfo info :infos) { if( info.getName().equals("WEB-INF/classes") ) classesInfo = info; else if(info.getName().equals("WEB-INF/lib") ) libInfo = info; } assertNotNull("classesInfo", classesInfo); assertEquals("classesInfo.target", classesURL.toURI(), classesInfo.getLinkTarget()); assertNotNull("libInfo", libInfo); assertEquals("libInfo.target", libURL.toURI(), libInfo.getLinkTarget()); } /** * Test the test-link.war link * @throws Exception */ public void testWarLink() throws Exception { // Find resources to use as the WEB-INF/{classes,lib} link targets URL classesURL = getClass().getProtectionDomain().getCodeSource().getLocation(); assertNotNull("classesURL", classesURL); System.setProperty("test.classes.url", classesURL.toString()); URL libURL = super.getResource("/vfs/sundry/jar"); assertNotNull("libURL", libURL); System.setProperty("test.lib.url", libURL.toString()); // Root the vfs at the link file parent directory URL linkURL = super.getResource("/vfs/links/war1.vfslink.properties"); File linkFile = new File(linkURL.toURI()); File vfsRoot = linkFile.getParentFile(); assertNotNull("vfs/links/war1.vfslink.properties", linkURL); VFS vfs = VFS.getVFS(vfsRoot.toURI()); // We should find the test-link.war the link represents VirtualFile war = vfs.findChild("test-link.war"); assertNotNull("war", war); // Validate the WEB-INF/classes child link VirtualFile classes = war.findChild("WEB-INF/classes"); String classesName = classes.getName(); String classesPathName = classes.getPathName(); boolean classesIsDirectory = classes.isLeaf() == false; assertEquals("classes.name", "classes", classesName); assertEquals("classes.pathName", "test-link.war/WEB-INF/classes", classesPathName); assertEquals("classes.isDirectory", true, classesIsDirectory); // Should be able to find this class since classes points to out codesource VirtualFile thisClass = classes.findChild("org/jboss/test/virtual/test/FileVFSUnitTestCase.class"); assertEquals("FileVFSUnitTestCase.class", thisClass.getName()); // Validate the WEB-INF/lib child link VirtualFile lib = war.findChild("WEB-INF/lib"); String libName = lib.getName(); String libPathName = lib.getPathName(); boolean libIsDirectory = lib.isLeaf() == false; assertEquals("lib.name", "lib", libName); assertEquals("lib.pathName", "test-link.war/WEB-INF/lib", libPathName); assertEquals("lib.isDirectory", true, libIsDirectory); // Should be able to find archive.jar under lib VirtualFile archiveJar = lib.findChild("archive.jar"); assertEquals("archive.jar", archiveJar.getName()); } /** * Test that the URL of a VFS corresponding to a directory ends in '/' so that * URLs created relative to it are under the directory. This requires that * build-test.xml artifacts exist. * * @throws Exception */ public void testDirURLs() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile outerJar = vfs.findChild("unpacked-outer.jar"); URL outerURL = outerJar.toURL(); log.debug("outerURL: "+outerURL); assertTrue(outerURL+" ends in '/'", outerURL.getPath().endsWith("/")); // Validate that jar1 is under unpacked-outer.jar URL jar1URL = new URL(outerURL, "jar1.jar"); log.debug("jar1URL: "+jar1URL+", path="+jar1URL.getPath()); assertTrue("jar1URL path ends in unpacked-outer.jar/jar1.jar!/", jar1URL.getPath().endsWith("unpacked-outer.jar/jar1.jar")); VirtualFile jar1 = outerJar.findChild("jar1.jar"); assertEquals(jar1URL, jar1.toURL()); VirtualFile packedJar = vfs.findChild("jar1.jar"); jar1URL = packedJar.findChild("org/jboss/test/vfs/support").toURL(); assertTrue("Jar directory entry URLs must end in /: " + jar1URL.toString(), jar1URL.toString().endsWith("/")); } /** * Test that the URI of a VFS corresponding to a directory ends in '/' so that * URIs created relative to it are under the directory. This requires that * build-test.xml artifacts exist. * * @throws Exception */ public void testDirURIs() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile outerJar = vfs.findChild("unpacked-outer.jar"); URI outerURI = outerJar.toURI(); log.debug("outerURI: "+outerURI); assertTrue(outerURI+" ends in '/'", outerURI.getPath().endsWith("/")); // Validate that jar1 is under unpacked-outer.jar URI jar1URI = new URI(outerURI+"jar1.jar"); log.debug("jar1URI: "+jar1URI+", path="+jar1URI.getPath()); assertTrue("jar1URI path ends in unpacked-outer.jar/jar1.jar!/", jar1URI.getPath().endsWith("unpacked-outer.jar/jar1.jar")); VirtualFile jar1 = outerJar.findChild("jar1.jar"); assertEquals(jar1URI, jar1.toURI()); VirtualFile packedJar = vfs.findChild("jar1.jar"); jar1URI = packedJar.findChild("org/jboss/test/vfs/support").toURI(); assertTrue("Jar directory entry URLs must end in /: " + jar1URI.toString(), jar1URI.toString().endsWith("/")); } /** * Test copying a jar * * @throws Exception */ public void testCopyJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild("outer.jar"); assertTrue("outer.jar != null", jar != null); File tmpJar = File.createTempFile("testCopyJar", ".jar"); tmpJar.deleteOnExit(); try { InputStream is = jar.openStream(); FileOutputStream fos = new FileOutputStream(tmpJar); byte[] buffer = new byte[1024]; int read; while( (read = is.read(buffer)) > 0 ) { fos.write(buffer, 0, read); } fos.close(); log.debug("outer.jar size is: "+jar.getSize()); log.debug(tmpJar.getAbsolutePath()+" size is: "+tmpJar.length()); assertTrue("outer.jar > 0", jar.getSize() > 0); assertEquals("copy jar size", jar.getSize(), tmpJar.length()); jar.close(); } finally { try { tmpJar.delete(); } catch(Exception ignore) { } } } /** * Test copying a jar that is nested in another jar. * * @throws Exception */ public void testCopyInnerJar() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile outerjar = vfs.findChild("outer.jar"); assertTrue("outer.jar != null", outerjar != null); VirtualFile jar = outerjar.findChild("jar1.jar"); assertTrue("outer.jar/jar1.jar != null", jar != null); File tmpJar = File.createTempFile("testCopyInnerJar", ".jar"); tmpJar.deleteOnExit(); try { InputStream is = jar.openStream(); FileOutputStream fos = new FileOutputStream(tmpJar); byte[] buffer = new byte[1024]; int read; while( (read = is.read(buffer)) > 0 ) { fos.write(buffer, 0, read); } fos.close(); log.debug("outer.jar/jar1.jar size is: "+jar.getSize()); log.debug(tmpJar.getAbsolutePath()+" size is: "+tmpJar.length()); assertTrue("outer.jar > 0", jar.getSize() > 0); assertEquals("copy jar size", jar.getSize(), tmpJar.length()); jar.close(); } finally { try { tmpJar.delete(); } catch(Exception ignore) { } } } /** * Test that the outermf.jar manifest classpath is parsed * correctly. * * @throws Exception */ public void testManifestClasspath() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile outerjar = vfs.findChild("outermf.jar"); assertNotNull("outermf.jar != null", outerjar); ArrayList<VirtualFile> cp = new ArrayList<VirtualFile>(); VFSUtils.addManifestLocations(outerjar, cp); // The p0.jar should be found in the classpath assertEquals("cp size 2", 2, cp.size()); assertEquals("jar1.jar == cp[0]", "jar1.jar", cp.get(0).getName()); assertEquals("jar2.jar == cp[1]", "jar2.jar", cp.get(1).getName()); } /** * Test that an inner-inner jar that is extracted does not blowup * the addManifestLocations routine. * * @throws Exception */ public void testInnerManifestClasspath() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile outerjar = vfs.getChild("withalong/rootprefix/outermf.jar"); assertNotNull(outerjar); VirtualFile jar1 = outerjar.getChild("jar1.jar"); assertNotNull(jar1); VirtualFile jar2 = outerjar.getChild("jar2.jar"); assertNotNull(jar2); VirtualFile innerjar = outerjar.getChild("innermf.jar"); assertNotNull("innermf.jar != null", innerjar); ArrayList<VirtualFile> cp = new ArrayList<VirtualFile>(); VFSUtils.addManifestLocations(innerjar, cp); assertEquals(2, cp.size()); VirtualFile cp0 = cp.get(0); assertEquals(jar1, cp0); VirtualFile cp1 = cp.get(1); assertEquals(jar2, cp1); } /** * Validate accessing an packed jar vf and its uri when the vfs path * contains spaces * @throws Exception */ public void testJarWithSpacesInPath() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile tstjar = vfs.findChild("path with spaces/tst.jar"); assertNotNull("tstjar != null", tstjar); URI uri = tstjar.toURI(); URI expectedURI = new URI("vfs"+rootURL.toString()+"/path%20with%20spaces/tst.jar"); assertEquals(uri, expectedURI); } public static void main(String[] args) throws Exception { File file = new File("C:\\Documents and Settings"); System.out.println(file.toURI()); System.out.println(file.toURL().getHost()); URI uri = new URI("file", null, "/Document and Settings", null); System.out.println(uri); } /** * Validate accessing an unpacked jar vf and its uri when the vfs path * contains spaces * @throws Exception */ public void testUnpackedJarWithSpacesInPath() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile tstjar = vfs.findChild("path with spaces/unpacked-tst.jar"); assertNotNull("tstjar != null", tstjar); URI uri = tstjar.toURI(); URI expectedURI = new URI("vfs" + rootURL.toString()+"/path%20with%20spaces/unpacked-tst.jar/"); assertEquals(uri, expectedURI); } /** * Tests that we can find the META-INF/some-data.xml in an unpacked deployment * * @throws Exception for any error */ public void testGetMetaDataUnpackedJar() throws Exception { testGetMetaDataFromJar("unpacked-with-metadata.jar"); } /** * Tests that we can find the META-INF/some-data.xml in a packed deployment * * @throws Exception for any error */ public void testGetMetaDataPackedJar() throws Exception { testGetMetaDataFromJar("with-metadata.jar"); } private void testGetMetaDataFromJar(String name) throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); VirtualFile jar = vfs.findChild(name); assertNotNull(jar); VirtualFile metadataLocation = jar.findChild("META-INF"); assertNotNull(metadataLocation); VirtualFile metadataByName = metadataLocation.findChild("some-data.xml"); assertNotNull(metadataByName); //This is the same code as is called by AbstractDeploymentContext.getMetaDataFiles(String name, String suffix). //The MetaDataMatchFilter is a copy of the one used there List<VirtualFile> metaDataList = metadataLocation.getChildren(new MetaDataMatchFilter(null, "-data.xml")); assertNotNull(metaDataList); assertEquals("Wrong size", 1, metaDataList.size()); } /** * Validate that a URLClassLoader.findReource/getResourceAsStream calls for non-existing absolute * resources that should fail as expected with null results. Related to JBMICROCONT-139. * * @throws Exception */ public void testURLClassLoaderFindResourceFailure() throws Exception { URL rootURL = getResource("/vfs/test"); VFS vfs = VFS.getVFS(rootURL); URL[] cp = {vfs.getRoot().toURL()}; URLClassLoader ucl = new URLClassLoader(cp); // Search for a non-existent absolute resource URL qp = ucl.findResource("/nosuch-quartz.props"); assertNull("findResource(/nosuch-quartz.props)", qp); InputStream is = ucl.getResourceAsStream("/nosuch-quartz.props"); assertNull("getResourceAsStream(/nosuch-quartz.props)", is); } /** * Test VirtualFile.exists for vfsfile based urls. * * @throws Exception */ public void testFileExists() throws Exception { File tmpRoot = File.createTempFile("vfs", ".root"); tmpRoot.delete(); tmpRoot.mkdir(); File tmp = File.createTempFile("testFileExists", null, tmpRoot); log.info("+++ testFileExists, tmp="+tmp.getCanonicalPath()); URL rootURL = tmpRoot.toURL(); VFS vfs = VFS.getVFS(rootURL); VirtualFile tmpVF = vfs.findChild(tmp.getName()); assertTrue(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertTrue("tmp.delete()", tmp.delete()); assertFalse(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertTrue(tmpRoot+".delete()", tmpRoot.delete()); } /** * Test VirtualFile.exists for vfsfile based urls for a directory. * * @throws Exception */ public void testDirFileExists() throws Exception { File tmpRoot = File.createTempFile("vfs", ".root"); tmpRoot.delete(); tmpRoot.mkdir(); File tmp = File.createTempFile("testFileExists", null, tmpRoot); assertTrue(tmp+".delete()", tmp.delete()); assertTrue(tmp+".mkdir()", tmp.mkdir()); log.info("+++ testDirFileExists, tmp="+tmp.getCanonicalPath()); URL rootURL = tmpRoot.toURL(); VFS vfs = VFS.getVFS(rootURL); VirtualFile tmpVF = vfs.findChild(tmp.getName()); assertTrue(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertFalse(tmpVF.getPathName()+".isLeaf()", tmpVF.isLeaf()); assertTrue(tmp+".delete()", tmp.delete()); assertFalse(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertTrue(tmpRoot+".delete()", tmpRoot.delete()); } /** * Test VirtualFile.exists for vfsjar based urls. * * @throws Exception */ public void testJarExists() throws Exception { File tmpRoot = File.createTempFile("vfs", ".root"); tmpRoot.delete(); tmpRoot.mkdir(); File tmpJar = File.createTempFile("testJarExists", ".jar", tmpRoot); log.info("+++ testJarExists, tmpJar="+tmpJar.getCanonicalPath()); Manifest mf = new Manifest(); mf.getMainAttributes().putValue("Created-By", "FileVFSUnitTestCase.testJarExists"); FileOutputStream fos = new FileOutputStream(tmpJar); JarOutputStream jos = new JarOutputStream(fos, mf); jos.setComment("testJarExists"); jos.setLevel(0); jos.close(); URL rootURL = tmpRoot.toURL(); VFS vfs = VFS.getVFS(rootURL); VirtualFile tmpVF = vfs.findChild(tmpJar.getName()); assertTrue(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertTrue(tmpVF.getPathName()+".size() > 0", tmpVF.getSize() > 0); assertTrue("tmp.delete()", tmpJar.delete()); assertFalse(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertTrue(tmpRoot+".delete()", tmpRoot.delete()); } /** * Test VirtualFile.exists for vfsjar based urls for a directory. * * @throws Exception */ public void testDirJarExists() throws Exception { File tmpRoot = File.createTempFile("vfs", ".root"); tmpRoot.delete(); tmpRoot.mkdir(); File tmp = File.createTempFile("testDirJarExists", ".jar", tmpRoot); assertTrue(tmp+".delete()", tmp.delete()); assertTrue(tmp+".mkdir()", tmp.mkdir()); log.info("+++ testDirJarExists, tmp="+tmp.getCanonicalPath()); URL rootURL = tmpRoot.toURL(); VFS vfs = VFS.getVFS(rootURL); VirtualFile tmpVF = vfs.findChild(tmp.getName()); log.info(tmpVF.getHandler()); assertTrue(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertFalse(tmpVF.getPathName()+".isLeaf()", tmpVF.isLeaf()); assertTrue(tmp+".delete()", tmp.delete()); assertFalse(tmpVF.getPathName()+".exists()", tmpVF.exists()); assertTrue(tmpRoot+".delete()", tmpRoot.delete()); } }

diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index e4eb29fb..6e03032e 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -1,601 +1,601 @@ /* * Copyright 2011 gitblit.com. * * 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 com.gitblit.wicket; import java.text.DateFormat; import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; import java.util.List; import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.Request; import org.apache.wicket.behavior.HeaderContributor; import org.apache.wicket.behavior.SimpleAttributeModifier; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.ContextImage; import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.resource.ContextRelativeResource; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.wicketstuff.googlecharts.AbstractChartData; import org.wicketstuff.googlecharts.IChartData; import com.gitblit.Constants; import com.gitblit.Constants.FederationPullStatus; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.FederationModel; import com.gitblit.models.Metric; import com.gitblit.utils.HttpUtils; import com.gitblit.utils.StringUtils; import com.gitblit.utils.TimeUtils; public class WicketUtils { public static void setCssClass(Component container, String value) { container.add(new SimpleAttributeModifier("class", value)); } public static void setCssStyle(Component container, String value) { container.add(new SimpleAttributeModifier("style", value)); } public static void setCssBackground(Component container, String value) { String background = MessageFormat.format("background-color:{0};", StringUtils.getColor(value)); container.add(new SimpleAttributeModifier("style", background)); } public static void setHtmlTooltip(Component container, String value) { container.add(new SimpleAttributeModifier("title", value)); } public static void setInputPlaceholder(Component container, String value) { container.add(new SimpleAttributeModifier("placeholder", value)); } public static void setChangeTypeCssClass(Component container, ChangeType type) { switch (type) { case ADD: setCssClass(container, "addition"); break; case COPY: case RENAME: setCssClass(container, "rename"); break; case DELETE: setCssClass(container, "deletion"); break; case MODIFY: setCssClass(container, "modification"); break; } } public static void setTicketCssClass(Component container, String state) { String css = null; if (state.equals("open")) { css = "label label-important"; } else if (state.equals("hold")) { css = "label label-warning"; } else if (state.equals("resolved")) { css = "label label-success"; } else if (state.equals("invalid")) { css = "label"; } if (css != null) { setCssClass(container, css); } } public static void setAlternatingBackground(Component c, int i) { String clazz = i % 2 == 0 ? "light" : "dark"; setCssClass(c, clazz); } public static Label createAuthorLabel(String wicketId, String author) { Label label = new Label(wicketId, author); WicketUtils.setHtmlTooltip(label, author); return label; } public static ContextImage getPullStatusImage(String wicketId, FederationPullStatus status) { String filename = null; switch (status) { case MIRRORED: case PULLED: filename = "bullet_green.png"; break; case SKIPPED: filename = "bullet_yellow.png"; break; case FAILED: filename = "bullet_red.png"; break; case EXCLUDED: filename = "bullet_white.png"; break; case PENDING: case NOCHANGE: default: filename = "bullet_black.png"; } return WicketUtils.newImage(wicketId, filename, status.name()); } public static ContextImage getFileImage(String wicketId, String filename) { filename = filename.toLowerCase(); if (filename.endsWith(".java")) { return newImage(wicketId, "file_java_16x16.png"); } else if (filename.endsWith(".rb")) { return newImage(wicketId, "file_ruby_16x16.png"); } else if (filename.endsWith(".php")) { return newImage(wicketId, "file_php_16x16.png"); } else if (filename.endsWith(".cs")) { return newImage(wicketId, "file_cs_16x16.png"); } else if (filename.endsWith(".cpp")) { return newImage(wicketId, "file_cpp_16x16.png"); } else if (filename.endsWith(".c")) { return newImage(wicketId, "file_c_16x16.png"); } else if (filename.endsWith(".h")) { return newImage(wicketId, "file_h_16x16.png"); } else if (filename.endsWith(".sln")) { return newImage(wicketId, "file_vs_16x16.png"); } else if (filename.endsWith(".csv") || filename.endsWith(".xls") || filename.endsWith(".xlsx")) { return newImage(wicketId, "file_excel_16x16.png"); } else if (filename.endsWith(".doc") || filename.endsWith(".docx")) { - return newImage(wicketId, "file_word_16x16.png"); + return newImage(wicketId, "file_doc_16x16.png"); } else if (filename.endsWith(".ppt")) { return newImage(wicketId, "file_ppt_16x16.png"); } else if (filename.endsWith(".zip")) { return newImage(wicketId, "file_zip_16x16.png"); } else if (filename.endsWith(".pdf")) { return newImage(wicketId, "file_acrobat_16x16.png"); } else if (filename.endsWith(".htm") || filename.endsWith(".html")) { return newImage(wicketId, "file_world_16x16.png"); } else if (filename.endsWith(".xml")) { return newImage(wicketId, "file_code_16x16.png"); } else if (filename.endsWith(".properties")) { return newImage(wicketId, "file_settings_16x16.png"); } List<String> mdExtensions = GitBlit.getStrings(Keys.web.markdownExtensions); for (String ext : mdExtensions) { if (filename.endsWith('.' + ext.toLowerCase())) { return newImage(wicketId, "file_world_16x16.png"); } } return newImage(wicketId, "file_16x16.png"); } public static ContextImage getRegistrationImage(String wicketId, FederationModel registration, Component c) { if (registration.isResultData()) { return WicketUtils.newImage(wicketId, "information_16x16.png", c.getString("gb.federationResults")); } else { return WicketUtils.newImage(wicketId, "arrow_left.png", c.getString("gb.federationRegistration")); } } public static ContextImage newClearPixel(String wicketId) { return newImage(wicketId, "pixel.png"); } public static ContextImage newBlankImage(String wicketId) { return newImage(wicketId, "blank.png"); } public static ContextImage newImage(String wicketId, String file) { return newImage(wicketId, file, null); } public static ContextImage newImage(String wicketId, String file, String tooltip) { ContextImage img = new ContextImage(wicketId, file); if (!StringUtils.isEmpty(tooltip)) { setHtmlTooltip(img, tooltip); } return img; } public static Label newIcon(String wicketId, String css) { Label lbl = new Label(wicketId); setCssClass(lbl, css); return lbl; } public static Label newBlankIcon(String wicketId) { Label lbl = new Label(wicketId); setCssClass(lbl, ""); lbl.setRenderBodyOnly(true); return lbl; } public static ContextRelativeResource getResource(String file) { return new ContextRelativeResource(file); } public static String getGitblitURL(Request request) { HttpServletRequest req = ((WebRequest) request).getHttpServletRequest(); return HttpUtils.getGitblitURL(req); } public static HeaderContributor syndicationDiscoveryLink(final String feedTitle, final String url) { return new HeaderContributor(new IHeaderContributor() { private static final long serialVersionUID = 1L; public void renderHead(IHeaderResponse response) { String contentType = "application/rss+xml"; StringBuilder buffer = new StringBuilder(); buffer.append("<link rel=\"alternate\" "); buffer.append("type=\"").append(contentType).append("\" "); buffer.append("title=\"").append(feedTitle).append("\" "); buffer.append("href=\"").append(url).append("\" />"); response.renderString(buffer.toString()); } }); } public static PageParameters newTokenParameter(String token) { return new PageParameters("t=" + token); } public static PageParameters newRegistrationParameter(String url, String name) { return new PageParameters("u=" + url + ",n=" + name); } public static PageParameters newUsernameParameter(String username) { return new PageParameters("user=" + username); } public static PageParameters newTeamnameParameter(String teamname) { return new PageParameters("team=" + teamname); } public static PageParameters newProjectParameter(String projectName) { return new PageParameters("p=" + projectName); } public static PageParameters newRepositoryParameter(String repositoryName) { return new PageParameters("r=" + repositoryName); } public static PageParameters newObjectParameter(String objectId) { return new PageParameters("h=" + objectId); } public static PageParameters newObjectParameter(String repositoryName, String objectId) { if (StringUtils.isEmpty(objectId)) { return newRepositoryParameter(repositoryName); } return new PageParameters("r=" + repositoryName + ",h=" + objectId); } public static PageParameters newPathParameter(String repositoryName, String objectId, String path) { if (StringUtils.isEmpty(path)) { return newObjectParameter(repositoryName, objectId); } if (StringUtils.isEmpty(objectId)) { return new PageParameters("r=" + repositoryName + ",f=" + path); } return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path); } public static PageParameters newLogPageParameter(String repositoryName, String objectId, int pageNumber) { if (pageNumber <= 1) { return newObjectParameter(repositoryName, objectId); } if (StringUtils.isEmpty(objectId)) { return new PageParameters("r=" + repositoryName + ",pg=" + pageNumber); } return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",pg=" + pageNumber); } public static PageParameters newHistoryPageParameter(String repositoryName, String objectId, String path, int pageNumber) { if (pageNumber <= 1) { return newObjectParameter(repositoryName, objectId); } if (StringUtils.isEmpty(objectId)) { return new PageParameters("r=" + repositoryName + ",f=" + path + ",pg=" + pageNumber); } return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path + ",pg=" + pageNumber); } public static PageParameters newBlobDiffParameter(String repositoryName, String baseCommitId, String commitId, String path) { if (StringUtils.isEmpty(commitId)) { return new PageParameters("r=" + repositoryName + ",f=" + path + ",hb=" + baseCommitId); } return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",f=" + path + ",hb=" + baseCommitId); } public static PageParameters newSearchParameter(String repositoryName, String commitId, String search, Constants.SearchType type) { if (StringUtils.isEmpty(commitId)) { return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name()); } return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search + ",st=" + type.name()); } public static PageParameters newSearchParameter(String repositoryName, String commitId, String search, Constants.SearchType type, int pageNumber) { if (StringUtils.isEmpty(commitId)) { return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name() + ",pg=" + pageNumber); } return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search + ",st=" + type.name() + ",pg=" + pageNumber); } public static String getProjectName(PageParameters params) { return params.getString("p", ""); } public static String getRepositoryName(PageParameters params) { return params.getString("r", ""); } public static String getObject(PageParameters params) { return params.getString("h", null); } public static String getPath(PageParameters params) { return params.getString("f", null); } public static String getBaseObjectId(PageParameters params) { return params.getString("hb", null); } public static String getSearchString(PageParameters params) { return params.getString("s", null); } public static String getSearchType(PageParameters params) { return params.getString("st", null); } public static int getPage(PageParameters params) { // index from 1 return params.getInt("pg", 1); } public static String getRegEx(PageParameters params) { return params.getString("x", ""); } public static String getSet(PageParameters params) { return params.getString("set", ""); } public static String getTeam(PageParameters params) { return params.getString("team", ""); } public static int getDaysBack(PageParameters params) { return params.getInt("db", 14); } public static String getUsername(PageParameters params) { return params.getString("user", ""); } public static String getTeamname(PageParameters params) { return params.getString("team", ""); } public static String getToken(PageParameters params) { return params.getString("t", ""); } public static String getUrlParameter(PageParameters params) { return params.getString("u", ""); } public static String getNameParameter(PageParameters params) { return params.getString("n", ""); } public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone, TimeUtils timeUtils) { String format = GitBlit.getString(Keys.web.datestampShortFormat, "MM/dd/yy"); DateFormat df = new SimpleDateFormat(format); if (timeZone == null) { timeZone = GitBlit.getTimezone(); } df.setTimeZone(timeZone); String dateString; if (date.getTime() == 0) { dateString = "--"; } else { dateString = df.format(date); } String title = null; if (date.getTime() <= System.currentTimeMillis()) { // past title = timeUtils.timeAgo(date); } if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) { String tmp = dateString; dateString = title; title = tmp; } Label label = new Label(wicketId, dateString); WicketUtils.setCssClass(label, timeUtils.timeAgoCss(date)); if (!StringUtils.isEmpty(title)) { WicketUtils.setHtmlTooltip(label, title); } return label; } public static Label createTimeLabel(String wicketId, Date date, TimeZone timeZone, TimeUtils timeUtils) { String format = GitBlit.getString(Keys.web.timeFormat, "HH:mm"); DateFormat df = new SimpleDateFormat(format); if (timeZone == null) { timeZone = GitBlit.getTimezone(); } df.setTimeZone(timeZone); String timeString; if (date.getTime() == 0) { timeString = "--"; } else { timeString = df.format(date); } String title = timeUtils.timeAgo(date); Label label = new Label(wicketId, timeString); if (!StringUtils.isEmpty(title)) { WicketUtils.setHtmlTooltip(label, title); } return label; } public static Label createDatestampLabel(String wicketId, Date date, TimeZone timeZone, TimeUtils timeUtils) { String format = GitBlit.getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy"); DateFormat df = new SimpleDateFormat(format); if (timeZone == null) { timeZone = GitBlit.getTimezone(); } df.setTimeZone(timeZone); String dateString; if (date.getTime() == 0) { dateString = "--"; } else { dateString = df.format(date); } String title = null; if (TimeUtils.isToday(date)) { title = timeUtils.today(); } else if (TimeUtils.isYesterday(date)) { title = timeUtils.yesterday(); } else if (date.getTime() <= System.currentTimeMillis()) { // past title = timeUtils.timeAgo(date); } if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) { String tmp = dateString; dateString = title; title = tmp; } Label label = new Label(wicketId, dateString); if (!StringUtils.isEmpty(title)) { WicketUtils.setHtmlTooltip(label, title); } return label; } public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone, TimeUtils timeUtils) { String format = GitBlit.getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy HH:mm Z"); DateFormat df = new SimpleDateFormat(format); if (timeZone == null) { timeZone = GitBlit.getTimezone(); } df.setTimeZone(timeZone); String dateString; if (date.getTime() == 0) { dateString = "--"; } else { dateString = df.format(date); } String title = null; if (date.getTime() <= System.currentTimeMillis()) { // past title = timeUtils.timeAgo(date); } Label label = new Label(wicketId, dateString); if (!StringUtils.isEmpty(title)) { WicketUtils.setHtmlTooltip(label, title); } return label; } public static IChartData getChartData(Collection<Metric> metrics) { final double[] commits = new double[metrics.size()]; final double[] tags = new double[metrics.size()]; int i = 0; double max = 0; for (Metric m : metrics) { commits[i] = m.count; if (m.tag > 0) { tags[i] = m.count; } else { tags[i] = -1d; } max = Math.max(max, m.count); i++; } IChartData data = new AbstractChartData(max) { private static final long serialVersionUID = 1L; public double[][] getData() { return new double[][] { commits, tags }; } }; return data; } public static double maxValue(Collection<Metric> metrics) { double max = Double.MIN_VALUE; for (Metric m : metrics) { if (m.count > max) { max = m.count; } } return max; } public static IChartData getScatterData(Collection<Metric> metrics) { final double[] y = new double[metrics.size()]; final double[] x = new double[metrics.size()]; int i = 0; double max = 0; for (Metric m : metrics) { y[i] = m.count; if (m.duration > 0) { x[i] = m.duration; } else { x[i] = -1d; } max = Math.max(max, m.count); i++; } IChartData data = new AbstractChartData(max) { private static final long serialVersionUID = 1L; public double[][] getData() { return new double[][] { x, y }; } }; return data; } }

public static ContextImage getFileImage(String wicketId, String filename) { filename = filename.toLowerCase(); if (filename.endsWith(".java")) { return newImage(wicketId, "file_java_16x16.png"); } else if (filename.endsWith(".rb")) { return newImage(wicketId, "file_ruby_16x16.png"); } else if (filename.endsWith(".php")) { return newImage(wicketId, "file_php_16x16.png"); } else if (filename.endsWith(".cs")) { return newImage(wicketId, "file_cs_16x16.png"); } else if (filename.endsWith(".cpp")) { return newImage(wicketId, "file_cpp_16x16.png"); } else if (filename.endsWith(".c")) { return newImage(wicketId, "file_c_16x16.png"); } else if (filename.endsWith(".h")) { return newImage(wicketId, "file_h_16x16.png"); } else if (filename.endsWith(".sln")) { return newImage(wicketId, "file_vs_16x16.png"); } else if (filename.endsWith(".csv") || filename.endsWith(".xls") || filename.endsWith(".xlsx")) { return newImage(wicketId, "file_excel_16x16.png"); } else if (filename.endsWith(".doc") || filename.endsWith(".docx")) { return newImage(wicketId, "file_word_16x16.png"); } else if (filename.endsWith(".ppt")) { return newImage(wicketId, "file_ppt_16x16.png"); } else if (filename.endsWith(".zip")) { return newImage(wicketId, "file_zip_16x16.png"); } else if (filename.endsWith(".pdf")) { return newImage(wicketId, "file_acrobat_16x16.png"); } else if (filename.endsWith(".htm") || filename.endsWith(".html")) { return newImage(wicketId, "file_world_16x16.png"); } else if (filename.endsWith(".xml")) { return newImage(wicketId, "file_code_16x16.png"); } else if (filename.endsWith(".properties")) { return newImage(wicketId, "file_settings_16x16.png"); } List<String> mdExtensions = GitBlit.getStrings(Keys.web.markdownExtensions); for (String ext : mdExtensions) { if (filename.endsWith('.' + ext.toLowerCase())) { return newImage(wicketId, "file_world_16x16.png"); } } return newImage(wicketId, "file_16x16.png"); }

public static ContextImage getFileImage(String wicketId, String filename) { filename = filename.toLowerCase(); if (filename.endsWith(".java")) { return newImage(wicketId, "file_java_16x16.png"); } else if (filename.endsWith(".rb")) { return newImage(wicketId, "file_ruby_16x16.png"); } else if (filename.endsWith(".php")) { return newImage(wicketId, "file_php_16x16.png"); } else if (filename.endsWith(".cs")) { return newImage(wicketId, "file_cs_16x16.png"); } else if (filename.endsWith(".cpp")) { return newImage(wicketId, "file_cpp_16x16.png"); } else if (filename.endsWith(".c")) { return newImage(wicketId, "file_c_16x16.png"); } else if (filename.endsWith(".h")) { return newImage(wicketId, "file_h_16x16.png"); } else if (filename.endsWith(".sln")) { return newImage(wicketId, "file_vs_16x16.png"); } else if (filename.endsWith(".csv") || filename.endsWith(".xls") || filename.endsWith(".xlsx")) { return newImage(wicketId, "file_excel_16x16.png"); } else if (filename.endsWith(".doc") || filename.endsWith(".docx")) { return newImage(wicketId, "file_doc_16x16.png"); } else if (filename.endsWith(".ppt")) { return newImage(wicketId, "file_ppt_16x16.png"); } else if (filename.endsWith(".zip")) { return newImage(wicketId, "file_zip_16x16.png"); } else if (filename.endsWith(".pdf")) { return newImage(wicketId, "file_acrobat_16x16.png"); } else if (filename.endsWith(".htm") || filename.endsWith(".html")) { return newImage(wicketId, "file_world_16x16.png"); } else if (filename.endsWith(".xml")) { return newImage(wicketId, "file_code_16x16.png"); } else if (filename.endsWith(".properties")) { return newImage(wicketId, "file_settings_16x16.png"); } List<String> mdExtensions = GitBlit.getStrings(Keys.web.markdownExtensions); for (String ext : mdExtensions) { if (filename.endsWith('.' + ext.toLowerCase())) { return newImage(wicketId, "file_world_16x16.png"); } } return newImage(wicketId, "file_16x16.png"); }

diff --git a/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java b/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java index 8ea9ed763..9be168028 100644 --- a/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java +++ b/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java @@ -1,133 +1,134 @@ package org.apache.lucene.index; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You 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. */ import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.IdentityHashMap; import java.util.Map; import java.util.Set; import org.apache.lucene.index.codecs.Codec; import org.apache.lucene.index.codecs.CodecProvider; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; /** * SegmentCodecs maintains an ordered list of distinct codecs used within a * segment. Within a segment on codec is used to write multiple fields while * each field could be written by a different codec. To enable codecs per field * within a single segment we need to record the distinct codecs and map them to * each field present in the segment. SegmentCodecs is created together with * {@link SegmentWriteState} for each flush and is maintained in the * corresponding {@link SegmentInfo} until it is committed. * <p> * {@link SegmentCodecs#build(FieldInfos, CodecProvider)} should be used to * create a {@link SegmentCodecs} instance during {@link IndexWriter} sessions * which creates the ordering of distinct codecs and assigns the * {@link FieldInfo#codecId} or in other words, the ord of the codec maintained * inside {@link SegmentCodecs}, to the {@link FieldInfo}. This ord is valid * only until the current segment is flushed and {@link FieldInfos} for that * segment are written including the ord for each field. This ord is later used * to get the right codec when the segment is opened in a reader. The * {@link Codec} returned from {@link SegmentCodecs#codec()} in turn uses * {@link SegmentCodecs} internal structure to select and initialize the right * codec for a fields when it is written. * <p> * Once a flush succeeded the {@link SegmentCodecs} is maintained inside the * {@link SegmentInfo} for the flushed segment it was created for. * {@link SegmentInfo} writes the name of each codec in {@link SegmentCodecs} * for each segment and maintains the order. Later if a segment is opened by a * reader this mapping is deserialized and used to create the codec per field. * * * @lucene.internal */ final class SegmentCodecs implements Cloneable { /** * internal structure to map codecs to fields - don't modify this from outside * of this class! */ Codec[] codecs; final CodecProvider provider; private final Codec codec = new PerFieldCodecWrapper(this); SegmentCodecs(CodecProvider provider, Codec... codecs) { this.provider = provider; this.codecs = codecs; } static SegmentCodecs build(FieldInfos infos, CodecProvider provider) { final int size = infos.size(); final Map<Codec, Integer> codecRegistry = new IdentityHashMap<Codec, Integer>(); final ArrayList<Codec> codecs = new ArrayList<Codec>(); for (int i = 0; i < size; i++) { final FieldInfo info = infos.fieldInfo(i); if (info.isIndexed) { final Codec fieldCodec = provider.lookup(provider .getFieldCodec(info.name)); Integer ord = codecRegistry.get(fieldCodec); if (ord == null) { ord = Integer.valueOf(codecs.size()); codecRegistry.put(fieldCodec, ord); codecs.add(fieldCodec); } info.codecId = ord.intValue(); } } return new SegmentCodecs(provider, codecs.toArray(Codec.EMPTY)); } Codec codec() { return codec; } void write(IndexOutput out) throws IOException { out.writeVInt(codecs.length); for (Codec codec : codecs) { out.writeString(codec.name); } } void read(IndexInput in) throws IOException { final int size = in.readVInt(); final ArrayList<Codec> list = new ArrayList<Codec>(); for (int i = 0; i < size; i++) { final String codecName = in.readString(); final Codec lookup = provider.lookup(codecName); list.add(i, lookup); } codecs = list.toArray(Codec.EMPTY); } void files(Directory dir, SegmentInfo info, Set<String> files) throws IOException { final Codec[] codecArray = codecs; for (int i = 0; i < codecArray.length; i++) { codecArray[i].files(dir, info, ""+i, files); } } @Override public String toString() { - return "CodecInfo [codecs=" + codecs + ", provider=" + provider + "]"; + return "SegmentCodecs [codecs=" + Arrays.toString(codecs) + ", provider=" + provider + "]"; } } \ No newline at end of file

diff --git a/ZPI1/src/com/pwr/zpi/ActivityActivity.java b/ZPI1/src/com/pwr/zpi/ActivityActivity.java index fea1275..e124b5a 100644 --- a/ZPI1/src/com/pwr/zpi/ActivityActivity.java +++ b/ZPI1/src/com/pwr/zpi/ActivityActivity.java @@ -1,542 +1,542 @@ package com.pwr.zpi; import java.util.LinkedList; import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.graphics.Color; import android.location.Location; import android.os.Bundle; import android.os.Handler; import android.support.v4.app.FragmentActivity; import android.support.v4.content.LocalBroadcastManager; import android.util.Log; import android.util.TypedValue; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; import com.google.android.gms.location.LocationClient; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Polyline; import com.google.android.gms.maps.model.PolylineOptions; import com.pwr.zpi.listeners.MyLocationListener; import com.pwr.zpi.services.MyServiceConnection; public class ActivityActivity extends FragmentActivity implements OnClickListener { private GoogleMap mMap; private Button stopButton; private Button pauseButton; private Button resumeButton; private TextView DataTextView1; private TextView DataTextView2; private TextView clickedContentTextView; private TextView LabelTextView1; private TextView LabelTextView2; private TextView clickedLabelTextView; private TextView unitTextView1; private TextView unitTextView2; private TextView clickedUnitTextView; private TextView GPSAccuracy; + private LinearLayout startStopLayout; private RelativeLayout dataRelativeLayout1; private RelativeLayout dataRelativeLayout2; private LinkedList<LinkedList<Location>> trace; private Location mLastLocation; private boolean isPaused; private PolylineOptions traceOnMap; private static final float traceThickness = 5; private static final int traceColor = Color.RED; // private static final long LOCATION_UPDATE_FREQUENCY = 1000; // measured values double pace; double avgPace; double distance; Long time = 0L; long startTime; long pauseTime; long pauseStartTime; private int dataTextView1Content; private int dataTextView2Content; private int clickedField; // measured values IDs private static final int distanceID = 0; private static final int paceID = 1; private static final int avgPaceID = 2; private static final int timeID = 3; // service data boolean mIsBound; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_activity); + setContentView(R.layout.activity_view); startTimer(); stopButton = (Button) findViewById(R.id.stopButton); pauseButton = (Button) findViewById(R.id.pauseButton); resumeButton = (Button) findViewById(R.id.resumeButton); dataRelativeLayout1 = (RelativeLayout) findViewById(R.id.dataRelativeLayout1); dataRelativeLayout2 = (RelativeLayout) findViewById(R.id.dataRelativeLayout2); GPSAccuracy = (TextView) findViewById(R.id.TextViewGPSAccuracy); - + startStopLayout = (LinearLayout) findViewById(R.id.startStopLinearLayout); SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() .findFragmentById(R.id.map); mMap = mapFragment.getMap(); trace = new LinkedList<LinkedList<Location>>(); stopButton.setOnClickListener(this); resumeButton.setOnClickListener(this); pauseButton.setOnClickListener(this); dataRelativeLayout1.setOnClickListener(this); dataRelativeLayout2.setOnClickListener(this); GPSAccuracy.setText(getMyString(R.string.gps_accuracy)+" ?"); pauseTime = 0; traceOnMap = new PolylineOptions(); traceOnMap.width(traceThickness); traceOnMap.color(traceColor); DataTextView1 = (TextView) findViewById(R.id.dataTextView1); DataTextView2 = (TextView) findViewById(R.id.dataTextView2); LabelTextView1 = (TextView) findViewById(R.id.dataTextView1Discription); LabelTextView2 = (TextView) findViewById(R.id.dataTextView2Discription); unitTextView1 = (TextView) findViewById(R.id.dataTextView1Unit); unitTextView2 = (TextView) findViewById(R.id.dataTextView2Unit); // to change displayed info, change dataTextViewContent and start // initLabelsMethod dataTextView1Content = distanceID; dataTextView2Content = timeID; initLabels(DataTextView1, LabelTextView1, dataTextView1Content); initLabels(DataTextView2, LabelTextView2, dataTextView2Content); startTime = System.currentTimeMillis(); moveSystemControls(mapFragment); isPaused = false; doBindService(); LocalBroadcastManager.getInstance(this).registerReceiver(mMyServiceReceiver, new IntentFilter(MyLocationListener.class.getSimpleName())); } @Override protected void onDestroy() { LocalBroadcastManager.getInstance(this).unregisterReceiver(mMyServiceReceiver); doUnbindService(); super.onDestroy(); } Handler handler; Runnable timeHandler; private void startTimer() { handler = new Handler(); timeHandler = new Runnable() { @Override public void run() { runTimerTask(); } }; handler.post(timeHandler); } protected void runTimerTask() { synchronized (time) { time = System.currentTimeMillis() - startTime - pauseTime; runOnUiThread(new Runnable() { @Override public void run() { updateData(DataTextView1, dataTextView1Content); updateData(DataTextView2, dataTextView2Content); } }); } handler.postDelayed(timeHandler, 1000); } private void moveSystemControls(SupportMapFragment mapFragment) { View zoomControls = mapFragment.getView().findViewById(0x1); if (zoomControls != null && zoomControls.getLayoutParams() instanceof RelativeLayout.LayoutParams) { // ZoomControl is inside of RelativeLayout RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) zoomControls .getLayoutParams(); // Align it to - parent top|left params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); // nie do ko�ca rozumiem t� metod�, trzeba zobaczy� czy u Ciebie // jest to samo czy nie za bardzo final int margin = (int) TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, getResources().getDimension(R.dimen.zoom_buttons_margin), getResources().getDisplayMetrics()); params.setMargins(0, 0, 0, margin); } View locationControls = mapFragment.getView().findViewById(0x2); if (locationControls != null && locationControls.getLayoutParams() instanceof RelativeLayout.LayoutParams) { // ZoomControl is inside of RelativeLayout RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) locationControls .getLayoutParams(); // Align it to - parent top|left params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); // Update margins, set to 10dp final int margin1 = (int) TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, getResources().getDimension( R.dimen.location_button_margin_top), getResources() .getDisplayMetrics()); final int margin2 = (int) TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, getResources().getDimension( R.dimen.location_button_margin_right), getResources().getDisplayMetrics()); params.setMargins(0, margin1, margin2, 0); } } private void initLabels(TextView textViewInitialValue, TextView textView, int meassuredValue) { switch (meassuredValue) { case distanceID: textView.setText(R.string.distance); textViewInitialValue.setText("0.000"); break; case paceID: textView.setText(R.string.pace); textViewInitialValue.setText("0:00"); break; case avgPaceID: textView.setText(R.string.pace_avrage); textViewInitialValue.setText("0:00"); break; case timeID: textView.setText(R.string.time); textViewInitialValue.setText("00:00:00"); break; } } private void updateLabels(int meassuredValue, TextView labelTextView, TextView unitTextView, TextView contentTextView) { switch (meassuredValue) { case distanceID: labelTextView.setText(R.string.distance); unitTextView.setText(R.string.km); break; case paceID: labelTextView.setText(R.string.pace); unitTextView.setText(R.string.minutes_per_km); break; case avgPaceID: labelTextView.setText(R.string.pace_avrage); unitTextView.setText(R.string.minutes_per_km); break; case timeID: labelTextView.setText(R.string.time); unitTextView.setText(""); break; } updateData(contentTextView, meassuredValue); } @Override public void onBackPressed() { super.onBackPressed(); showAlertDialog(); } private void showAlertDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(this); // Add the buttons builder.setTitle(R.string.dialog_message_on_stop); builder.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { finish(); overridePendingTransition(R.anim.in_up_anim, R.anim.out_up_anim); } }); builder.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // User cancelled the dialog } }); // Set other dialog properties // Create the AlertDialog AlertDialog dialog = builder.create(); dialog.show(); } public void showLostGpsSignalDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(this); // Add the buttons builder.setTitle(R.string.dialog_message_on_lost_gpsp); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { } }); AlertDialog dialog = builder.create(); dialog.show(); } @Override public void onClick(View v) { if (v == stopButton) { // TODO finish and save activity showAlertDialog(); } else if (v == pauseButton) { //stop time isPaused = true; - stopButton.setVisibility(View.GONE); - pauseButton.setVisibility(View.GONE); + startStopLayout.setVisibility(View.INVISIBLE); resumeButton.setVisibility(View.VISIBLE); pauseStartTime = System.currentTimeMillis(); handler.removeCallbacks(timeHandler); } else if (v == resumeButton) { //start time isPaused = false; - stopButton.setVisibility(View.VISIBLE); - pauseButton.setVisibility(View.VISIBLE); - resumeButton.setVisibility(View.GONE); + startStopLayout.setVisibility(View.VISIBLE); + resumeButton.setVisibility(View.GONE); pauseTime += System.currentTimeMillis() - pauseStartTime; trace.add(new LinkedList<Location>()); handler.post(timeHandler); } else if (v == dataRelativeLayout1) { clickedContentTextView = DataTextView1; clickedLabelTextView = LabelTextView1; clickedUnitTextView = unitTextView1; clickedField = 1; showMeassuredValuesMenu(); } else if (v == dataRelativeLayout2) { clickedContentTextView = DataTextView2; clickedLabelTextView = LabelTextView2; clickedUnitTextView = unitTextView2; clickedField = 2; showMeassuredValuesMenu(); } } private String getMyString(int stringId) { return getResources().getString(stringId); } private void showMeassuredValuesMenu() { // chcia�em zrobi� tablice w stringach, ale potem zobaczy�em, �e ju� mam // te wszystkie nazwy i teraz nie wiem czy tamto zmienia� w tablic� czy // nie ma sensu // kolejno�� w tablicy musi odpowiada� nr ID, tzn 0 - dystans itp. final CharSequence[] items = { getMyString(R.string.distance), getMyString(R.string.pace), getMyString(R.string.pace_avrage), getMyString(R.string.time) }; AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.dialog_choose_what_to_display); builder.setItems(items, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { updateLabels(item, clickedLabelTextView, clickedUnitTextView, clickedContentTextView); if (clickedField == 1) dataTextView1Content = item; else dataTextView2Content = item; } }); AlertDialog alert = builder.create(); alert.show(); } private void updateData(TextView textBox, int meassuredValue) { switch (meassuredValue) { case distanceID: textBox.setText(String.format("%.3f", distance / 1000)); break; case paceID: if (pace < 30) { // convert pace to show second double rest = pace - (int) pace; rest = rest * 60; String secondsZero = (rest < 10) ? "0" : ""; textBox.setText(String.format("%d:%s%.0f", (int)pace, secondsZero, rest)); } else { textBox.setText(getResources().getString(R.string.dashes)); } break; case avgPaceID: if (avgPace < 30) { // convert pace to show second double rest = avgPace - (int) avgPace; rest = rest * 60; String secondsZero = (rest < 10) ? "0" : ""; textBox.setText(String.format("%d:%s%.0f", (int)avgPace, secondsZero, rest)); } else { textBox.setText(getResources().getString(R.string.dashes)); } break; case timeID: long hours = time / 3600000; long minutes = (time / 60000) - hours * 60; long seconds = (time / 1000) - hours * 3600 - minutes * 60; String hourZero = (hours < 10) ? "0" : ""; String minutesZero = (minutes < 10) ? "0" : ""; String secondsZero = (seconds < 10) ? "0" : ""; textBox.setText(String.format("%s%d:%s%d:%s%d", hourZero, hours, minutesZero, minutes, secondsZero, seconds)); break; } } public void countData(Location location, Location lastLocation) { Log.i("ActivityActivity", "countData: "+location); LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude()); traceOnMap.add(latLng); mMap.clear(); mMap.addPolyline(traceOnMap); mMap.animateCamera(CameraUpdateFactory.newLatLng(latLng)); float speed = location.getSpeed(); GPSAccuracy.setText(String.format("%s %.2f m", getString(R.string.gps_accuracy),location.getAccuracy())); pace = (double) 1 / (speed * 60 / 1000); distance += lastLocation.distanceTo(location); synchronized (time) { avgPace = ((double) time / 60) / distance; } updateData(DataTextView1, dataTextView1Content); updateData(DataTextView2, dataTextView2Content); } @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if ((keyCode == KeyEvent.KEYCODE_BACK)) { showAlertDialog(); } return super.onKeyDown(keyCode, event); } // SERVICE METHODS private ServiceConnection mConnection = new MyServiceConnection(); void doBindService() { Log.i("Service_info", "Activity Binding"); bindService(new Intent(ActivityActivity.this, MyLocationListener.class), mConnection, Context.BIND_AUTO_CREATE); mIsBound = true; } void doUnbindService() { Log.i("Service_info", "Activity Unbinding"); if (mIsBound) { unbindService(mConnection); mIsBound = false; } } // handler for the events launched by the service private BroadcastReceiver mMyServiceReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { Log.i("Service_info", "onReceive"); int messageType = intent.getIntExtra(MyLocationListener.MESSAGE, -1); switch (messageType) { case MyLocationListener.MSG_SEND_LOCATION: Log.i("Service_info", "ActivityActivity: got Location"); Location newLocation = (Location) intent.getParcelableExtra( "Location"); //no pause and good gps if (!isPaused && newLocation.getAccuracy() < MyLocationListener.REQUIRED_ACCURACY) { //not first point after start or resume if (!trace.isEmpty() && !trace.getLast().isEmpty()) { if (mLastLocation == null) Log.e("Location_info","Shouldn't be here, mLastLocation is null"); // TODO move trace to ActivityActivity countData(newLocation, mLastLocation); } if (trace.isEmpty()) trace.add(new LinkedList<Location>()); trace.getLast().add(newLocation); } else if (newLocation.getAccuracy() >= MyLocationListener.REQUIRED_ACCURACY) { //TODO make progress dialog, waiting for gps showLostGpsSignalDialog(); } mLastLocation = newLocation; break; } } }; }

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java index a4c7f1524..8c08bafe2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java @@ -1,583 +1,584 @@ /* * Copyright (C) 2010 The Android Open Source Project * * Licensed under the Eclipse Public License, Version 1.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.eclipse.org/org/documents/epl-v10.php * * 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 com.android.ide.eclipse.adt.internal.project; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.sdk.Sdk; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.SdkConstants; import com.android.sdklib.internal.project.ApkSettings; import com.android.sdklib.internal.project.ProjectProperties; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.regex.Matcher; /** * Centralized state for Android Eclipse project. * <p>This gives raw access to the properties (from <code>default.properties</code>), as well * as direct access to target, apksettings and library information. * */ public final class ProjectState { /** * A class that represents a library linked to a project. * <p/>It does not represent the library uniquely. Instead the {@link LibraryState} is linked * to the main project which is accessible through {@link #getMainProjectState()}. * <p/>If a library is used by two different projects, then there will be two different * instances of {@link LibraryState} for the library. * * @see ProjectState#getLibrary(IProject) */ public final class LibraryState { private String mRelativePath; private ProjectState mProjectState; private String mPath; private LibraryState(String relativePath) { mRelativePath = relativePath; } /** * Returns the {@link ProjectState} of the main project using this library. */ public ProjectState getMainProjectState() { return ProjectState.this; } /** * Closes the library. This resets the IProject from this object ({@link #getProjectState()} will * return <code>null</code>), and updates the main project data so that the library * {@link IProject} object does not show up in the return value of * {@link ProjectState#getLibraryProjects()}. */ public void close() { mProjectState = null; mPath = null; updateLibraries(); } private void setRelativePath(String relativePath) { mRelativePath = relativePath; } private void setProject(ProjectState project) { mProjectState = project; mPath = project.getProject().getLocation().toOSString(); updateLibraries(); } /** * Returns the relative path of the library from the main project. * <p/>This is identical to the value defined in the main project's default.properties. */ public String getRelativePath() { return mRelativePath; } /** * Returns the {@link ProjectState} item for the library. This can be null if the project * is not actually opened in Eclipse. */ public ProjectState getProjectState() { return mProjectState; } /** * Returns the OS-String location of the library project. * <p/>This is based on location of the Eclipse project that matched * {@link #getRelativePath()}. * * @return The project location, or null if the project is not opened in Eclipse. */ public String getProjectLocation() { return mPath; } @Override public boolean equals(Object obj) { if (obj instanceof LibraryState) { // the only thing that's always non-null is the relative path. LibraryState objState = (LibraryState)obj; return mRelativePath.equals(objState.mRelativePath) && getMainProjectState().equals(objState.getMainProjectState()); } else if (obj instanceof ProjectState || obj instanceof IProject) { return mProjectState != null && mProjectState.equals(obj); } else if (obj instanceof String) { return normalizePath(mRelativePath).equals(normalizePath((String) obj)); } return false; } @Override public int hashCode() { return mRelativePath.hashCode(); } } private final IProject mProject; private final ProjectProperties mProperties; /** * list of libraries. Access to this list must be protected by * <code>synchronized(mLibraries)</code>, but it is important that such code do not call * out to other classes (especially those protected by {@link Sdk#getLock()}.) */ private final ArrayList<LibraryState> mLibraries = new ArrayList<LibraryState>(); private IAndroidTarget mTarget; private ApkSettings mApkSettings; private IProject[] mLibraryProjects; public ProjectState(IProject project, ProjectProperties properties) { mProject = project; mProperties = properties; // load the ApkSettings mApkSettings = new ApkSettings(properties); // load the libraries synchronized (mLibraries) { int index = 1; while (true) { String propName = ProjectProperties.PROPERTY_LIB_REF + Integer.toString(index++); String rootPath = mProperties.getProperty(propName); if (rootPath == null) { break; } mLibraries.add(new LibraryState(convertPath(rootPath))); } } } public IProject getProject() { return mProject; } public ProjectProperties getProperties() { return mProperties; } public void setTarget(IAndroidTarget target) { mTarget = target; } /** * Returns the project's target's hash string. * <p/>If {@link #getTarget()} returns a valid object, then this returns the value of * {@link IAndroidTarget#hashString()}. * <p/>Otherwise this will return the value of the property * {@link ProjectProperties#PROPERTY_TARGET} from {@link #getProperties()} (if valid). * @return the target hash string or null if not found. */ public String getTargetHashString() { if (mTarget != null) { return mTarget.hashString(); } if (mProperties != null) { return mProperties.getProperty(ProjectProperties.PROPERTY_TARGET); } return null; } public IAndroidTarget getTarget() { return mTarget; } public static class LibraryDifference { public List<LibraryState> removed = new ArrayList<LibraryState>(); public boolean added = false; public boolean hasDiff() { return removed.size() > 0 || added; } } /** * Reloads the content of the properties. * <p/>This also reset the reference to the target as it may have changed. * <p/>This should be followed by a call to {@link Sdk#loadTarget(ProjectState)}. * * @return an instance of {@link LibraryDifference} describing the change in libraries. */ public LibraryDifference reloadProperties() { mTarget = null; mProperties.reload(); // compare/reload the libraries. // if the order change it won't impact the java part, so instead try to detect removed/added // libraries. LibraryDifference diff = new LibraryDifference(); synchronized (mLibraries) { List<LibraryState> oldLibraries = new ArrayList<LibraryState>(mLibraries); mLibraries.clear(); // load the libraries int index = 1; while (true) { String propName = ProjectProperties.PROPERTY_LIB_REF + Integer.toString(index++); String rootPath = mProperties.getProperty(propName); if (rootPath == null) { break; } // search for a library with the same path (not exact same string, but going // to the same folder). String convertedPath = convertPath(rootPath); boolean found = false; for (int i = 0 ; i < oldLibraries.size(); i++) { LibraryState libState = oldLibraries.get(i); if (libState.equals(convertedPath)) { // it's a match. move it back to mLibraries and remove it from the // old library list. found = true; mLibraries.add(libState); oldLibraries.remove(i); break; } } if (found == false) { diff.added = true; mLibraries.add(new LibraryState(convertedPath)); } } // whatever's left in oldLibraries is removed. diff.removed.addAll(oldLibraries); // update the library with what IProjet are known at the time. updateLibraries(); } return diff; } public void setApkSettings(ApkSettings apkSettings) { mApkSettings = apkSettings; } public ApkSettings getApkSettings() { return mApkSettings; } /** * Returns the list of {@link LibraryState}. */ public List<LibraryState> getLibraries() { synchronized (mLibraries) { return Collections.unmodifiableList(mLibraries); } } /** * Convenience method returning all the IProject objects for the resolved libraries. * <p/>If some dependencies are not resolved (or their projects is not opened in Eclipse), * they will not show up in this list. * @return the resolved projects or null if there are no project (either no resolved or no * dependencies) */ public IProject[] getLibraryProjects() { return mLibraryProjects; } /** * Returns whether this is a library project. */ public boolean isLibrary() { String value = mProperties.getProperty(ProjectProperties.PROPERTY_LIBRARY); return value != null && Boolean.valueOf(value); } /** * Returns whether the project depends on one or more libraries. */ public boolean hasLibraries() { synchronized (mLibraries) { return mLibraries.size() > 0; } } /** * Returns whether the project is missing some required libraries. */ public boolean isMissingLibraries() { synchronized (mLibraries) { for (LibraryState state : mLibraries) { if (state.getProjectState() == null) { return true; } } } return false; } /** * Returns the {@link LibraryState} object for a given {@link IProject}. * </p>This can only return a non-null object if the link between the main project's * {@link IProject} and the library's {@link IProject} was done. * * @return the matching LibraryState or <code>null</code> * * @see #needs(IProject) */ public LibraryState getLibrary(IProject library) { synchronized (mLibraries) { for (LibraryState state : mLibraries) { if (state.getProjectState().equals(library)) { return state; } } } return null; } public LibraryState getLibrary(String name) { synchronized (mLibraries) { for (LibraryState state : mLibraries) { if (state.getProjectState().getProject().getName().equals(name)) { return state; } } } return null; } /** * Returns whether a given library project is needed by the receiver. * <p/>If the library is needed, this finds the matching {@link LibraryState}, initializes it * so that it contains the library's {@link IProject} object (so that * {@link LibraryState#getProjectState()} does not return null) and then returns it. * * @param libraryProject the library project to check. * @return a non null object if the project is a library dependency, * <code>null</code> otherwise. * * @see LibraryState#getProjectState() */ public LibraryState needs(ProjectState libraryProject) { // compute current location File projectFile = mProject.getLocation().toFile(); // get the location of the library. File libraryFile = libraryProject.getProject().getLocation().toFile(); // loop on all libraries and check if the path match synchronized (mLibraries) { for (LibraryState state : mLibraries) { if (state.getProjectState() == null) { File library = new File(projectFile, state.getRelativePath()); try { File absPath = library.getCanonicalFile(); if (absPath.equals(libraryFile)) { state.setProject(libraryProject); return state; } } catch (IOException e) { // ignore this library } } } } return null; } /** * Updates a library with a new path. * <p/>This method acts both as a check and an action. If the project does not depend on the * given <var>oldRelativePath</var> then no action is done and <code>null</code> is returned. * <p/>If the project depends on the library, then the project is updated with the new path, * and the {@link LibraryState} for the library is returned. * <p/>Updating the project does two things:<ul> * <li>Update LibraryState with new relative path and new {@link IProject} object.</li> * <li>Update the main project's <code>default.properties</code> with the new relative path * for the changed library.</li> * </ul> * * @param oldRelativePath the old library path relative to this project * @param newRelativePath the new library path relative to this project * @param newLibraryState the new {@link ProjectState} object. * @return a non null object if the project depends on the library. * * @see LibraryState#getProjectState() */ public LibraryState updateLibrary(String oldRelativePath, String newRelativePath, ProjectState newLibraryState) { // compute current location File projectFile = mProject.getLocation().toFile(); // loop on all libraries and check if the path matches synchronized (mLibraries) { for (LibraryState state : mLibraries) { if (state.getProjectState() == null) { try { // oldRelativePath may not be the same exact string as the // one in the project properties (trailing separator could be different // for instance). // Use java.io.File to deal with this and also do a platform-dependent // path comparison File library1 = new File(projectFile, oldRelativePath); File library2 = new File(projectFile, state.getRelativePath()); if (library1.getCanonicalPath().equals(library2.getCanonicalPath())) { // save the exact property string to replace. String oldProperty = state.getRelativePath(); // then update the LibraryPath. state.setRelativePath(newRelativePath); state.setProject(newLibraryState); // update the default.properties file IStatus status = replaceLibraryProperty(oldProperty, newRelativePath); if (status != null) { if (status.getSeverity() != IStatus.OK) { // log the error somehow. } } else { // This should not happen since the library wouldn't be here in the // first place } // return the LibraryState object. return state; } } catch (IOException e) { // ignore this library } } } } return null; } /** * Saves the default.properties file and refreshes it to make sure that it gets reloaded * by Eclipse */ public void saveProperties() { try { mProperties.save(); IResource defaultProp = mProject.findMember(SdkConstants.FN_DEFAULT_PROPERTIES); defaultProp.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor()); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (CoreException e) { // TODO Auto-generated catch block e.printStackTrace(); } } private IStatus replaceLibraryProperty(String oldValue, String newValue) { int index = 1; while (true) { String propName = ProjectProperties.PROPERTY_LIB_REF + Integer.toString(index++); String rootPath = mProperties.getProperty(propName); if (rootPath == null) { break; } if (rootPath.equals(oldValue)) { mProperties.setProperty(propName, newValue); try { mProperties.save(); } catch (IOException e) { return new Status(IStatus.ERROR, AdtPlugin.PLUGIN_ID, String.format("Failed to save %1$s for project %2$s", mProperties.getType().getFilename(), mProject.getName()), e); } return Status.OK_STATUS; } } return null; } private void updateLibraries() { ArrayList<IProject> list = new ArrayList<IProject>(); synchronized (mLibraries) { for (LibraryState state : mLibraries) { if (state.getProjectState() != null) { list.add(state.getProjectState().getProject()); } } } mLibraryProjects = list.toArray(new IProject[list.size()]); } /** * Converts a path containing only / by the proper platform separator. */ private String convertPath(String path) { - return path.replaceAll("/", File.separator); //$NON-NLS-1$ + return path.replaceAll("/", Matcher.quoteReplacement(File.separator)); //$NON-NLS-1$ } /** * Normalizes a relative path. */ private String normalizePath(String path) { path = convertPath(path); if (path.endsWith("/")) { //$NON-NLS-1$ path = path.substring(0, path.length() - 1); } return path; } @Override public boolean equals(Object obj) { if (obj instanceof ProjectState) { return mProject.equals(((ProjectState) obj).mProject); } else if (obj instanceof IProject) { return mProject.equals(obj); } return false; } @Override public int hashCode() { return mProject.hashCode(); } }

diff --git a/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultBindingErrorMessageProvider.java b/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultBindingErrorMessageProvider.java index 3cf5b4c0..a42dac6c 100644 --- a/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultBindingErrorMessageProvider.java +++ b/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultBindingErrorMessageProvider.java @@ -1,76 +1,76 @@ /* * Copyright 2002-2005 the original author or authors. * * 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 org.springframework.binding.form.support; import org.springframework.beans.PropertyAccessException; import org.springframework.binding.form.BindingErrorMessageProvider; import org.springframework.binding.form.FormModel; import org.springframework.binding.format.InvalidFormatException; -import org.springframework.binding.validation.Severity; import org.springframework.binding.validation.ValidationMessage; import org.springframework.binding.validation.support.DefaultValidationMessage; import org.springframework.context.support.MessageSourceAccessor; import org.springframework.richclient.application.ApplicationServicesLocator; +import org.springframework.richclient.core.Severity; /** * Default implementation of <code>BindingErrorMessageProvider</code>. * * @author Oliver Hutchison */ public class DefaultBindingErrorMessageProvider implements BindingErrorMessageProvider { private MessageSourceAccessor messageSourceAccessor = null; public void setMessageSourceAccessor(MessageSourceAccessor messageSourceAccessor) { this.messageSourceAccessor = messageSourceAccessor; } protected MessageSourceAccessor getMessageSourceAccessor() { if (messageSourceAccessor == null) { messageSourceAccessor = (MessageSourceAccessor)ApplicationServicesLocator.services().getService(MessageSourceAccessor.class); } return messageSourceAccessor; } public ValidationMessage getErrorMessage(FormModel formModel, String propertyName, Object valueBeingSet, Exception e) { String messageCode = getMessageCodeForException(e); Object[] args = new Object[] {formModel.getFieldFace(propertyName).getDisplayName(), UserMetadata.isFieldProtected(formModel, propertyName) ? "***" : valueBeingSet}; String message = getMessageSourceAccessor().getMessage(messageCode, args, messageCode); return new DefaultValidationMessage(propertyName, Severity.ERROR, message); } protected String getMessageCodeForException(Exception e) { if (e instanceof PropertyAccessException) { return ((PropertyAccessException)e).getErrorCode(); } else if (e instanceof NullPointerException) { return "required"; } else if (e instanceof InvalidFormatException) { return "typeMismatch"; } else if (e instanceof IllegalArgumentException) { return "typeMismatch"; } else if (e.getCause() instanceof Exception) { return getMessageCodeForException((Exception)e.getCause()); } else { return "unknown"; } } } \ No newline at end of file

diff --git a/trunk/src/de/sciss/eisenkraut/gui/CurvePanel.java b/trunk/src/de/sciss/eisenkraut/gui/CurvePanel.java index 2f6c21c..60aa846 100644 --- a/trunk/src/de/sciss/eisenkraut/gui/CurvePanel.java +++ b/trunk/src/de/sciss/eisenkraut/gui/CurvePanel.java @@ -1,393 +1,393 @@ /* * CurvePanel.java * Eisenkraut * * Copyright (c) 2004-2008 Hanns Holger Rutz. All rights reserved. * * This software is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either * version 2, june 1991 of the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public * License (gpl.txt) along with this software; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * * For further information, please contact Hanns Holger Rutz at * [email protected] * * * Changelog: * 15-Jul-05 created */ package de.sciss.eisenkraut.gui; import java.awt.AWTEventMulticaster; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Insets; import java.awt.Paint; import java.awt.RenderingHints; import java.awt.Shape; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.geom.AffineTransform; import java.awt.geom.Area; import java.awt.geom.CubicCurve2D; import java.awt.geom.Ellipse2D; import java.awt.geom.Point2D; import java.util.prefs.Preferences; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.event.MouseInputAdapter; /** * This class describes a generic GUI tool * that can be aquired and dismissed by * a <code>Component</code>. * * @author Hanns Holger Rutz - * @version 0.70, 17-Apr-07 + * @version 0.70, 31-May-08 */ public class CurvePanel extends JComponent // implements LaterInvocationManager.Listener { private static final String KEY_CTRLX1 = "ctrlx1"; private static final String KEY_CTRLY1 = "ctrly1"; private static final String KEY_CTRLX2 = "ctrlx2"; private static final String KEY_CTRLY2 = "ctrly2"; // private static final String[] KEYS = { KEY_CTRLX1, KEY_CTRLY1, KEY_CTRLX2, KEY_CTRLY2 }; private final CubicCurve2D[] shpFades; private final AffineTransform at = new AffineTransform(); protected static final Insets insets = new Insets( 1, 1, 1, 1 ); private static final Shape shpCtrlIn = new Ellipse2D.Double( -2, -2, 5, 5 ); private static final Area shpCtrlOut; private static final Paint pntCtrlIn = new Color( 0x00, 0x00, 0x00, 0x7F ); private static final Paint pntCtrlOut = new Color( 0x00, 0x00, 0x00, 0x3F ); private static final Paint pntCtrlOutS = new Color( 0x00, 0x00, 0xFF, 0x7F ); private final Shape[] tShpFades; protected final Point2D[] ctrlPt = new Point2D[] { new Point2D.Double( 0.5, 0.5 ), new Point2D.Double( 0.5, 0.5 )}; protected int recentWidth = -1; protected int recentHeight = -1; protected boolean recalc = true; protected Point2D dragPt = null; // private final Preferences prefs; private ActionListener actionListener = null; static { shpCtrlOut = new Area( new Ellipse2D.Double( -7, -7, 15, 15 )); shpCtrlOut.subtract( new Area( new Ellipse2D.Double( -4, -4, 9, 9 ))); } public CurvePanel( CubicCurve2D[] basicCurves, final Preferences prefs ) { super(); final Dimension d = new Dimension( 64, 64 ); shpFades = basicCurves; // prefs = prefs; tShpFades = new Shape[ shpFades.length ]; if( prefs != null ) { ctrlPt[0].setLocation( prefs.getDouble( KEY_CTRLX1, 0.5 ), prefs.getDouble( KEY_CTRLY1, 0.5 )); ctrlPt[1].setLocation( prefs.getDouble( KEY_CTRLX2, 0.5 ), prefs.getDouble( KEY_CTRLY2, 0.5 )); } setMinimumSize( d ); setPreferredSize( d ); setBorder( BorderFactory.createEmptyBorder( insets.left, insets.top, insets.bottom, insets.right )); // if( prefs != null ) { // new DynamicAncestorAdapter( new DynamicPrefChangeManager( prefs, KEYS, this )).addTo( this ); // } MouseInputAdapter mia = new MouseInputAdapter() { private boolean didThemDragga = false; public void mousePressed( MouseEvent e ) { Point2D mousePt = getVirtualMousePos( e ); if( mousePt.distanceSq( ctrlPt[ 0 ]) <= mousePt.distanceSq( ctrlPt[ 1 ])) { dragPt = ctrlPt[ 0 ]; } else { dragPt = ctrlPt[ 1 ]; } processDrag( mousePt, !e.isControlDown() ); } public void mouseReleased( MouseEvent e ) { dragPt = null; repaint(); if( didThemDragga ) { dispatchAction(); didThemDragga = false; } } private Point2D getVirtualMousePos( MouseEvent e ) { return new Point2D.Double( Math.max( 0.0, Math.min( 1.0, (double) (e.getX() - insets.left) / recentWidth )), 1.0 - Math.max( 0.0, Math.min( 1.0, (double) (e.getY() - insets.top) / recentHeight ))); } public void mouseMoved( MouseEvent e ) { mouseDragged( e ); // mouseDragged not called with popup dialog! } public void mouseDragged( MouseEvent e ) { if( dragPt != null ) processDrag( getVirtualMousePos( e ), !e.isControlDown() ); } private void processDrag( Point2D mousePt, boolean snap ) { didThemDragga = true; if( snap ) { if( Math.abs( mousePt.getX() - 0.5 ) < 0.1 ) mousePt.setLocation( 0.5, mousePt.getY() ); if( Math.abs( mousePt.getY() - 0.5 ) < 0.1 ) mousePt.setLocation( mousePt.getX(), 0.5 ); } dragPt.setLocation( mousePt ); if( prefs != null ) { if( dragPt == ctrlPt[0] ) { prefs.putDouble( KEY_CTRLX1, dragPt.getX() ); prefs.putDouble( KEY_CTRLY1, dragPt.getY() ); } else { prefs.putDouble( KEY_CTRLX2, dragPt.getX() ); prefs.putDouble( KEY_CTRLY2, dragPt.getY() ); } } recalc = true; repaint(); } }; addMouseListener( mia ); addMouseMotionListener( mia ); } public void addActionListener( ActionListener l ) { synchronized( this ) { actionListener = AWTEventMulticaster.add( actionListener, l ); } } public void removeActionListener( ActionListener l ) { synchronized( this ) { actionListener = AWTEventMulticaster.remove( actionListener, l ); } } protected void dispatchAction() { final ActionListener listener = actionListener; if( listener != null ) { listener.actionPerformed( new ActionEvent( this, ActionEvent.ACTION_PERFORMED, null )); } } public Point2D[] getControlPoints() { return new Point2D[] { new Point2D.Double( ctrlPt[ 0 ].getX(), ctrlPt[ 0 ].getY() ), new Point2D.Double( ctrlPt[ 1 ].getX(), ctrlPt[ 1 ].getY() )}; } public void setControlPoints( Point2D ctrlPt1, Point2D ctrlPt2 ) { ctrlPt[0].setLocation( ctrlPt1.getX(), ctrlPt1.getY() ); ctrlPt[1].setLocation( ctrlPt2.getX(), ctrlPt2.getY() ); recalc = true; repaint(); } // this is static to allow calculations // without actually creating GUI elements public static Point2D[] getControlPoints( Preferences prefs ) { return new Point2D[] { new Point2D.Double( prefs.getDouble( KEY_CTRLX1, 0.5 ), prefs.getDouble( KEY_CTRLY1, 0.5 )), new Point2D.Double( prefs.getDouble( KEY_CTRLX2, 0.5 ), prefs.getDouble( KEY_CTRLY2, 0.5 )) }; } public static void toPrefs( Point2D[] ctrlPt, Preferences prefs ) { prefs.putDouble( KEY_CTRLX1, ctrlPt[0].getX() ); - prefs.putDouble( KEY_CTRLY1, ctrlPt[1].getY() ); + prefs.putDouble( KEY_CTRLY1, ctrlPt[0].getY() ); prefs.putDouble( KEY_CTRLX2, ctrlPt[1].getX() ); prefs.putDouble( KEY_CTRLY2, ctrlPt[1].getY() ); } public void toPrefs( Preferences prefs ) { toPrefs( ctrlPt, prefs ); } public void paintComponent( Graphics g ) { super.paintComponent( g ); final Graphics2D g2 = (Graphics2D) g; final int currentWidth = getWidth() - insets.left - insets.right; final int currentHeight = getHeight() - insets.top - insets.bottom; final AffineTransform atOrig = g2.getTransform(); double trnsX, trnsY; if( (currentWidth != recentWidth) || (currentHeight != recentHeight) || recalc ) { recentWidth = currentWidth; recentHeight = currentHeight; at.setToScale( currentWidth, -currentHeight ); at.translate( 0, -1.0 ); recalcTransforms(); } g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON ); g2.translate( insets.left, insets.top ); for( int i = 0; i < tShpFades.length; i++ ) { g2.draw( tShpFades[ i ]); } for( int i = 0; i < ctrlPt.length; i++ ) { trnsX = ctrlPt[i].getX() * currentWidth; trnsY = (1.0 - ctrlPt[i].getY()) * currentHeight; g2.translate( trnsX, trnsY ); g2.setPaint( pntCtrlIn ); g2.fill( shpCtrlIn ); if( ctrlPt[i] == dragPt ) { g2.setPaint( pntCtrlOutS ); } else { g2.setPaint( pntCtrlOut ); } g2.fill( shpCtrlOut ); g2.translate( -trnsX, -trnsY ); } g2.setTransform( atOrig ); } private void recalcTransforms() { // if( prefs != null ) { // ctrlPt[0].setLocation( prefs.getDouble( KEY_CTRLX1, 0.5 ), prefs.getDouble( KEY_CTRLY1, 0.5 )); // ctrlPt[1].setLocation( prefs.getDouble( KEY_CTRLX2, 0.5 ), prefs.getDouble( KEY_CTRLY2, 0.5 )); // } for( int i = 0; i < shpFades.length; i++ ) { // shpFades[ i ].setCurve( shpFades[ i ].getP1(), ctrlPt[ i % 2 ], ctrlPt[ (i+1) % 2 ], shpFades[ i ].getP2() ); shpFades[ i ].setCurve( shpFades[ i ].getX1(), shpFades[ i ].getY1(), ctrlPt[ 0 ].getX(), ctrlPt[ i % 2 ].getY(), ctrlPt[ 1 ].getX(), ctrlPt[ (i+1) % 2 ].getY(), shpFades[ i ].getX2(), shpFades[ i ].getY2() ); tShpFades[ i ] = at.createTransformedShape( shpFades[ i ]); } recalc = false; } // // o instanceof PreferenceChangeEvent // public void laterInvocation( Object o ) // { // recalc = true; // repaint(); // } public static class Icon implements javax.swing.Icon { private final int width; private final int height; private final AffineTransform at; private final CubicCurve2D[] shpFades; private final Shape[] tShpFades; private final Point2D[] ctrlPt = new Point2D[] { new Point2D.Double( 0.5, 0.5 ), new Point2D.Double( 0.5, 0.5 )}; public Icon( CubicCurve2D[] basicCurves ) { this( basicCurves, 16, 16 ); } public Icon( CubicCurve2D[] basicCurves, int width, int height ) { this.width = width; this.height = height; at = AffineTransform.getScaleInstance( width, -height ); at.translate( 0, -1.0 ); shpFades = basicCurves; tShpFades = new Shape[ shpFades.length ]; } public int getIconWidth() { return width; } public int getIconHeight() { return height; } // public void update( Preferences prefs ) // { // ctrlPt[0].setLocation( prefs.getDouble( KEY_CTRLX1, 0.5 ), prefs.getDouble( KEY_CTRLY1, 0.5 )); // ctrlPt[1].setLocation( prefs.getDouble( KEY_CTRLX2, 0.5 ), prefs.getDouble( KEY_CTRLY2, 0.5 )); // // for( int i = 0; i < shpFades.length; i++ ) { // shpFades[ i ].setCurve( shpFades[ i ].getX1(), shpFades[ i ].getY1(), // ctrlPt[ 0 ].getX(), ctrlPt[ i % 2 ].getY(), // ctrlPt[ 1 ].getX(), ctrlPt[ (i+1) % 2 ].getY(), // shpFades[ i ].getX2(), shpFades[ i ].getY2() ); // tShpFades[ i ] = at.createTransformedShape( shpFades[ i ]); // } // } public void update( Point2D ctrl1, Point2D ctrl2 ) { ctrlPt[0].setLocation( ctrl1.getX(), ctrl1.getY() ); ctrlPt[1].setLocation( ctrl2.getX(), ctrl2.getY() ); for( int i = 0; i < shpFades.length; i++ ) { shpFades[ i ].setCurve( shpFades[ i ].getX1(), shpFades[ i ].getY1(), ctrlPt[ 0 ].getX(), ctrlPt[ i % 2 ].getY(), ctrlPt[ 1 ].getX(), ctrlPt[ (i+1) % 2 ].getY(), shpFades[ i ].getX2(), shpFades[ i ].getY2() ); tShpFades[ i ] = at.createTransformedShape( shpFades[ i ]); } } public void paintIcon( Component c, Graphics g, int x, int y ) { final Graphics2D g2 = (Graphics2D) g; final AffineTransform atOrig = g2.getTransform(); g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON ); g2.translate( x, y ); g2.setColor( Color.black ); for( int i = 0; i < tShpFades.length; i++ ) { g2.draw( tShpFades[ i ]); } g2.setTransform( atOrig ); } } } \ No newline at end of file

diff --git a/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationExceptionTest.java b/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationExceptionTest.java index 01699f9c7..be6d5b30e 100644 --- a/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationExceptionTest.java +++ b/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationExceptionTest.java @@ -1,22 +1,22 @@ package com.yammer.dropwizard.config.tests; import com.google.common.collect.ImmutableList; import com.yammer.dropwizard.config.ConfigurationException; import org.junit.Test; import java.io.File; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; public class ConfigurationExceptionTest { @Test public void formatsTheViolationsIntoAHumanReadableMessage() throws Exception { final File file = new File("config.yml"); final ConfigurationException e = new ConfigurationException(file, ImmutableList.of("woo may not be null")); assertThat(e.getMessage(), is("config.yml has the following errors:\n" + - " * woo may not be null")); + " * woo may not be null\n")); } } diff --git a/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationFactoryTest.java b/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationFactoryTest.java index f5e167574..2c51d3389 100644 --- a/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationFactoryTest.java +++ b/dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/ConfigurationFactoryTest.java @@ -1,66 +1,66 @@ package com.yammer.dropwizard.config.tests; import com.google.common.io.Resources; import com.yammer.dropwizard.config.ConfigurationException; import com.yammer.dropwizard.config.ConfigurationFactory; import com.yammer.dropwizard.validation.Validator; import org.junit.Test; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.io.File; import java.io.IOException; import java.util.Locale; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; public class ConfigurationFactoryTest { @SuppressWarnings("UnusedDeclaration") public static class Example { @NotNull @Pattern(regexp = "[\\w]+[\\s]+[\\w]+") private String name; public String getName() { return name; } } private final Validator validator = new Validator(); private final ConfigurationFactory<Example> factory = ConfigurationFactory.forClass(Example.class, validator); private final File malformedFile = new File(Resources.getResource("factory-test-malformed.yml").getFile()); private final File invalidFile = new File(Resources.getResource("factory-test-invalid.yml").getFile()); private final File validFile = new File(Resources.getResource("factory-test-valid.yml").getFile()); @Test public void loadsValidConfigFiles() throws Exception { final Example example = factory.build(validFile); assertThat(example.getName(), is("Coda Hale")); } @Test public void throwsAnExceptionOnMalformedFiles() throws Exception { try { factory.build(malformedFile); fail("expected a YAMLException to be thrown, but none was"); } catch (IOException e) { assertThat(e.getMessage(), startsWith("Can not instantiate")); } } @Test public void throwsAnExceptionOnInvalidFiles() throws Exception { try { factory.build(invalidFile); } catch (ConfigurationException e) { if ("en".equals(Locale.getDefault().getLanguage())) { assertThat(e.getMessage(), endsWith("factory-test-invalid.yml has the following errors:\n" + - " * name must match \"[\\w]+[\\s]+[\\w]+\" (was Boop)")); + " * name must match \"[\\w]+[\\s]+[\\w]+\" (was Boop)\n")); } } } }

diff --git a/Android/SQLitePlugin/src/com/phonegap/plugins/sqlitePlugin/SQLitePlugin.java b/Android/SQLitePlugin/src/com/phonegap/plugins/sqlitePlugin/SQLitePlugin.java index 927ef2d..76d3d53 100755 --- a/Android/SQLitePlugin/src/com/phonegap/plugins/sqlitePlugin/SQLitePlugin.java +++ b/Android/SQLitePlugin/src/com/phonegap/plugins/sqlitePlugin/SQLitePlugin.java @@ -1,247 +1,249 @@ /* * PhoneGap is available under *either* the terms of the modified BSD license *or* the * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text. * * Copyright (c) 2005-2010, Nitobi Software Inc. * Copyright (c) 2010, IBM Corporation */ package com.phonegap.plugins.sqlitePlugin; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import com.phonegap.api.Plugin; import com.phonegap.api.PluginResult; import android.database.Cursor; import android.database.sqlite.*; import android.util.Log; public class SQLitePlugin extends Plugin { // Data Definition Language SQLiteDatabase myDb = null; // Database object String path = null; // Database path String dbName = null; // Database name /** * Constructor. */ public SQLitePlugin() { } /** * Executes the request and returns PluginResult. * * @param action * The action to execute. * @param args * JSONArry of arguments for the plugin. * @param callbackId * The callback id used when calling back into JavaScript. * @return A PluginResult object with a status and message. */ public PluginResult execute(String action, JSONArray args, String callbackId) { PluginResult.Status status = PluginResult.Status.OK; String result = ""; try { // TODO: Do we want to allow a user to do this, since they could get // to other app databases? if (action.equals("setStorage")) { this.setStorage(args.getString(0)); } else if (action.equals("open")) { this.openDatabase(args.getString(0), "1", "database", 5000000); //this.openDatabase(args.getString(0), args.getString(1), // args.getString(2), args.getLong(3)); } else if (action.equals("executeSqlBatch")) { String[] queries = null; String[] queryIDs = null; String[][] params = null; String trans_id = null; JSONObject a = null; JSONArray jsonArr = null; int paramLen = 0; if (args.isNull(0)) { queries = new String[0]; } else { int len = args.length(); queries = new String[len]; queryIDs = new String[len]; params = new String[len][1]; for (int i = 0; i < len; i++) { a = args.getJSONObject(i); queries[i] = a.getString("query"); - queryIDs[i] = a.getString("query_id"); + queryIDs[i] = a.getString("query_id"); trans_id = a.getString("trans_id"); jsonArr = a.getJSONArray("params"); paramLen = jsonArr.length(); params[i] = new String[paramLen]; for (int j = 0; j < paramLen; j++) { params[i][j] = jsonArr.getString(j); + if(params[i][j] == "null") + params[i][j] = ""; } } } if(trans_id != null) this.executeSqlBatch(queries, params, queryIDs, trans_id); else Log.v("error", "null trans_id"); } return new PluginResult(status, result); } catch (JSONException e) { return new PluginResult(PluginResult.Status.JSON_EXCEPTION); } } /** * Identifies if action to be executed returns a value and should be run * synchronously. * * @param action * The action to execute * @return T=returns value */ public boolean isSynch(String action) { return true; } /** * Clean up and close database. */ @Override public void onDestroy() { if (this.myDb != null) { this.myDb.close(); this.myDb = null; } } // -------------------------------------------------------------------------- // LOCAL METHODS // -------------------------------------------------------------------------- /** * Set the application package for the database. Each application saves its * database files in a directory with the application package as part of the * file name. * * For example, application "com.phonegap.demo.Demo" would save its database * files in "/data/data/com.phonegap.demo/databases/" directory. * * @param appPackage * The application package. */ public void setStorage(String appPackage) { this.path = "/data/data/" + appPackage + "/databases/"; } /** * Open database. * * @param db * The name of the database * @param version * The version * @param display_name * The display name * @param size * The size in bytes */ public void openDatabase(String db, String version, String display_name, long size) { // If database is open, then close it if (this.myDb != null) { this.myDb.close(); } // If no database path, generate from application package if (this.path == null) { Package pack = this.ctx.getClass().getPackage(); String appPackage = pack.getName(); this.setStorage(appPackage); } this.dbName = this.path + db + ".db"; this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null); } public void executeSqlBatch(String[] queryarr, String[][] paramsarr, String[] queryIDs, String tx_id) { try { this.myDb.beginTransaction(); String query = ""; String query_id = ""; String[] params; int len = queryarr.length; for (int i = 0; i < len; i++) { query = queryarr[i]; params = paramsarr[i]; query_id = queryIDs[i]; Cursor myCursor = this.myDb.rawQuery(query, params); if(query_id != "") this.processResults(myCursor, query_id, tx_id); myCursor.close(); } this.myDb.setTransactionSuccessful(); } catch (SQLiteException ex) { ex.printStackTrace(); Log.v("executeSqlBatch", "SQLitePlugin.executeSql(): Error=" + ex.getMessage()); this.sendJavascript("SQLitePluginTransaction.txErrorCallback('" + tx_id + "', '"+ex.getMessage()+"');"); } finally { this.myDb.endTransaction(); Log.v("executeSqlBatch", tx_id); this.sendJavascript("SQLitePluginTransaction.txCompleteCallback('" + tx_id + "');"); } } /** * Process query results. * * @param cur * Cursor into query results * @param tx_id * Transaction id */ public void processResults(Cursor cur, String query_id, String tx_id) { String result = "[]"; // If query result has rows if (cur.moveToFirst()) { JSONArray fullresult = new JSONArray(); String key = ""; String value = ""; int colCount = cur.getColumnCount(); // Build up JSON result object for each row do { JSONObject row = new JSONObject(); try { for (int i = 0; i < colCount; ++i) { key = cur.getColumnName(i); value = cur.getString(i); row.put(key, value); } fullresult.put(row); } catch (JSONException e) { e.printStackTrace(); } } while (cur.moveToNext()); result = fullresult.toString(); } this.sendJavascript(" SQLitePluginTransaction.queryCompleteCallback('" + tx_id + "','" + query_id + "', " + result + ");"); } }

public PluginResult execute(String action, JSONArray args, String callbackId) { PluginResult.Status status = PluginResult.Status.OK; String result = ""; try { // TODO: Do we want to allow a user to do this, since they could get // to other app databases? if (action.equals("setStorage")) { this.setStorage(args.getString(0)); } else if (action.equals("open")) { this.openDatabase(args.getString(0), "1", "database", 5000000); //this.openDatabase(args.getString(0), args.getString(1), // args.getString(2), args.getLong(3)); } else if (action.equals("executeSqlBatch")) { String[] queries = null; String[] queryIDs = null; String[][] params = null; String trans_id = null; JSONObject a = null; JSONArray jsonArr = null; int paramLen = 0; if (args.isNull(0)) { queries = new String[0]; } else { int len = args.length(); queries = new String[len]; queryIDs = new String[len]; params = new String[len][1]; for (int i = 0; i < len; i++) { a = args.getJSONObject(i); queries[i] = a.getString("query"); queryIDs[i] = a.getString("query_id"); trans_id = a.getString("trans_id"); jsonArr = a.getJSONArray("params"); paramLen = jsonArr.length(); params[i] = new String[paramLen]; for (int j = 0; j < paramLen; j++) { params[i][j] = jsonArr.getString(j); } } } if(trans_id != null) this.executeSqlBatch(queries, params, queryIDs, trans_id); else Log.v("error", "null trans_id"); } return new PluginResult(status, result); } catch (JSONException e) { return new PluginResult(PluginResult.Status.JSON_EXCEPTION); } }

public PluginResult execute(String action, JSONArray args, String callbackId) { PluginResult.Status status = PluginResult.Status.OK; String result = ""; try { // TODO: Do we want to allow a user to do this, since they could get // to other app databases? if (action.equals("setStorage")) { this.setStorage(args.getString(0)); } else if (action.equals("open")) { this.openDatabase(args.getString(0), "1", "database", 5000000); //this.openDatabase(args.getString(0), args.getString(1), // args.getString(2), args.getLong(3)); } else if (action.equals("executeSqlBatch")) { String[] queries = null; String[] queryIDs = null; String[][] params = null; String trans_id = null; JSONObject a = null; JSONArray jsonArr = null; int paramLen = 0; if (args.isNull(0)) { queries = new String[0]; } else { int len = args.length(); queries = new String[len]; queryIDs = new String[len]; params = new String[len][1]; for (int i = 0; i < len; i++) { a = args.getJSONObject(i); queries[i] = a.getString("query"); queryIDs[i] = a.getString("query_id"); trans_id = a.getString("trans_id"); jsonArr = a.getJSONArray("params"); paramLen = jsonArr.length(); params[i] = new String[paramLen]; for (int j = 0; j < paramLen; j++) { params[i][j] = jsonArr.getString(j); if(params[i][j] == "null") params[i][j] = ""; } } } if(trans_id != null) this.executeSqlBatch(queries, params, queryIDs, trans_id); else Log.v("error", "null trans_id"); } return new PluginResult(status, result); } catch (JSONException e) { return new PluginResult(PluginResult.Status.JSON_EXCEPTION); } }

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java index c5506dae8..9867c0d50 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/JavaWatchExpressionFilter.java @@ -1,56 +1,56 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.jdt.internal.debug.ui.heapwalking; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; +import org.eclipse.debug.internal.ui.views.variables.IndexedVariablePartition; import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension; import org.eclipse.jdt.internal.debug.core.model.JDIArrayEntryVariable; import org.eclipse.jdt.internal.debug.core.model.JDIPlaceholderValue; import org.eclipse.jdt.internal.debug.core.model.JDIReferenceListEntryVariable; import org.eclipse.jdt.internal.debug.core.model.JDIReferenceListVariable; /** * Uses the <code>IWatchExpressionFactoryAdapterExtension</code> to filter when the watch expression * action is available based on the variable selected. * * Currently removes the action from <code>JDIPlaceholderVariable</code>s and <code>JDIReferenceListVariable</code>s. * * @since 3.3 */ public class JavaWatchExpressionFilter implements IWatchExpressionFactoryAdapterExtension { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension#canCreateWatchExpression(org.eclipse.debug.core.model.IVariable) */ public boolean canCreateWatchExpression(IVariable variable) { if (variable instanceof JDIReferenceListVariable || variable instanceof JDIReferenceListEntryVariable || - variable instanceof JDIArrayEntryVariable){ + variable instanceof JDIArrayEntryVariable || variable instanceof IndexedVariablePartition){ return false; } try{ if (variable.getValue() instanceof JDIPlaceholderValue){ return false; } } catch (DebugException e) {} return true; } /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter#createWatchExpression(org.eclipse.debug.core.model.IVariable) */ - public String createWatchExpression(IVariable variable) - throws CoreException { + public String createWatchExpression(IVariable variable) throws CoreException { return variable.getName(); } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java index 5416de760..1d72c557b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java @@ -1,96 +1,95 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.jdt.internal.debug.ui.variables; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.debug.internal.ui.model.elements.ExpressionLabelProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider; import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter; import org.eclipse.jdt.debug.core.IJavaStackFrame; import org.eclipse.jdt.debug.core.IJavaValue; import org.eclipse.jdt.debug.core.IJavaVariable; import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression; import org.eclipse.jdt.internal.debug.ui.heapwalking.JavaWatchExpressionFilter; /** * Provides provider adapters for IJavaVariables and IJavaStackFrames * * @see IJavaVariable * @see JavaVariableLabelProvider * @see JavaVariableContentProvider * @see ExpressionLabelProvider * @see JavaExpressionContentProvider * @see JavaWatchExpressionFilter * @see JavaStackFrameMementoProvider * @since 3.3 */ public class JavaDebugElementAdapterFactory implements IAdapterFactory { private static final IElementLabelProvider fgLPVariable = new JavaVariableLabelProvider(); private static final IElementContentProvider fgCPVariable = new JavaVariableContentProvider(); private static final IElementLabelProvider fgLPExpression = new ExpressionLabelProvider(); private static final IElementContentProvider fgCPExpression = new JavaExpressionContentProvider(); private static final IWatchExpressionFactoryAdapter fgWEVariable = new JavaWatchExpressionFilter(); private static final IElementMementoProvider fgMPStackFrame = new JavaStackFrameMementoProvider(); private static final IElementLabelProvider fgLPFrame = new JavaStackFrameLabelProvider(); /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ public Object getAdapter(Object adaptableObject, Class adapterType) { if (IElementLabelProvider.class.equals(adapterType)) { if (adaptableObject instanceof IJavaVariable) { return fgLPVariable; } if (adaptableObject instanceof IJavaStackFrame) { return fgLPFrame; } if (adaptableObject instanceof JavaInspectExpression) { return fgLPExpression; } } if (IElementContentProvider.class.equals(adapterType)) { if (adaptableObject instanceof IJavaVariable) { return fgCPVariable; } if (adaptableObject instanceof JavaInspectExpression) { return fgCPExpression; } if (adaptableObject instanceof IJavaValue) { return fgCPExpression; } } if (IWatchExpressionFactoryAdapter.class.equals(adapterType)) { if (adaptableObject instanceof IJavaVariable) { return fgWEVariable; } if (adaptableObject instanceof JavaInspectExpression) { - return fgCPExpression; + return fgWEVariable; } } if (IElementMementoProvider.class.equals(adapterType)) { if (adaptableObject instanceof IJavaStackFrame) { return fgMPStackFrame; } } return null; } /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ public Class[] getAdapterList() { - return new Class[]{IElementLabelProvider.class,IElementContentProvider.class,IWatchExpressionFactoryAdapter.class}; + return new Class[] {IElementLabelProvider.class, IElementContentProvider.class, IWatchExpressionFactoryAdapter.class, IElementMementoProvider.class}; } - }

diff --git a/lib-core/src/main/java/com/silverpeas/wysiwyg/dynamicvalue/control/DynamicValueReplacement.java b/lib-core/src/main/java/com/silverpeas/wysiwyg/dynamicvalue/control/DynamicValueReplacement.java index ca30590409..8af727c08a 100644 --- a/lib-core/src/main/java/com/silverpeas/wysiwyg/dynamicvalue/control/DynamicValueReplacement.java +++ b/lib-core/src/main/java/com/silverpeas/wysiwyg/dynamicvalue/control/DynamicValueReplacement.java @@ -1,236 +1,221 @@ /** * Copyright (C) 2000 - 2009 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * As a special exception to the terms and conditions of version 3.0 of * the GPL, you may redistribute this Program in connection with Free/Libre * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: * "http://repository.silverpeas.com/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ package com.silverpeas.wysiwyg.dynamicvalue.control; import java.sql.Connection; import java.sql.SQLException; import java.util.Iterator; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.silverpeas.util.EncodeHelper; import com.silverpeas.wysiwyg.dynamicvalue.dao.DynamicValueDAO; import com.silverpeas.wysiwyg.dynamicvalue.model.DynamicValue; import com.silverpeas.wysiwyg.dynamicvalue.pool.ConnectionPoolFactory; import com.stratelia.silverpeas.silvertrace.SilverTrace; import com.stratelia.silverpeas.util.SilverpeasSettings; +import com.stratelia.webactiv.util.DBUtil; import com.stratelia.webactiv.util.FileServerUtils; import com.stratelia.webactiv.util.ResourceLocator; /** * * */ public class DynamicValueReplacement { /** * regular expression use to search the following expression (%<key>%) in HTML code */ final static String REGEX = "\\(%(.*?)%\\)"; private String updatedString; /** * default constructor */ public DynamicValueReplacement() { } /** * gets the list of valid DynamicValue object and build the HTML code to display the HTML select * @param language used to display information in correct language * @param fieldName name of the html field to allow using the generating code html with page * contained many HTML editor * @return String which contains HTML code */ public static String buildHTMLSelect(String language, String fieldName) { // local variable initialization String HTMLCodeFramgment = ""; List<DynamicValue> list = null; Connection conn = null; try { // get connection conn = ConnectionPoolFactory.getConnection(); // get the list of valid DynamicValue object list = DynamicValueDAO.getAllValidDynamicValue(conn); // build the HTML select with the key list if (list != null) { DynamicValue dynamicValue = null; ResourceLocator message = null; StringBuilder builder = new StringBuilder(); // gets the words to display in the first select option String firstOption = " ------------------"; try { message = new ResourceLocator("com.stratelia.silverpeas.wysiwyg.multilang.wysiwygBundle", - language); + language); if (message != null) { firstOption = message.getString("DynamicValues"); } } catch (Exception ex) { SilverTrace.error("wysiwiy", DynamicValueReplacement.class.toString(), "root.EX_CANT_GET_LANGUAGE_RESOURCE ", ex); } // build the HTML select builder .append( - " <select id=\"dynamicValues_").append(fieldName).append( - "\" name=\"dynamicValues\" onchange=\"chooseDynamicValues" + - FileServerUtils.replaceAccentChars(fieldName.replace(' ', '_')) + - "();this.selectedIndex=0;\">") + " <select id=\"dynamicValues_").append(fieldName).append( + "\" name=\"dynamicValues\" onchange=\"chooseDynamicValues" + + FileServerUtils.replaceAccentChars(fieldName.replace(' ', '_')) + + "();this.selectedIndex=0;\">") .append("<option value=\"\">" + firstOption + "</option>"); for (Iterator<DynamicValue> iterator = list.iterator(); iterator.hasNext();) { dynamicValue = iterator.next(); builder.append("<option value=\"" + dynamicValue.getKey() + "\">" + dynamicValue.getKey() + "</option>"); } builder.append(" </select>"); HTMLCodeFramgment = builder.toString(); } } catch (Exception e) { SilverTrace.error("wysiwiy", DynamicValueReplacement.class.toString(), "root.EX_SQL_QUERY_FAILED", e); } finally { - // close SQL connection - if (conn != null) { - try { - conn.close(); - } catch (SQLException e) { - SilverTrace.error("wysiwig", DynamicValueReplacement.class.toString(), - "root.EX_CONNECTION_CLOSE_FAILED", e); - } - } + DBUtil.close(conn); } return HTMLCodeFramgment; } public String replaceKeyByValue(String wysiwygText) { // local variable initialization Connection conn = null; updatedString = wysiwygText; // Compile regular expression Pattern pattern = Pattern.compile(REGEX); Matcher matcher = pattern.matcher(updatedString); // if a key has been found in the HTML code, we try to replace him by his value. if (matcher.find()) { try { // get connection conn = ConnectionPoolFactory.getConnection(); // search/replace all each key by his value searchReplaceKeys(updatedString, conn, matcher, null); } catch (SQLException e) { SilverTrace.error("wysiwyg", DynamicValueReplacement.class.toString(), "root.EX_SQL_QUERY_FAILED", e); } finally { - // close SQL connection - if (conn != null) { - try { - conn.close(); - } catch (SQLException e) { - SilverTrace.error("wysiwig", DynamicValueReplacement.class.toString(), - "root.EX_CONNECTION_CLOSE_FAILED", e); - } - } + DBUtil.close(conn); } } SilverTrace.debug("wysiwyg", DynamicValueReplacement.class.toString(), "content after key replacement by value : " + updatedString); return updatedString; } /** * Recursive method which replaces the key by the correct value. The replacement take place as * follows : 1-retrieve the key from HTML code 2-search in database the dynamic value by his key * 3-if the value has been found, replaces all the key occurrences by his value otherwise it does * nothing. 4- realize again the third operation until all the different keys has been replaced * @param wysiwygText the wysiwyg content * @param conn the SQL connection * @param matcher Matcher Object to realize the search with regular expression * @return * @throws SQLException SQLException whether a SQl error occurred during the process */ private String searchReplaceKeys(String wysiwygText, Connection conn, Matcher matcher, String oldMach) throws SQLException { String escapementStr = ""; SilverTrace.debug("wysiwyg", DynamicValueReplacement.class.toString(), " character matching " + matcher.toString()); SilverTrace.debug("wysiwyg", DynamicValueReplacement.class.toString(), " complete tag : " + matcher.group()); // get the dynamic value corresponding to a key SilverTrace.debug("wysiwyg", DynamicValueReplacement.class.toString(), " key to use to get the dynamic value" + matcher.group(1)); DynamicValue value = DynamicValueDAO.getValidDynamicValue(conn, EncodeHelper.htmlStringToJavaString(matcher .group(1))); if (value != null) { SilverTrace.debug("wysiwyg", DynamicValueReplacement.class.toString(), "key : " + value.getKey() + " value :" + value.getValue()); // escape the first brace in the key string because it's a reserved character in regular // expression escapementStr = matcher.group().replaceAll("\\\\", "\\\\\\\\"); escapementStr = escapementStr.replaceAll("\\(", "\\\\("); escapementStr = escapementStr.replaceAll("\\)", "\\\\)"); SilverTrace.debug("wysiwyg", DynamicValueReplacement.class.toString(), " result after escaping special characters : " + escapementStr); // replace all the occurrences of current key in HTML code updatedString = wysiwygText.replaceAll(escapementStr, value.getValue()); } // if value == null, we do nothing matcher.reset(updatedString); if (matcher.find() && !escapementStr.equalsIgnoreCase(oldMach)) { searchReplaceKeys(updatedString, conn, matcher, escapementStr); } return updatedString; } /** * checks whether the dynamic value functionality is active. This activation is realized by * writing "ON" in an properties file. if the property isn't found or if it's at OFF, the * functionality will be considered as inactive. * @return true whether the functionality is activated */ public static boolean isActivate() { ResourceLocator resource = new ResourceLocator("com.stratelia.silverpeas.wysiwyg.settings.wysiwygSettings", ""); return SilverpeasSettings.readBoolean(resource, "activateDynamicValue", false); } }

diff --git a/test-modules/functional-tests/src/main/java/org/openlmis/pageobjects/InitiateRnRPage.java b/test-modules/functional-tests/src/main/java/org/openlmis/pageobjects/InitiateRnRPage.java index e0f0e4e59f..ddef1d8b5b 100644 --- a/test-modules/functional-tests/src/main/java/org/openlmis/pageobjects/InitiateRnRPage.java +++ b/test-modules/functional-tests/src/main/java/org/openlmis/pageobjects/InitiateRnRPage.java @@ -1,694 +1,694 @@ /* * Copyright © 2013 VillageReach. All Rights Reserved. This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. * * If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.openlmis.pageobjects; import org.openlmis.UiUtils.DBWrapper; import org.openlmis.UiUtils.TestWebDriver; import org.openqa.selenium.ElementNotVisibleException; import org.openqa.selenium.Keys; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.How; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory; import java.io.IOException; import java.math.BigDecimal; import java.sql.SQLException; import static com.thoughtworks.selenium.SeleneseTestBase.assertFalse; import static com.thoughtworks.selenium.SeleneseTestBase.assertTrue; import static com.thoughtworks.selenium.SeleneseTestNgHelper.assertEquals; import static java.lang.Float.parseFloat; import static org.openqa.selenium.support.How.*; public class InitiateRnRPage extends RequisitionPage { @FindBy(how = XPATH, using = "//div[@id='requisition-header']/h2") private static WebElement requisitionHeader; @FindBy(how = XPATH, using = "//div[@id='requisition-header']/div[@class='info-box']/div[@class='row-fluid'][1]/div[1]") private static WebElement facilityLabel; @FindBy(how = XPATH, using = "//input[@value='Save']") private static WebElement saveButton; @FindBy(how = XPATH, using = "//input[@value='Submit']") private static WebElement submitButton; @FindBy(how = XPATH, using = "//input[@value='Authorize']") private static WebElement authorizeButton; @FindBy(how = XPATH, using = "//input[@value='Approve']") private static WebElement approveButton; @FindBy(how = XPATH, using = "//div[@id='saveSuccessMsgDiv' and @openlmis-message='message']") private static WebElement successMessage; @FindBy(how = XPATH, using = "//div[@id='submitSuccessMsgDiv' and @openlmis-message='submitMessage']") private static WebElement submitSuccessMessage; @FindBy(how = XPATH, using = "//div[@id='submitFailMessage' and @openlmis-message='submitError']") private static WebElement submitErrorMessage; @FindBy(how = ID, using = "beginningBalance_0") private static WebElement beginningBalance; @FindBy(how = ID, using = "quantityReceived_0") private static WebElement quantityReceived; @FindBy(how = ID, using = "quantityDispensed_0") private static WebElement quantityDispensed; @FindBy(how = ID, using = "stockInHand_0") private static WebElement stockInHand; @FindBy(how = ID, using = "newPatientCount_0") private static WebElement newPatient; @FindBy(how = ID, using = "maxStockQuantity_0") private static WebElement maximumStockQuantity; @FindBy(how = ID, using = "calculatedOrderQuantity_0") private static WebElement caculatedOrderQuantity; @FindBy(how = ID, using = "quantityRequested_0") private static WebElement requestedQuantity; @FindBy(how = ID, using = "normalizedConsumption_0") private static WebElement adjustedTotalConsumption; @FindBy(how = ID, using = "amc_0") private static WebElement amc; @FindBy(how = ID, using = "cost_0") private static WebElement totalCost; @FindBy(how = ID, using = "price_0") private static WebElement pricePerPack; @FindBy(how = ID, using = "packsToShip_0") private static WebElement packsToShip; @FindBy(how = ID, using = "price_0") private static WebElement pricePerPackNonFullSupply; @FindBy(how = XPATH, using = "//span[@id='fullSupplyItemsCost']") private static WebElement totalCostFullSupplyFooter; @FindBy(how = XPATH, using = "//span[@id='nonFullSupplyItemsCost']") private static WebElement totalCostNonFullSupplyFooter; @FindBy(how = XPATH, using = "//span[@id='totalCost']") private static WebElement totalCostFooter; @FindBy(how = ID, using = "reasonForRequestedQuantity_0") private static WebElement requestedQuantityExplanation; @FindBy(how = ID, using = "stockOutDays_0") private static WebElement totalStockOutDays; @FindBy(how = XPATH, using = "//a[@class='rnr-adjustment']") private static WebElement addDescription; @FindBy(how = XPATH, using = "//div[@class='adjustment-field']/div[@class='row-fluid']/div[@class='span5']/select") private static WebElement lossesAndAdjustmentSelect; @FindBy(how = XPATH, using = "//input[@ng-model='lossAndAdjustment.quantity']") private static WebElement quantityAdj; @FindBy(how = ID, using = "addNonFullSupply") private static WebElement addButtonNonFullSupply; @FindBy(how = XPATH, using = "//table[@id='nonFullSupplyTable']/tbody/tr/td[2]/ng-switch/span") private static WebElement productDescriptionNonFullSupply; @FindBy(how = XPATH, using = "//table[@id='nonFullSupplyTable']/tbody/tr/td[1]/ng-switch/span") private static WebElement productCodeNonFullSupply; @FindBy(how = XPATH, using = "//div[@class='adjustment-list']/ul/li/span[@class='tpl-adjustment-type ng-binding']") private static WebElement adjList; @FindBy(how = XPATH, using = "//input[@value='Done']") private static WebElement doneButton; @FindBy(how = XPATH, using = "//span[@class='alert alert-warning reason-request']") private static WebElement requestedQtyWarningMessage; @FindBy(how = XPATH, using = "//div[@class='info-box']/div[2]/div[3]") private static WebElement reportingPeriodInitRnRScreen; @FindBy(how = XPATH, using = "//span[@ng-bind='rnr.facility.geographicZone.name']") private static WebElement geoZoneInitRnRScreen; @FindBy(how = XPATH, using = "//span[@ng-bind='rnr.facility.geographicZone.parent.name']") private static WebElement parentGeoZoneInitRnRScreen; @FindBy(how = XPATH, using = "//span[@ng-bind='rnr.facility.operatedBy.text']") private static WebElement operatedByInitRnRScreen; @FindBy(how = XPATH, using = "//input[@id='addNonFullSupply' and @value='Add']") private static WebElement addNonFullSupplyButton; @FindBy(how = XPATH, using = "//input[@value='Add']") private static WebElement addNonFullSupplyButtonScreen; @FindBy(how = ID, using = "nonFullSupplyTab") private static WebElement nonFullSupplyTab; @FindBy(how = ID, using = "fullSupplyTab") private static WebElement fullSupplyTab; @FindBy(how = XPATH, using = "//select[@id='nonFullSupplyProductsCategory']") private static WebElement categoryDropDown; @FindBy(how = XPATH, using = "//select[@id='nonFullSupplyProductsCodeAndName']") private static WebElement productDropDown; @FindBy(how = XPATH, using = "//div[@id='s2id_nonFullSupplyProductsCategory']/a/span") private static WebElement categoryDropDownLink; @FindBy(how = XPATH, using = "//div[@id='select2-drop']/div/input") private static WebElement productDropDownTextField; @FindBy(how = XPATH, using = "//div[@class='select2-result-label']") private static WebElement productDropDownValue; @FindBy(how = XPATH, using = "//div[@id='s2id_nonFullSupplyProductsCodeAndName']/a/span") private static WebElement productDropDownLink; @FindBy(how = XPATH, using = "//div[@id='select2-drop']/div/input") private static WebElement categoryDropDownTextField; @FindBy(how = XPATH, using = "//div[@class='select2-result-label']") private static WebElement categoryDropDownValue; @FindBy(how = XPATH, using = "//select[@id='nonFullSupplyProductsCode']") private static WebElement productCodeDropDown; @FindBy(how = XPATH, using = "//input[@name='nonFullSupplyProductQuantityRequested0']") private static WebElement nonFullSupplyProductQuantityRequested; @FindBy(how = How.XPATH, using = "//div[@id='nonFullSupplyProductCodeAndName']/label") private static WebElement nonFullSupplyProductCodeAndName; @FindBy(how = XPATH, using = "//div[@id='nonFullSupplyProductReasonForRequestedQuantity']/input") private static WebElement nonFullSupplyProductReasonForRequestedQuantity; @FindBy(how = NAME, using = "newNonFullSupply.quantityRequested") private static WebElement requestedQuantityField; @FindBy(how = ID, using = "reasonForRequestedQuantity") private static WebElement requestedQuantityExplanationField; @FindBy(how = XPATH, using = "//input[@value='Add']") private static WebElement addButton; @FindBy(how = XPATH, using = "//input[@ng-click='addNonFullSupplyLineItem()']") private static WebElement addButtonEnabled; @FindBy(how = XPATH, using = "//input[@value='Cancel']") private static WebElement cancelButton; @FindBy(how = XPATH, using = "//input[@id='doneNonFullSupply']") private static WebElement doneButtonNonFullSupply; @FindBy(how = XPATH, using = "//a[contains(text(),'Home')]") private static WebElement homeMenuItem; @FindBy(how = XPATH, using = "//div[@openlmis-message='error']") private static WebElement configureTemplateErrorDiv; String successText = "R&R saved successfully!"; Float actualTotalCostFullSupply, actualTotalCostNonFullSupply; public InitiateRnRPage(TestWebDriver driver) throws IOException { super(driver); PageFactory.initElements(new AjaxElementLocatorFactory(testWebDriver.getDriver(), 1), this); testWebDriver.setImplicitWait(1); } public void verifyRnRHeader(String FCode, String FName, String FCstring, String program, String periodDetails, String geoZone, String parentgeoZone, String operatedBy, String facilityType) { testWebDriver.sleep(1500); testWebDriver.waitForElementToAppear(requisitionHeader); String headerText = testWebDriver.getText(requisitionHeader); assertTrue(headerText.contains("Report and Requisition for " + program + " (" + facilityType + ")")); String facilityText = testWebDriver.getText(facilityLabel); assertTrue(facilityText.contains(FCode + FCstring + " - " + FName + FCstring)); assertEquals(reportingPeriodInitRnRScreen.getText().trim().substring("Reporting Period: ".length()), periodDetails.trim()); assertEquals(geoZone, geoZoneInitRnRScreen.getText().trim()); assertEquals(parentgeoZone, parentGeoZoneInitRnRScreen.getText().trim()); assertEquals(operatedBy, operatedByInitRnRScreen.getText().trim()); } public HomePage clickHome() throws IOException { testWebDriver.sleep(1000); testWebDriver.waitForElementToAppear(homeMenuItem); testWebDriver.keyPress(homeMenuItem); return new HomePage(testWebDriver); } public void enterBeginningBalance(String A) { String beginningBalanceValue = submitBeginningBalance(A); verifyFieldValue(A, beginningBalanceValue); } public String submitBeginningBalance(String A) { testWebDriver.sleep(1000); testWebDriver.waitForElementToAppear(beginningBalance); beginningBalance.sendKeys(A); return testWebDriver.getAttribute(beginningBalance, "value"); } public void verifyFieldValue(String Expected, String Actual) { assertEquals(Actual, Expected); } public void verifyTemplateNotConfiguredMessage() { testWebDriver.waitForElementToAppear(configureTemplateErrorDiv); assertTrue("Please contact admin to define R&R template for this program should show up", configureTemplateErrorDiv.isDisplayed()); } public void enterQuantityReceived(String B) { String quantityReceivedValue = submitQuantityReceived(B); verifyFieldValue(B, quantityReceivedValue); } public String submitQuantityReceived(String B) { testWebDriver.waitForElementToAppear(quantityReceived); quantityReceived.sendKeys(B); return testWebDriver.getAttribute(quantityReceived, "value"); } public void enterQuantityDispensed(String C) { String quantityDispensedValue = submitQuantityDispensed(C); verifyFieldValue(C, quantityDispensedValue); } public String submitQuantityDispensed(String C) { testWebDriver.waitForElementToAppear(quantityDispensed); quantityDispensed.sendKeys(C); return testWebDriver.getAttribute(quantityDispensed, "value"); } public void enterLossesAndAdjustments(String adj) { testWebDriver.waitForElementToAppear(addDescription); addDescription.click(); testWebDriver.waitForElementToAppear(lossesAndAdjustmentSelect); testWebDriver.selectByVisibleText(lossesAndAdjustmentSelect, "Transfer In"); testWebDriver.waitForElementToAppear(quantityAdj); quantityAdj.clear(); quantityAdj.sendKeys(adj); addButton.click(); testWebDriver.waitForElementToAppear(adjList); String labelAdj = testWebDriver.getText(adjList); assertEquals(labelAdj.trim(), "Transfer In"); // String adjValue = testWebDriver.getAttribute(adjListValue, "value"); // SeleneseTestNgHelper.assertEquals(adjValue, adj); //testWebDriver.waitForElementToAppear(totalAdj); //String totalAdjValue = testWebDriver.getText(totalAdj); testWebDriver.sleep(1000); //SeleneseTestNgHelper.assertEquals(totalAdjValue.substring("Total ".length()), adj); testWebDriver.sleep(1000); doneButton.click(); testWebDriver.sleep(1000); } public void calculateAndVerifyStockOnHand(Integer A, Integer B, Integer C, Integer D) { Integer StockOnHand = A + B - C + D; String stockOnHandActualValue = StockOnHand.toString(); String stockOnHandExpectedValue = calculateStockOnHand(A, B, C, D); verifyFieldValue(stockOnHandExpectedValue, stockOnHandActualValue); } public String calculateStockOnHand(Integer A, Integer B, Integer C, Integer D) { enterBeginningBalance(A.toString()); enterQuantityReceived(B.toString()); enterQuantityDispensed(C.toString()); enterLossesAndAdjustments(D.toString()); beginningBalance.click(); testWebDriver.waitForElementToAppear(stockInHand); testWebDriver.sleep(2000); return stockInHand.getText(); } public void PopulateMandatoryFullSupplyDetails(int numberOfLineItems, int numberOfLineItemsPerPage) { int numberOfPages = numberOfLineItems / numberOfLineItemsPerPage; if (numberOfLineItems % numberOfLineItemsPerPage != 0) { numberOfPages = numberOfPages + 1; } for (int j = 1; j <= numberOfPages; j++) { testWebDriver.getElementByXpath("//a[contains(text(), '" + j + "') and @class='ng-binding']").click(); if (j == numberOfPages && (numberOfLineItems % numberOfLineItemsPerPage) != 0) { numberOfLineItemsPerPage = numberOfLineItems % numberOfLineItemsPerPage; } for (int i = 0; i < numberOfLineItemsPerPage; i++) { testWebDriver.getElementById("beginningBalance_" + i).sendKeys("10"); testWebDriver.getElementById("quantityReceived_" + i).sendKeys("10"); testWebDriver.getElementById("quantityDispensed_" + i).sendKeys("10"); } } } public void enterAndVerifyRequestedQuantityExplanation(Integer A) { String warningMessage = enterRequestedQuantity(A); String expectedWarningMessage = "Please enter a reason"; verifyFieldValue(warningMessage.trim(), expectedWarningMessage); enterExplanation(); } public String enterRequestedQuantity(Integer A) { testWebDriver.waitForElementToAppear(requestedQuantity); requestedQuantity.sendKeys(A.toString()); testWebDriver.waitForElementToAppear(requestedQtyWarningMessage); return testWebDriver.getText(requestedQtyWarningMessage); } public void enterExplanation() { requestedQuantityExplanation.sendKeys("Due to bad climate"); testWebDriver.sleep(1000); } public void enterValuesAndVerifyCalculatedOrderQuantity(Integer F, Integer X, Integer N, Integer P, Integer H, Integer I) { enterValuesCalculatedOrderQuantity(F, X); VerifyCalculatedOrderQuantity(N, P, H, I); testWebDriver.sleep(1000); } public void enterValuesCalculatedOrderQuantity(Integer numberOfNewPatients, Integer StockOutDays) { testWebDriver.waitForElementToAppear(newPatient); newPatient.sendKeys(Keys.DELETE); newPatient.sendKeys(numberOfNewPatients.toString()); testWebDriver.waitForElementToAppear(totalStockOutDays); totalStockOutDays.sendKeys(Keys.DELETE); totalStockOutDays.sendKeys(StockOutDays.toString()); testWebDriver.waitForElementToAppear(adjustedTotalConsumption); testWebDriver.sleep(1500); adjustedTotalConsumption.click(); } public void VerifyCalculatedOrderQuantity(Integer expectedAdjustedTotalConsumption, Integer expectedAMC, Integer expectedMaximumStockQuantity, Integer expectedCalculatedOrderQuantity) { String actualAdjustedTotalConsumption = testWebDriver.getText(adjustedTotalConsumption); verifyFieldValue(expectedAdjustedTotalConsumption.toString(), actualAdjustedTotalConsumption); String actualAmc = testWebDriver.getText(amc); verifyFieldValue(expectedAMC.toString(), actualAmc.trim()); String actualMaximumStockQuantity = testWebDriver.getText(maximumStockQuantity); verifyFieldValue(expectedMaximumStockQuantity.toString(), actualMaximumStockQuantity.trim()); String actualCalculatedOrderQuantity = testWebDriver.getText(caculatedOrderQuantity); verifyFieldValue(expectedCalculatedOrderQuantity.toString(), actualCalculatedOrderQuantity.trim()); } public void verifyPacksToShip(Integer V) { testWebDriver.waitForElementToAppear(packsToShip); String actualPacksToShip = testWebDriver.getText(packsToShip); verifyFieldValue(V.toString(), actualPacksToShip.trim()); testWebDriver.sleep(500); } public void calculateAndVerifyTotalCost() { actualTotalCostFullSupply = calculateTotalCost(); assertEquals(actualTotalCostFullSupply.toString() + "0", totalCost.getText().substring(1)); testWebDriver.sleep(500); } public float calculateTotalCost() { testWebDriver.waitForElementToAppear(packsToShip); String actualPacksToShip = testWebDriver.getText(packsToShip); testWebDriver.waitForElementToAppear(pricePerPack); String actualPricePerPack = testWebDriver.getText(pricePerPack).substring(1); return parseFloat(actualPacksToShip) * parseFloat(actualPricePerPack); } public void calculateAndVerifyTotalCostNonFullSupply() { actualTotalCostNonFullSupply = calculateTotalCostNonFullSupply(); assertEquals(actualTotalCostNonFullSupply.toString() + "0", totalCost.getText().trim().substring(1)); testWebDriver.sleep(500); } public float calculateTotalCostNonFullSupply() { testWebDriver.waitForElementToAppear(packsToShip); String actualPacksToShip = testWebDriver.getText(packsToShip); testWebDriver.waitForElementToAppear(pricePerPackNonFullSupply); String actualPricePerPack = testWebDriver.getText(pricePerPackNonFullSupply).substring(1); return parseFloat(actualPacksToShip.trim()) * parseFloat(actualPricePerPack.trim()); } public void verifyCostOnFooter() { testWebDriver.waitForElementToAppear(totalCostFullSupplyFooter); String totalCostFullSupplyFooterValue = testWebDriver.getText(totalCostFullSupplyFooter); testWebDriver.waitForElementToAppear(totalCostNonFullSupplyFooter); String totalCostNonFullSupplyFooterValue = testWebDriver.getText(totalCostNonFullSupplyFooter); BigDecimal actualTotalCost = new BigDecimal(parseFloat(totalCostFullSupplyFooterValue.trim().substring(1)) + parseFloat(totalCostNonFullSupplyFooterValue.trim().substring(1))).setScale(2, BigDecimal.ROUND_HALF_UP); assertEquals(actualTotalCost.toString(), totalCostFooter.getText().trim().substring(1)); assertEquals(totalCostFooter.getText().trim().substring(1), new BigDecimal(actualTotalCostFullSupply + actualTotalCostNonFullSupply).setScale(2, BigDecimal.ROUND_HALF_UP).toString()); testWebDriver.sleep(500); } public void addNonFullSupplyLineItems(String requestedQuantityValue, String requestedQuantityExplanationValue, String productPrimaryName, String productCode, String category, String baseurl, String dburl) throws IOException, SQLException { testWebDriver.waitForElementToAppear(nonFullSupplyTab); nonFullSupplyTab.click(); DBWrapper dbWrapper = new DBWrapper(baseurl, dburl); String nonFullSupplyItems = dbWrapper.fetchNonFullSupplyData(productCode, "2", "1"); testWebDriver.waitForElementToAppear(addNonFullSupplyButtonScreen); testWebDriver.sleep(1000); addButton.click(); testWebDriver.sleep(1000); assertFalse("Add button not enabled", addButtonNonFullSupply.isEnabled()); assertTrue("Close button not displayed", cancelButton.isDisplayed()); testWebDriver.waitForElementToAppear(categoryDropDownLink); categoryDropDownLink.click(); testWebDriver.waitForElementToAppear(categoryDropDownTextField); categoryDropDownTextField.sendKeys(category); testWebDriver.waitForElementToAppear(categoryDropDownValue); categoryDropDownValue.click(); productDropDownLink.click(); testWebDriver.waitForElementToAppear(productDropDownTextField); productDropDownTextField.sendKeys(productCode); testWebDriver.waitForElementToAppear(productDropDownValue); productDropDownValue.click(); requestedQuantityField.clear(); requestedQuantityField.sendKeys(requestedQuantityValue); requestedQuantityExplanationField.clear(); requestedQuantityExplanationField.sendKeys(requestedQuantityExplanationValue); testWebDriver.waitForElementToAppear(cancelButton); cancelButton.click(); testWebDriver.waitForElementToAppear(addNonFullSupplyButtonScreen); addNonFullSupplyButtonScreen.click(); testWebDriver.waitForElementToAppear(categoryDropDownLink); assertEquals(testWebDriver.getSelectedOptionDefault(categoryDropDown).trim(), ""); assertEquals(testWebDriver.getSelectedOptionDefault(productDropDown).trim(), ""); assertEquals(requestedQuantityField.getAttribute("value").trim(), ""); assertEquals(requestedQuantityExplanationField.getAttribute("value").trim(), ""); testWebDriver.waitForElementToAppear(categoryDropDownLink); categoryDropDownLink.click(); testWebDriver.sleep(200); testWebDriver.waitForElementToAppear(categoryDropDownTextField); categoryDropDownTextField.sendKeys(category); testWebDriver.waitForElementToAppear(categoryDropDownValue); categoryDropDownValue.click(); productDropDownLink.click(); testWebDriver.sleep(200); testWebDriver.waitForElementToAppear(productDropDownTextField); productDropDownTextField.sendKeys(productCode); testWebDriver.waitForElementToAppear(productDropDownValue); productDropDownValue.click(); requestedQuantityField.clear(); requestedQuantityField.sendKeys(requestedQuantityValue); requestedQuantityExplanationField.clear(); requestedQuantityExplanationField.sendKeys(requestedQuantityExplanationValue); testWebDriver.waitForElementToAppear(addNonFullSupplyButton); testWebDriver.sleep(1000); addNonFullSupplyButton.click(); testWebDriver.sleep(500); testWebDriver.waitForElementToAppear(nonFullSupplyProductCodeAndName); assertEquals(nonFullSupplyProductCodeAndName.getText().trim(), productCode + " | " + productPrimaryName); assertEquals(nonFullSupplyProductQuantityRequested.getAttribute("value").trim(), requestedQuantityValue); assertEquals(nonFullSupplyProductReasonForRequestedQuantity.getAttribute("value").trim(), requestedQuantityExplanationValue); doneButtonNonFullSupply.click(); testWebDriver.sleep(500); assertEquals(productDescriptionNonFullSupply.getText().trim(), nonFullSupplyItems); assertEquals(productCodeNonFullSupply.getText().trim(), productCode); assertEquals(testWebDriver.getAttribute(requestedQuantity, "value").trim(), requestedQuantityValue); assertEquals(testWebDriver.getAttribute(requestedQuantityExplanation, "value").trim(), requestedQuantityExplanationValue); } public int getSizeOfElements(String xpath) { return testWebDriver.getElementsSizeByXpath(xpath); } public void verifyColumnsHeadingPresent(String xpathTillTrTag, String heading, int noOfColumns) { boolean flag = false; String actualColumnHeading = null; - for (int i = 0; i <= noOfColumns; i++) { + for (int i = 0; i < noOfColumns; i++) { try { testWebDriver.sleep(100); WebElement columnElement = testWebDriver.getElementByXpath(xpathTillTrTag + "/th[" + (i + 1) + "]"); columnElement.click(); actualColumnHeading = columnElement.getText(); } catch (ElementNotVisibleException e) { continue; } catch (NoSuchElementException e) { continue; } if (actualColumnHeading.trim().toUpperCase().equals(heading.toUpperCase())) { flag = true; break; } } assertEquals(flag, true); } public void verifyColumnHeadingNotPresent(String xpathTillTrTag, String heading, int noOfColumns) { boolean flag = false; String actualColumnHeading = null; - for (int i = 0; i <= noOfColumns; i++) { + for (int i = 0; i < noOfColumns; i++) { try { testWebDriver.sleep(100); WebElement columnElement = testWebDriver.getElementByXpath(xpathTillTrTag + "/th[" + (i + 1) + "]"); columnElement.click(); actualColumnHeading = columnElement.getText(); } catch (ElementNotVisibleException e) { continue; } catch (NoSuchElementException e) { continue; } if (actualColumnHeading.trim().toUpperCase().equals(heading.toUpperCase())) { flag = true; break; } } assertEquals(flag, false); } public void addMultipleNonFullSupplyLineItems(int numberOfLineItems, boolean isMultipleCategories) throws IOException, SQLException { testWebDriver.waitForElementToAppear(nonFullSupplyTab); nonFullSupplyTab.click(); testWebDriver.waitForElementToAppear(addNonFullSupplyButtonScreen); testWebDriver.sleep(1000); addButton.click(); testWebDriver.sleep(1000); testWebDriver.waitForElementToAppear(categoryDropDownLink); for (int i = 0; i < numberOfLineItems; i++) { categoryDropDownLink.click(); testWebDriver.waitForElementToAppear(categoryDropDownTextField); if (isMultipleCategories) { categoryDropDownTextField.sendKeys("Antibiotics" + i); } else { categoryDropDownTextField.sendKeys("Antibiotics"); } testWebDriver.waitForElementToAppear(categoryDropDownValue); categoryDropDownValue.click(); productDropDownLink.click(); testWebDriver.waitForElementToAppear(productDropDownTextField); productDropDownTextField.sendKeys("NF" + i); testWebDriver.waitForElementToAppear(productDropDownValue); productDropDownValue.click(); requestedQuantityField.clear(); requestedQuantityField.sendKeys("10"); requestedQuantityExplanationField.clear(); requestedQuantityExplanationField.sendKeys("Due to certain reasons: " + i); testWebDriver.waitForElementToAppear(addNonFullSupplyButton); testWebDriver.sleep(1000); addNonFullSupplyButton.click(); testWebDriver.sleep(500); testWebDriver.waitForElementToAppear(nonFullSupplyProductCodeAndName); } doneButtonNonFullSupply.click(); testWebDriver.sleep(500); } public void saveRnR() { saveButton.click(); testWebDriver.sleep(1500); // assertTrue("R&R saved successfully! message not displayed", successMessage.isDisplayed()); } public void submitRnR() { submitButton.click(); testWebDriver.sleep(250); } public void authorizeRnR() { authorizeButton.click(); testWebDriver.sleep(250); } public void verifySubmitRnrSuccessMsg() { assertTrue("RnR Submit Success message not displayed", submitSuccessMessage.isDisplayed()); } public void verifyAuthorizeRnrSuccessMsg() { assertTrue("RnR authorize Success message not displayed", submitSuccessMessage.isDisplayed()); } public void verifySubmitRnrErrorMsg() { testWebDriver.sleep(1000); assertTrue("RnR Fail message not displayed", submitErrorMessage.isDisplayed()); } public void clearNewPatientField() { newPatient.sendKeys("\u0008"); testWebDriver.sleep(500); } public void verifyAuthorizeButtonNotPresent() { boolean authorizeButtonPresent; try { authorizeButton.click(); authorizeButtonPresent = true; } catch (ElementNotVisibleException e) { authorizeButtonPresent = false; } assertFalse(authorizeButtonPresent); } public void verifyApproveButtonNotPresent() { boolean approveButtonPresent = false; try { approveButton.click(); approveButtonPresent = true; } catch (ElementNotVisibleException e) { approveButtonPresent = false; } catch (NoSuchElementException e) { approveButtonPresent = false; } finally { assertFalse(approveButtonPresent); } } } \ No newline at end of file

diff --git a/src/com/android/contacts/ui/EditContactActivity.java b/src/com/android/contacts/ui/EditContactActivity.java index 914a2e89d..836871465 100644 --- a/src/com/android/contacts/ui/EditContactActivity.java +++ b/src/com/android/contacts/ui/EditContactActivity.java @@ -1,1253 +1,1257 @@ /* * Copyright (C) 2009 The Android Open Source Project * * 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 com.android.contacts.ui; import com.android.contacts.ContactsListActivity; import com.android.contacts.ContactsUtils; import com.android.contacts.R; import com.android.contacts.model.ContactsSource; import com.android.contacts.model.Editor; import com.android.contacts.model.EntityDelta; import com.android.contacts.model.EntityModifier; import com.android.contacts.model.EntitySet; import com.android.contacts.model.GoogleSource; import com.android.contacts.model.Sources; import com.android.contacts.model.ContactsSource.EditType; import com.android.contacts.model.Editor.EditorListener; import com.android.contacts.model.EntityDelta.ValuesDelta; import com.android.contacts.ui.widget.BaseContactEditorView; import com.android.contacts.ui.widget.PhotoEditorView; import com.android.contacts.util.EmptyService; import com.android.contacts.util.WeakAsyncTask; import com.google.android.collect.Lists; import android.accounts.Account; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; import android.content.ActivityNotFoundException; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Entity; import android.content.Intent; import android.content.OperationApplicationException; import android.content.ContentProviderOperation.Builder; import android.database.Cursor; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; import android.provider.ContactsContract; import android.provider.ContactsContract.AggregationExceptions; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.RawContacts; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.provider.ContactsContract.Contacts.Data; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.LinearLayout; import android.widget.ListAdapter; import android.widget.TextView; import android.widget.Toast; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; /** * Activity for editing or inserting a contact. */ public final class EditContactActivity extends Activity implements View.OnClickListener, Comparator<EntityDelta> { private static final String TAG = "EditContactActivity"; /** The launch code when picking a photo and the raw data is returned */ private static final int PHOTO_PICKED_WITH_DATA = 3021; /** The launch code when a contact to join with is returned */ private static final int REQUEST_JOIN_CONTACT = 3022; private static final String KEY_EDIT_STATE = "state"; private static final String KEY_RAW_CONTACT_ID_REQUESTING_PHOTO = "photorequester"; /** The result code when view activity should close after edit returns */ public static final int RESULT_CLOSE_VIEW_ACTIVITY = 777; public static final int SAVE_MODE_DEFAULT = 0; public static final int SAVE_MODE_SPLIT = 1; public static final int SAVE_MODE_JOIN = 2; private long mRawContactIdRequestingPhoto = -1; private static final int DIALOG_CONFIRM_DELETE = 1; private static final int DIALOG_CONFIRM_READONLY_DELETE = 2; private static final int DIALOG_CONFIRM_MULTIPLE_DELETE = 3; private static final int DIALOG_CONFIRM_READONLY_HIDE = 4; String mQuerySelection; private long mContactIdForJoin; EntitySet mState; /** The linear layout holding the ContactEditorViews */ LinearLayout mContent; private ArrayList<Dialog> mManagedDialogs = Lists.newArrayList(); @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); final Intent intent = getIntent(); final String action = intent.getAction(); setContentView(R.layout.act_edit); // Build editor and listen for photo requests mContent = (LinearLayout) findViewById(R.id.editors); findViewById(R.id.btn_done).setOnClickListener(this); findViewById(R.id.btn_discard).setOnClickListener(this); // Handle initial actions only when existing state missing final boolean hasIncomingState = icicle != null && icicle.containsKey(KEY_EDIT_STATE); if (Intent.ACTION_EDIT.equals(action) && !hasIncomingState) { // Read initial state from database new QueryEntitiesTask(this).execute(intent); } else if (Intent.ACTION_INSERT.equals(action) && !hasIncomingState) { // Trigger dialog to pick account type doAddAction(); } } private static class QueryEntitiesTask extends WeakAsyncTask<Intent, Void, Void, EditContactActivity> { public QueryEntitiesTask(EditContactActivity target) { super(target); } @Override protected Void doInBackground(EditContactActivity target, Intent... params) { // Load edit details in background final Context context = target; final Sources sources = Sources.getInstance(context); final Intent intent = params[0]; final ContentResolver resolver = context.getContentResolver(); // Handle both legacy and new authorities final Uri data = intent.getData(); final String authority = data.getAuthority(); final String mimeType = intent.resolveType(resolver); String selection = "0"; if (ContactsContract.AUTHORITY.equals(authority)) { if (Contacts.CONTENT_ITEM_TYPE.equals(mimeType)) { // Handle selected aggregate final long contactId = ContentUris.parseId(data); selection = RawContacts.CONTACT_ID + "=" + contactId; } else if (RawContacts.CONTENT_ITEM_TYPE.equals(mimeType)) { final long rawContactId = ContentUris.parseId(data); final long contactId = ContactsUtils.queryForContactId(resolver, rawContactId); selection = RawContacts.CONTACT_ID + "=" + contactId; } } else if (android.provider.Contacts.AUTHORITY.equals(authority)) { final long rawContactId = ContentUris.parseId(data); selection = Data.RAW_CONTACT_ID + "=" + rawContactId; } target.mQuerySelection = selection; target.mState = EntitySet.fromQuery(resolver, selection, null, null); // Handle any incoming values that should be inserted final Bundle extras = intent.getExtras(); final boolean hasExtras = extras != null && extras.size() > 0; final boolean hasState = target.mState.size() > 0; if (hasExtras && hasState) { // Find source defining the first RawContact found final EntityDelta state = target.mState.get(0); final String accountType = state.getValues().getAsString(RawContacts.ACCOUNT_TYPE); final ContactsSource source = sources.getInflatedSource(accountType, ContactsSource.LEVEL_CONSTRAINTS); EntityModifier.parseExtras(context, source, state, extras); } return null; } @Override protected void onPostExecute(EditContactActivity target, Void result) { // Bind UI to new background state target.bindEditors(); } } @Override protected void onSaveInstanceState(Bundle outState) { if (hasValidState()) { // Store entities with modifications outState.putParcelable(KEY_EDIT_STATE, mState); } outState.putLong(KEY_RAW_CONTACT_ID_REQUESTING_PHOTO, mRawContactIdRequestingPhoto); super.onSaveInstanceState(outState); } @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { // Read modifications from instance mState = savedInstanceState.<EntitySet> getParcelable(KEY_EDIT_STATE); mRawContactIdRequestingPhoto = savedInstanceState.getLong( KEY_RAW_CONTACT_ID_REQUESTING_PHOTO); bindEditors(); super.onRestoreInstanceState(savedInstanceState); } @Override protected void onDestroy() { super.onDestroy(); for (Dialog dialog : mManagedDialogs) { if (dialog.isShowing()) { dialog.dismiss(); } } } @Override protected Dialog onCreateDialog(int id) { switch (id) { case DIALOG_CONFIRM_DELETE: return new AlertDialog.Builder(this) .setTitle(R.string.deleteConfirmation_title) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.deleteConfirmation) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok, new DeleteClickListener()) .setCancelable(false) .create(); case DIALOG_CONFIRM_READONLY_DELETE: return new AlertDialog.Builder(this) .setTitle(R.string.deleteConfirmation_title) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.readOnlyContactDeleteConfirmation) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok, new DeleteClickListener()) .setCancelable(false) .create(); case DIALOG_CONFIRM_MULTIPLE_DELETE: return new AlertDialog.Builder(this) .setTitle(R.string.deleteConfirmation_title) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.multipleContactDeleteConfirmation) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok, new DeleteClickListener()) .setCancelable(false) .create(); case DIALOG_CONFIRM_READONLY_HIDE: return new AlertDialog.Builder(this) .setTitle(R.string.deleteConfirmation_title) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.readOnlyContactWarning) .setPositiveButton(android.R.string.ok, new DeleteClickListener()) .setCancelable(false) .create(); } return null; } /** * Start managing this {@link Dialog} along with the {@link Activity}. */ private void startManagingDialog(Dialog dialog) { synchronized (mManagedDialogs) { mManagedDialogs.add(dialog); } } /** * Show this {@link Dialog} and manage with the {@link Activity}. */ void showAndManageDialog(Dialog dialog) { startManagingDialog(dialog); dialog.show(); } /** * Check if our internal {@link #mState} is valid, usually checked before * performing user actions. */ protected boolean hasValidState() { return mState != null && mState.size() > 0; } /** * Rebuild the editors to match our underlying {@link #mState} object, usually * called once we've parsed {@link Entity} data or have inserted a new * {@link RawContacts}. */ protected void bindEditors() { if (!hasValidState()) return; final LayoutInflater inflater = (LayoutInflater) getSystemService( Context.LAYOUT_INFLATER_SERVICE); final Sources sources = Sources.getInstance(this); // Sort the editors Collections.sort(mState, this); // Remove any existing editors and rebuild any visible mContent.removeAllViews(); int size = mState.size(); for (int i = 0; i < size; i++) { // TODO ensure proper ordering of entities in the list EntityDelta entity = mState.get(i); final ValuesDelta values = entity.getValues(); if (!values.isVisible()) continue; final String accountType = values.getAsString(RawContacts.ACCOUNT_TYPE); final ContactsSource source = sources.getInflatedSource(accountType, ContactsSource.LEVEL_CONSTRAINTS); final long rawContactId = values.getAsLong(RawContacts._ID); BaseContactEditorView editor; if (!source.readOnly) { editor = (BaseContactEditorView) inflater.inflate(R.layout.item_contact_editor, mContent, false); } else { editor = (BaseContactEditorView) inflater.inflate( R.layout.item_read_only_contact_editor, mContent, false); } PhotoEditorView photoEditor = editor.getPhotoEditor(); photoEditor.setEditorListener(new PhotoListener(rawContactId, source.readOnly, photoEditor)); mContent.addView(editor); editor.setState(entity, source); } // Show editor now that we've loaded state mContent.setVisibility(View.VISIBLE); } /** * Class that listens to requests coming from photo editors */ private class PhotoListener implements EditorListener, DialogInterface.OnClickListener { private long mRawContactId; private boolean mReadOnly; private PhotoEditorView mEditor; public PhotoListener(long rawContactId, boolean readOnly, PhotoEditorView editor) { mRawContactId = rawContactId; mReadOnly = readOnly; mEditor = editor; } public void onDeleted(Editor editor) { // Do nothing } public void onRequest(int request) { if (!hasValidState()) return; if (request == EditorListener.REQUEST_PICK_PHOTO) { if (mEditor.hasSetPhoto()) { // There is an existing photo, offer to remove, replace, or promoto to primary createPhotoDialog().show(); } else if (!mReadOnly) { // No photo set and not read-only, try to set the photo doPickPhotoAction(mRawContactId); } } } /** * Prepare dialog for picking a new {@link EditType} or entering a * custom label. This dialog is limited to the valid types as determined * by {@link EntityModifier}. */ public Dialog createPhotoDialog() { Context context = EditContactActivity.this; // Wrap our context to inflate list items using correct theme final Context dialogContext = new ContextThemeWrapper(context, android.R.style.Theme_Light); String[] choices; if (mReadOnly) { choices = new String[1]; choices[0] = getString(R.string.use_photo_as_primary); } else { choices = new String[3]; choices[0] = getString(R.string.use_photo_as_primary); choices[1] = getString(R.string.removePicture); choices[2] = getString(R.string.changePicture); } final ListAdapter adapter = new ArrayAdapter<String>(dialogContext, android.R.layout.simple_list_item_1, choices); final AlertDialog.Builder builder = new AlertDialog.Builder(dialogContext); builder.setTitle(R.string.attachToContact); builder.setSingleChoiceItems(adapter, -1, this); return builder.create(); } /** * Called when something in the dialog is clicked */ public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); switch (which) { case 0: // Set the photo as super primary mEditor.setSuperPrimary(true); // And set all other photos as not super primary int count = mContent.getChildCount(); for (int i = 0; i < count; i++) { View childView = mContent.getChildAt(i); if (childView instanceof BaseContactEditorView) { BaseContactEditorView editor = (BaseContactEditorView) childView; PhotoEditorView photoEditor = editor.getPhotoEditor(); if (!photoEditor.equals(mEditor)) { photoEditor.setSuperPrimary(false); } } } break; case 1: // Remove the photo mEditor.setPhotoBitmap(null); break; case 2: // Pick a new photo for the contact doPickPhotoAction(mRawContactId); break; } } } /** {@inheritDoc} */ public void onClick(View view) { switch (view.getId()) { case R.id.btn_done: doSaveAction(SAVE_MODE_DEFAULT); break; case R.id.btn_discard: doRevertAction(); break; } } /** {@inheritDoc} */ @Override public void onBackPressed() { doSaveAction(SAVE_MODE_DEFAULT); } /** {@inheritDoc} */ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // Ignore failed requests if (resultCode != RESULT_OK) return; switch (requestCode) { case PHOTO_PICKED_WITH_DATA: { BaseContactEditorView requestingEditor = null; for (int i = 0; i < mContent.getChildCount(); i++) { View childView = mContent.getChildAt(i); if (childView instanceof BaseContactEditorView) { BaseContactEditorView editor = (BaseContactEditorView) childView; if (editor.getRawContactId() == mRawContactIdRequestingPhoto) { requestingEditor = editor; break; } } } if (requestingEditor != null) { final Bitmap photo = data.getParcelableExtra("data"); requestingEditor.setPhotoBitmap(photo); mRawContactIdRequestingPhoto = -1; } else { // The contact that requested the photo is no longer present. // TODO: Show error message } break; } case REQUEST_JOIN_CONTACT: { if (resultCode == RESULT_OK && data != null) { final long contactId = ContentUris.parseId(data.getData()); joinAggregate(contactId); } } } } @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.edit, menu); return true; } @Override public boolean onPrepareOptionsMenu(Menu menu) { menu.findItem(R.id.menu_split).setVisible(mState != null && mState.size() > 1); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_done: return doSaveAction(SAVE_MODE_DEFAULT); case R.id.menu_discard: return doRevertAction(); case R.id.menu_add: return doAddAction(); case R.id.menu_delete: return doDeleteAction(); case R.id.menu_split: return doSplitContactAction(); case R.id.menu_join: return doJoinContactAction(); } return false; } /** * Background task for persisting edited contact data, using the changes * defined by a set of {@link EntityDelta}. This task starts * {@link EmptyService} to make sure the background thread can finish * persisting in cases where the system wants to reclaim our process. */ public static class PersistTask extends WeakAsyncTask<EntitySet, Void, Integer, EditContactActivity> { private static final int PERSIST_TRIES = 3; private static final int RESULT_UNCHANGED = 0; private static final int RESULT_SUCCESS = 1; private static final int RESULT_FAILURE = 2; - private WeakReference<ProgressDialog> progress; + private WeakReference<ProgressDialog> mProgress; private int mSaveMode; private Uri mContactLookupUri = null; public PersistTask(EditContactActivity target, int saveMode) { super(target); mSaveMode = saveMode; } /** {@inheritDoc} */ @Override protected void onPreExecute(EditContactActivity target) { - this.progress = new WeakReference<ProgressDialog>(ProgressDialog.show(target, null, + mProgress = new WeakReference<ProgressDialog>(ProgressDialog.show(target, null, target.getText(R.string.savingContact))); // Before starting this task, start an empty service to protect our // process from being reclaimed by the system. final Context context = target; context.startService(new Intent(context, EmptyService.class)); } /** {@inheritDoc} */ @Override protected Integer doInBackground(EditContactActivity target, EntitySet... params) { final Context context = target; final ContentResolver resolver = context.getContentResolver(); EntitySet state = params[0]; // Trim any empty fields, and RawContacts, before persisting final Sources sources = Sources.getInstance(context); EntityModifier.trimEmpty(state, sources); // Attempt to persist changes int tries = 0; Integer result = RESULT_FAILURE; while (tries++ < PERSIST_TRIES) { try { // Build operations and try applying final ArrayList<ContentProviderOperation> diff = state.buildDiff(); ContentProviderResult[] results = null; if (!diff.isEmpty()) { results = resolver.applyBatch(ContactsContract.AUTHORITY, diff); } final long rawContactId = getRawContactId(state, diff, results); if (rawContactId != -1) { final Uri rawContactUri = ContentUris.withAppendedId( RawContacts.CONTENT_URI, rawContactId); // convert the raw contact URI to a contact URI mContactLookupUri = RawContacts.getContactLookupUri(resolver, rawContactUri); } result = (diff.size() > 0) ? RESULT_SUCCESS : RESULT_UNCHANGED; break; } catch (RemoteException e) { // Something went wrong, bail without success Log.e(TAG, "Problem persisting user edits", e); break; } catch (OperationApplicationException e) { // Version consistency failed, re-parent change and try again Log.w(TAG, "Version consistency failed, re-parenting: " + e.toString()); final EntitySet newState = EntitySet.fromQuery(resolver, target.mQuerySelection, null, null); state = EntitySet.mergeAfter(newState, state); } } return result; } private long getRawContactId(EntitySet state, final ArrayList<ContentProviderOperation> diff, final ContentProviderResult[] results) { long rawContactId = state.findRawContactId(); if (rawContactId != -1) { return rawContactId; } // we gotta do some searching for the id final int diffSize = diff.size(); for (int i = 0; i < diffSize; i++) { ContentProviderOperation operation = diff.get(i); if (operation.getType() == ContentProviderOperation.TYPE_INSERT && operation.getUri().getEncodedPath().contains( RawContacts.CONTENT_URI.getEncodedPath())) { return ContentUris.parseId(results[i].uri); } } return -1; } /** {@inheritDoc} */ @Override protected void onPostExecute(EditContactActivity target, Integer result) { final Context context = target; + final ProgressDialog progress = mProgress.get(); if (result == RESULT_SUCCESS && mSaveMode != SAVE_MODE_JOIN) { Toast.makeText(context, R.string.contactSavedToast, Toast.LENGTH_SHORT).show(); } else if (result == RESULT_FAILURE) { Toast.makeText(context, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show(); } - progress.get().dismiss(); + // Only dismiss when valid reference and still showing + if (progress != null && progress.isShowing()) { + progress.dismiss(); + } // Stop the service that was protecting us context.stopService(new Intent(context, EmptyService.class)); target.onSaveCompleted(result != RESULT_FAILURE, mSaveMode, mContactLookupUri); } } /** * Saves or creates the contact based on the mode, and if successful * finishes the activity. */ boolean doSaveAction(int saveMode) { if (!hasValidState()) return false; final PersistTask task = new PersistTask(this, saveMode); task.execute(mState); return true; } private class DeleteClickListener implements DialogInterface.OnClickListener { public void onClick(DialogInterface dialog, int which) { Sources sources = Sources.getInstance(EditContactActivity.this); // Mark all raw contacts for deletion for (EntityDelta delta : mState) { delta.markDeleted(); } // Save the deletes doSaveAction(SAVE_MODE_DEFAULT); finish(); } } private void onSaveCompleted(boolean success, int saveMode, Uri contactLookupUri) { switch (saveMode) { case SAVE_MODE_DEFAULT: if (success && contactLookupUri != null) { final Intent resultIntent = new Intent(); final Uri requestData = getIntent().getData(); final String requestAuthority = requestData == null ? null : requestData .getAuthority(); if (android.provider.Contacts.AUTHORITY.equals(requestAuthority)) { // Build legacy Uri when requested by caller final long contactId = ContentUris.parseId(Contacts.lookupContact( getContentResolver(), contactLookupUri)); final Uri legacyUri = ContentUris.withAppendedId( android.provider.Contacts.People.CONTENT_URI, contactId); resultIntent.setData(legacyUri); } else { // Otherwise pass back a lookup-style Uri resultIntent.setData(contactLookupUri); } setResult(RESULT_OK, resultIntent); } else { setResult(RESULT_CANCELED, null); } finish(); break; case SAVE_MODE_SPLIT: if (success) { Intent intent = new Intent(); intent.setData(contactLookupUri); setResult(RESULT_CLOSE_VIEW_ACTIVITY, intent); } finish(); break; case SAVE_MODE_JOIN: if (success) { showJoinAggregateActivity(contactLookupUri); } break; } } /** * Shows a list of aggregates that can be joined into the currently viewed aggregate. * * @param contactLookupUri the fresh URI for the currently edited contact (after saving it) */ public void showJoinAggregateActivity(Uri contactLookupUri) { if (contactLookupUri == null) { return; } mContactIdForJoin = ContentUris.parseId(contactLookupUri); Intent intent = new Intent(ContactsListActivity.JOIN_AGGREGATE); intent.putExtra(ContactsListActivity.EXTRA_AGGREGATE_ID, mContactIdForJoin); startActivityForResult(intent, REQUEST_JOIN_CONTACT); } /** * Performs aggregation with the contact selected by the user from suggestions or A-Z list. */ private void joinAggregate(final long contactId) { ContentResolver resolver = getContentResolver(); // Load raw contact IDs for all raw contacts involved - currently edited and selected // in the join UIs Cursor c = resolver.query(RawContacts.CONTENT_URI, new String[] {RawContacts._ID}, RawContacts.CONTACT_ID + "=" + contactId + " OR " + RawContacts.CONTACT_ID + "=" + mContactIdForJoin, null, null); long rawContactIds[]; try { rawContactIds = new long[c.getCount()]; for (int i = 0; i < rawContactIds.length; i++) { c.moveToNext(); rawContactIds[i] = c.getLong(0); } } finally { c.close(); } // For each pair of raw contacts, insert an aggregation exception ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>(); for (int i = 0; i < rawContactIds.length; i++) { for (int j = 0; j < rawContactIds.length; j++) { if (i != j) { buildJoinContactDiff(operations, rawContactIds[i], rawContactIds[j]); } } } // Apply all aggregation exceptions as one batch try { getContentResolver().applyBatch(ContactsContract.AUTHORITY, operations); // We can use any of the constituent raw contacts to refresh the UI - why not the first Intent intent = new Intent(); intent.setData(ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactIds[0])); // Reload the new state from database new QueryEntitiesTask(this).execute(intent); Toast.makeText(this, R.string.contactsJoinedMessage, Toast.LENGTH_LONG).show(); } catch (RemoteException e) { Log.e(TAG, "Failed to apply aggregation exception batch", e); Toast.makeText(this, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show(); } catch (OperationApplicationException e) { Log.e(TAG, "Failed to apply aggregation exception batch", e); Toast.makeText(this, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show(); } } /** * Construct a {@link AggregationExceptions#TYPE_KEEP_TOGETHER} ContentProviderOperation. */ private void buildJoinContactDiff(ArrayList<ContentProviderOperation> operations, long rawContactId1, long rawContactId2) { Builder builder = ContentProviderOperation.newUpdate(AggregationExceptions.CONTENT_URI); builder.withValue(AggregationExceptions.TYPE, AggregationExceptions.TYPE_KEEP_TOGETHER); builder.withValue(AggregationExceptions.RAW_CONTACT_ID1, rawContactId1); builder.withValue(AggregationExceptions.RAW_CONTACT_ID2, rawContactId2); operations.add(builder.build()); } /** * Revert any changes the user has made, and finish the activity. */ private boolean doRevertAction() { finish(); return true; } /** * Create a new {@link RawContacts} which will exist as another * {@link EntityDelta} under the currently edited {@link Contacts}. */ private boolean doAddAction() { // Adding is okay when missing state new AddContactTask(this).execute(); return true; } /** * Delete the entire contact currently being edited, which usually asks for * user confirmation before continuing. */ private boolean doDeleteAction() { if (!hasValidState()) return false; int readOnlySourcesCnt = 0; int writableSourcesCnt = 0; Sources sources = Sources.getInstance(EditContactActivity.this); for (EntityDelta delta : mState) { final String accountType = delta.getValues().getAsString(RawContacts.ACCOUNT_TYPE); final ContactsSource contactsSource = sources.getInflatedSource(accountType, ContactsSource.LEVEL_CONSTRAINTS); if (contactsSource != null && contactsSource.readOnly) { readOnlySourcesCnt += 1; } else { writableSourcesCnt += 1; } } if (readOnlySourcesCnt > 0 && writableSourcesCnt > 0) { showDialog(DIALOG_CONFIRM_READONLY_DELETE); } else if (readOnlySourcesCnt > 0 && writableSourcesCnt == 0) { showDialog(DIALOG_CONFIRM_READONLY_HIDE); } else if (readOnlySourcesCnt == 0 && writableSourcesCnt > 1) { showDialog(DIALOG_CONFIRM_MULTIPLE_DELETE); } else { showDialog(DIALOG_CONFIRM_DELETE); } return true; } /** * Pick a specific photo to be added under the currently selected tab. */ boolean doPickPhotoAction(long rawContactId) { if (!hasValidState()) return false; try { // Launch picker to choose photo for selected contact final Intent intent = ContactsUtils.getPhotoPickIntent(); startActivityForResult(intent, PHOTO_PICKED_WITH_DATA); mRawContactIdRequestingPhoto = rawContactId; } catch (ActivityNotFoundException e) { Toast.makeText(this, R.string.photoPickerNotFoundText, Toast.LENGTH_LONG).show(); } return true; } /** {@inheritDoc} */ public void onDeleted(Editor editor) { // Ignore any editor deletes } private boolean doSplitContactAction() { if (!hasValidState()) return false; showAndManageDialog(createSplitDialog()); return true; } private Dialog createSplitDialog() { final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.splitConfirmation_title); builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setMessage(R.string.splitConfirmation); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // Split the contacts mState.splitRawContacts(); doSaveAction(SAVE_MODE_SPLIT); } }); builder.setNegativeButton(android.R.string.cancel, null); builder.setCancelable(false); return builder.create(); } private boolean doJoinContactAction() { return doSaveAction(SAVE_MODE_JOIN); } /** * Build dialog that handles adding a new {@link RawContacts} after the user * picks a specific {@link ContactsSource}. */ private static class AddContactTask extends WeakAsyncTask<Void, Void, AlertDialog.Builder, EditContactActivity> { public AddContactTask(EditContactActivity target) { super(target); } @Override protected AlertDialog.Builder doInBackground(final EditContactActivity target, Void... params) { final Sources sources = Sources.getInstance(target); // Wrap our context to inflate list items using correct theme final Context dialogContext = new ContextThemeWrapper(target, android.R.style.Theme_Light); final LayoutInflater dialogInflater = (LayoutInflater)dialogContext .getSystemService(Context.LAYOUT_INFLATER_SERVICE); final ArrayList<Account> writable = sources.getAccounts(true); // No Accounts available. Create a phone-local contact. if (writable.isEmpty()) { selectAccount(null); return null; // Don't show a dialog. } // In the common case of a single account being writable, auto-select // it without showing a dialog. if (writable.size() == 1) { selectAccount(writable.get(0)); return null; // Don't show a dialog. } final ArrayAdapter<Account> accountAdapter = new ArrayAdapter<Account>(target, android.R.layout.simple_list_item_2, writable) { @Override public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { convertView = dialogInflater.inflate(android.R.layout.simple_list_item_2, parent, false); } // TODO: show icon along with title final TextView text1 = (TextView)convertView.findViewById(android.R.id.text1); final TextView text2 = (TextView)convertView.findViewById(android.R.id.text2); final Account account = this.getItem(position); final ContactsSource source = sources.getInflatedSource(account.type, ContactsSource.LEVEL_SUMMARY); text1.setText(account.name); text2.setText(source.getDisplayLabel(target)); return convertView; } }; final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); // Create new contact based on selected source final Account account = accountAdapter.getItem(which); selectAccount(account); // Update the UI. EditContactActivity target = mTarget.get(); if (target != null) { target.bindEditors(); } } }; final DialogInterface.OnCancelListener cancelListener = new DialogInterface.OnCancelListener() { public void onCancel(DialogInterface dialog) { // If nothing remains, close activity if (!target.hasValidState()) { target.finish(); } } }; // TODO: when canceled and was single add, finish() final AlertDialog.Builder builder = new AlertDialog.Builder(target); builder.setTitle(R.string.dialog_new_contact_account); builder.setSingleChoiceItems(accountAdapter, 0, clickListener); builder.setOnCancelListener(cancelListener); return builder; } /** * Sets up EditContactActivity's mState for the account selected. * Runs from a background thread. * * @param account may be null to signal a device-local contact should * be created. */ private void selectAccount(Account account) { EditContactActivity target = mTarget.get(); if (target == null) { return; } final Sources sources = Sources.getInstance(target); final ContentValues values = new ContentValues(); if (account != null) { values.put(RawContacts.ACCOUNT_NAME, account.name); values.put(RawContacts.ACCOUNT_TYPE, account.type); } else { values.putNull(RawContacts.ACCOUNT_NAME); values.putNull(RawContacts.ACCOUNT_TYPE); } // Parse any values from incoming intent final EntityDelta insert = new EntityDelta(ValuesDelta.fromAfter(values)); final ContactsSource source = sources.getInflatedSource( account != null ? account.type : null, ContactsSource.LEVEL_CONSTRAINTS); final Bundle extras = target.getIntent().getExtras(); EntityModifier.parseExtras(target, source, insert, extras); // Ensure we have some default fields EntityModifier.ensureKindExists(insert, source, Phone.CONTENT_ITEM_TYPE); EntityModifier.ensureKindExists(insert, source, Email.CONTENT_ITEM_TYPE); // Create "My Contacts" membership for Google contacts // TODO: move this off into "templates" for each given source if (GoogleSource.ACCOUNT_TYPE.equals(source.accountType)) { GoogleSource.attemptMyContactsMembership(insert, target); } // TODO: no synchronization here on target.mState. This // runs in the background thread, but it's accessed from // multiple thread, including the UI thread. if (target.mState == null) { // Create state if none exists yet target.mState = EntitySet.fromSingle(insert); } else { // Add contact onto end of existing state target.mState.add(insert); } } @Override protected void onPostExecute(EditContactActivity target, AlertDialog.Builder result) { if (result != null) { // Note: null is returned when no dialog is to be // shown (no multiple accounts to select between) target.showAndManageDialog(result.create()); } else { // Account was auto-selected on the background thread, // but we need to update the UI still in the // now-current UI thread. target.bindEditors(); } } } private Dialog createDeleteDialog() { final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.deleteConfirmation_title); builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setMessage(R.string.deleteConfirmation); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // Mark all raw contacts for deletion for (EntityDelta delta : mState) { delta.markDeleted(); } // Save the deletes doSaveAction(SAVE_MODE_DEFAULT); finish(); } }); builder.setNegativeButton(android.R.string.cancel, null); builder.setCancelable(false); return builder.create(); } /** * Create dialog for selecting primary display name. */ private Dialog createNameDialog() { // Build set of all available display names final ArrayList<ValuesDelta> allNames = Lists.newArrayList(); for (EntityDelta entity : mState) { final ArrayList<ValuesDelta> displayNames = entity .getMimeEntries(StructuredName.CONTENT_ITEM_TYPE); allNames.addAll(displayNames); } // Wrap our context to inflate list items using correct theme final Context dialogContext = new ContextThemeWrapper(this, android.R.style.Theme_Light); final LayoutInflater dialogInflater = this.getLayoutInflater() .cloneInContext(dialogContext); final ListAdapter nameAdapter = new ArrayAdapter<ValuesDelta>(this, android.R.layout.simple_list_item_1, allNames) { @Override public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { convertView = dialogInflater.inflate(android.R.layout.simple_list_item_1, parent, false); } final ValuesDelta structuredName = this.getItem(position); final String displayName = structuredName.getAsString(StructuredName.DISPLAY_NAME); ((TextView)convertView).setText(displayName); return convertView; } }; final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); // User picked display name, so make super-primary final ValuesDelta structuredName = allNames.get(which); structuredName.put(Data.IS_PRIMARY, 1); structuredName.put(Data.IS_SUPER_PRIMARY, 1); } }; final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.dialog_primary_name); builder.setSingleChoiceItems(nameAdapter, 0, clickListener); return builder.create(); } /** * Compare EntityDeltas for sorting the stack of editors. */ public int compare(EntityDelta one, EntityDelta two) { // Check direct equality if (one.equals(two)) { return 0; } final Sources sources = Sources.getInstance(this); String accountType = one.getValues().getAsString(RawContacts.ACCOUNT_TYPE); final ContactsSource oneSource = sources.getInflatedSource(accountType, ContactsSource.LEVEL_SUMMARY); accountType = two.getValues().getAsString(RawContacts.ACCOUNT_TYPE); final ContactsSource twoSource = sources.getInflatedSource(accountType, ContactsSource.LEVEL_SUMMARY); // Check read-only if (oneSource.readOnly && !twoSource.readOnly) { return 1; } else if (twoSource.readOnly && !oneSource.readOnly) { return -1; } // Check account type boolean skipAccountTypeCheck = false; boolean oneIsGoogle = oneSource instanceof GoogleSource; boolean twoIsGoogle = twoSource instanceof GoogleSource; if (oneIsGoogle && !twoIsGoogle) { return -1; } else if (twoIsGoogle && !oneIsGoogle) { return 1; } else { skipAccountTypeCheck = true; } int value; if (!skipAccountTypeCheck) { value = oneSource.accountType.compareTo(twoSource.accountType); if (value != 0) { return value; } } // Check account name ValuesDelta oneValues = one.getValues(); String oneAccount = oneValues.getAsString(RawContacts.ACCOUNT_NAME); if (oneAccount == null) oneAccount = ""; ValuesDelta twoValues = two.getValues(); String twoAccount = twoValues.getAsString(RawContacts.ACCOUNT_NAME); if (twoAccount == null) twoAccount = ""; value = oneAccount.compareTo(twoAccount); if (value != 0) { return value; } // Both are in the same account, fall back to contact ID long oneId = oneValues.getAsLong(RawContacts._ID); long twoId = twoValues.getAsLong(RawContacts._ID); return (int)(oneId - twoId); } }

diff --git a/src/org/mockito/exceptions/Reporter.java b/src/org/mockito/exceptions/Reporter.java index 16ffa9ffc..458717add 100644 --- a/src/org/mockito/exceptions/Reporter.java +++ b/src/org/mockito/exceptions/Reporter.java @@ -1,437 +1,437 @@ /* * Copyright (c) 2007 Mockito contributors * This program is made available under the terms of the MIT License. */ package org.mockito.exceptions; import static org.mockito.exceptions.Pluralizer.*; import static org.mockito.internal.util.StringJoiner.*; import java.util.List; import org.mockito.exceptions.base.MockitoAssertionError; import org.mockito.exceptions.base.MockitoException; import org.mockito.exceptions.misusing.InvalidUseOfMatchersException; import org.mockito.exceptions.misusing.MissingMethodInvocationException; import org.mockito.exceptions.misusing.NotAMockException; import org.mockito.exceptions.misusing.NullInsteadOfMockException; import org.mockito.exceptions.misusing.UnfinishedStubbingException; import org.mockito.exceptions.misusing.UnfinishedVerificationException; import org.mockito.exceptions.misusing.WrongTypeOfReturnValue; import org.mockito.exceptions.verification.ArgumentsAreDifferent; import org.mockito.exceptions.verification.NeverWantedButInvoked; import org.mockito.exceptions.verification.NoInteractionsWanted; import org.mockito.exceptions.verification.SmartNullPointerException; import org.mockito.exceptions.verification.TooLittleActualInvocations; import org.mockito.exceptions.verification.TooManyActualInvocations; import org.mockito.exceptions.verification.VerificationInOrderFailure; import org.mockito.exceptions.verification.WantedButNotInvoked; import org.mockito.exceptions.verification.junit.JUnitTool; import org.mockito.internal.debugging.Location; /** * Reports verification and misusing errors. * <p> * One of the key points of mocking library is proper verification/exception * messages. All messages in one place makes it easier to tune and amend them. * <p> * Reporter can be injected and therefore is easily testable. * <p> * Generally, exception messages are full of line breaks to make them easy to * read (xunit plugins take only fraction of screen on modern IDEs). */ public class Reporter { public void checkedExceptionInvalid(Throwable t) { throw new MockitoException(join( "Checked exception is invalid for this method!", "Invalid: " + t )); } public void cannotStubWithNullThrowable() { throw new MockitoException(join( "Cannot stub with null throwable!" )); } public void unfinishedStubbing(Location location) { throw new UnfinishedStubbingException(join( "Unfinished stubbing detected here:", location, "", "E.g. thenReturn() may be missing.", "Examples of correct stubbing:", " when(mock.isOk()).thenReturn(true);", " when(mock.isOk()).thenThrow(exception);", " doThrow(exception).when(mock).someVoidMethod();", "Hints:", " 1. missing thenReturn()", " 2. although stubbed methods may return mocks, you cannot inline mock creation (mock()) call inside a thenReturn method (see issue 53)", "" )); } public void missingMethodInvocation() { throw new MissingMethodInvocationException(join( "when() requires an argument which has to be a method call on a mock.", "For example:", " when(mock.getArticles()).thenReturn(articles);", "", "Also, this error might show up because you stub final/private/equals() or hashCode() method.", "Those methods *cannot* be stubbed/verified.", "" )); } public void unfinishedVerificationException(Location location) { UnfinishedVerificationException exception = new UnfinishedVerificationException(join( "Missing method call for verify(mock) here:", location, "", "Example of correct verification:", " verify(mock).doSomething()", "", "Also, this error might show up because you verify final/private/equals() or hashCode() method.", "Those methods *cannot* be stubbed/verified.", "" )); throw exception; } public void notAMockPassedToVerify() { throw new NotAMockException(join( "Argument passed to verify() is not a mock!", "Examples of correct verifications:", " verify(mock).someMethod();", " verify(mock, times(10)).someMethod();", " verify(mock, atLeastOnce()).someMethod();" )); } public void nullPassedToVerify() { throw new NullInsteadOfMockException(join( "Argument passed to verify() is null!", "Examples of correct verifications:", " verify(mock).someMethod();", " verify(mock, times(10)).someMethod();", " verify(mock, atLeastOnce()).someMethod();", "Also, if you use @Mock annotation don't miss initMocks()" )); } public void notAMockPassedToWhenMethod() { throw new NotAMockException(join( "Argument passed to when() is not a mock!", "Example of correct stubbing:", " doThrow(new RuntimeException()).when(mock).someMethod();" )); } public void nullPassedToWhenMethod() { throw new NullInsteadOfMockException(join( "Argument passed to when() is null!", "Example of correct stubbing:", " doThrow(new RuntimeException()).when(mock).someMethod();", "Also, if you use @Mock annotation don't miss initMocks()" )); } public void mocksHaveToBePassedToVerifyNoMoreInteractions() { throw new MockitoException(join( "Method requires argument(s)!", "Pass mocks that should be verified, e.g:", " verifyNoMoreInteractions(mockOne, mockTwo);", " verifyZeroInteractions(mockOne, mockTwo);" )); } public void notAMockPassedToVerifyNoMoreInteractions() { throw new NotAMockException(join( "Argument(s) passed is not a mock!", "Examples of correct verifications:", " verifyNoMoreInteractions(mockOne, mockTwo);", " verifyZeroInteractions(mockOne, mockTwo);" )); } public void nullPassedToVerifyNoMoreInteractions() { throw new NullInsteadOfMockException(join( "Argument(s) passed is null!", "Examples of correct verifications:", " verifyNoMoreInteractions(mockOne, mockTwo);", " verifyZeroInteractions(mockOne, mockTwo);" )); } public void notAMockPassedWhenCreatingInOrder() { throw new NotAMockException(join( "Argument(s) passed is not a mock!", "Pass mocks that require verification in order.", "For example:", " InOrder inOrder = inOrder(mockOne, mockTwo);" )); } public void nullPassedWhenCreatingInOrder() { throw new NullInsteadOfMockException(join( "Argument(s) passed is null!", "Pass mocks that require verification in order.", "For example:", " InOrder inOrder = inOrder(mockOne, mockTwo);" )); } public void mocksHaveToBePassedWhenCreatingInOrder() { throw new MockitoException(join( "Method requires argument(s)!", "Pass mocks that require verification in order.", "For example:", " InOrder inOrder = inOrder(mockOne, mockTwo);" )); } public void inOrderRequiresFamiliarMock() { throw new MockitoException(join( "InOrder can only verify mocks that were passed in during creation of InOrder.", "For example:", " InOrder inOrder = inOrder(mockOne);", " inOrder.verify(mockOne).doStuff();" )); } public void invalidUseOfMatchers(int expectedMatchersCount, int recordedMatchersCount) { throw new InvalidUseOfMatchersException(join( "Invalid use of argument matchers!", expectedMatchersCount + " matchers expected, " + recordedMatchersCount + " recorded.", "This exception may occur if matchers are combined with raw values:", " //incorrect:", " someMethod(anyObject(), \"raw String\");", "When using matchers, all arguments have to be provided by matchers.", "For example:", " //correct:", " someMethod(anyObject(), eq(\"String by matcher\"));", "", "For more info see javadoc for Matchers class." )); } public void argumentsAreDifferent(String wanted, String actual, Location actualLocation) { String message = join("Argument(s) are different! Wanted:", wanted, new Location(), "Actual invocation has different arguments:", actual, actualLocation, "" ); if (JUnitTool.hasJUnit()) { throw JUnitTool.createArgumentsAreDifferentException(message, wanted, actual); } else { throw new ArgumentsAreDifferent(message); } } public void wantedButNotInvoked(PrintableInvocation wanted) { throw new WantedButNotInvoked(createWantedButNotInvokedMessage(wanted)); } public void wantedButNotInvoked(PrintableInvocation wanted, List<? extends PrintableInvocation> invocations) { String allInvocations; if (invocations.isEmpty()) { allInvocations = "Actually, there were zero interactions with this mock.\n"; } else { StringBuilder sb = new StringBuilder("\nHowever, there were other interactions with this mock:\n"); for (PrintableInvocation i : invocations) { sb.append(i.getLocation()); sb.append("\n"); } allInvocations = sb.toString(); } String message = createWantedButNotInvokedMessage(wanted); throw new WantedButNotInvoked(message + allInvocations); } private String createWantedButNotInvokedMessage(PrintableInvocation wanted) { return join( "Wanted but not invoked:", wanted.toString(), new Location(), "" ); } public void wantedButNotInvokedInOrder(PrintableInvocation wanted, PrintableInvocation previous) { throw new VerificationInOrderFailure(join( "Verification in order failure", "Wanted but not invoked:", wanted.toString(), new Location(), "Wanted anywhere AFTER following interaction:", previous.toString(), previous.getLocation(), "" )); } public void tooManyActualInvocations(int wantedCount, int actualCount, PrintableInvocation wanted, Location firstUndesired) { String message = createTooManyInvocationsMessage(wantedCount, actualCount, wanted, firstUndesired); throw new TooManyActualInvocations(message); } private String createTooManyInvocationsMessage(int wantedCount, int actualCount, PrintableInvocation wanted, Location firstUndesired) { return join( wanted.toString(), "Wanted " + Pluralizer.pluralize(wantedCount) + ":", new Location(), "But was " + pluralize(actualCount) + ". Undesired invocation:", firstUndesired, "" ); } public void neverWantedButInvoked(PrintableInvocation wanted, Location firstUndesired) { throw new NeverWantedButInvoked(join( wanted.toString(), "Never wanted here:", new Location(), "But invoked here:", firstUndesired, "" )); } public void tooManyActualInvocationsInOrder(int wantedCount, int actualCount, PrintableInvocation wanted, Location firstUndesired) { String message = createTooManyInvocationsMessage(wantedCount, actualCount, wanted, firstUndesired); throw new VerificationInOrderFailure(join( "Verification in order failure:" + message )); } private String createTooLittleInvocationsMessage(Discrepancy discrepancy, PrintableInvocation wanted, Location lastActualInvocation) { String ending = (lastActualInvocation != null)? lastActualInvocation + "\n" : "\n"; String message = join( wanted.toString(), "Wanted " + discrepancy.getPluralizedWantedCount() + ":", new Location(), "But was " + discrepancy.getPluralizedActualCount() + ":", ending ); return message; } public void tooLittleActualInvocations(Discrepancy discrepancy, PrintableInvocation wanted, Location lastActualLocation) { String message = createTooLittleInvocationsMessage(discrepancy, wanted, lastActualLocation); throw new TooLittleActualInvocations(message); } public void tooLittleActualInvocationsInOrder(Discrepancy discrepancy, PrintableInvocation wanted, Location lastActualLocation) { String message = createTooLittleInvocationsMessage(discrepancy, wanted, lastActualLocation); throw new VerificationInOrderFailure(join( "Verification in order failure:" + message )); } public void noMoreInteractionsWanted(PrintableInvocation undesired) { throw new NoInteractionsWanted(join( "No interactions wanted here:", new Location(), "But found this interaction:", undesired.getLocation(), "" )); } public void cannotMockFinalClass(Class<?> clazz) { throw new MockitoException(join( "Cannot mock/spy " + clazz.toString(), "Mockito cannot mock/spy following:", " - final classes", " - anonymous classes", " - primitive types" )); } public void cannotStubVoidMethodWithAReturnValue() { throw new MockitoException(join( "Cannot stub a void method with a return value!", "Voids are usually stubbed with Throwables:", " doThrow(exception).when(mock).someVoidMethod();" )); } public void onlyVoidMethodsCanBeSetToDoNothing() { throw new MockitoException(join( "Only void methods can doNothing()!", "Example of correct use of doNothing():", " doNothing().", " doThrow(new RuntimeException())", " .when(mock).someVoidMethod();", "Above means:", "someVoidMethod() does nothing the 1st time but throws an exception the 2nd time is called" )); } - public void wrongTypeOfReturnValue(String expectedType, String actualType, String method) { + public void wrongTypeOfReturnValue(String expectedType, String actualType, String methodName) { throw new WrongTypeOfReturnValue(join( - actualType + " cannot be returned by " + method, - method + " should return " + expectedType + actualType + " cannot be returned by " + methodName + "()", + methodName + "() should return " + expectedType )); } public void wantedAtMostX(int maxNumberOfInvocations, int foundSize) { throw new MockitoAssertionError(join("Wanted at most " + pluralize(maxNumberOfInvocations) + " but was " + foundSize)); } public void misplacedArgumentMatcher(Location location) { throw new InvalidUseOfMatchersException(join( "Misplaced argument matcher detected here:", location, "", "You cannot use argument matchers outside of verification or stubbing.", "Examples of correct usage of argument matchers:", " when(mock.get(anyInt())).thenReturn(null);", " doThrow(new RuntimeException()).when(mock).someVoidMethod(anyObject());", " verify(mock).someMethod(contains(\"foo\"))", "", "Also, this error might show up because you use argument matchers with methods that cannot be mocked.", "Following methods *cannot* be stubbed/verified: final/private/equals()/hashCode() methods.", "" )); } public void smartNullPointerException(Location location) { throw new SmartNullPointerException(join( "You have a NullPointerException here:", new Location(), "Because this method was *not* stubbed correctly:", location, "" )); } public void noArgumentValueWasCaptured() { throw new MockitoException(join( "No argument value was captured!", "You might have forgotten to use argument.capture() in verify()...", "...or you used capture() in stubbing but stubbed method was not called.", "Be aware that it is recommended to use capture() only with verify()", "", "Examples of correct argument capturing:", " Argument<Person> argument = new Argument<Person>();", " verify(mock).doSomething(argument.capture());", " assertEquals(\"John\", argument.getValue().getName());", "" )); } } \ No newline at end of file diff --git a/test/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java b/test/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java index 07c90a096..36631ed2b 100644 --- a/test/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java +++ b/test/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java @@ -1,226 +1,226 @@ /* * Copyright (c) 2007 Mockito contributors * This program is made available under the terms of the MIT License. */ package org.mockitousage.stubbing; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import java.io.IOException; import org.junit.After; import org.junit.Test; import org.mockito.Mock; import org.mockito.exceptions.base.MockitoException; import org.mockito.exceptions.verification.NoInteractionsWanted; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.mockitousage.IMethods; import org.mockitoutil.TestBase; @SuppressWarnings("serial") public class StubbingUsingDoReturnTest extends TestBase { @Mock private IMethods mock; @After public void resetState() { super.resetState(); } @Test public void shouldStub() throws Exception { doReturn("foo").when(mock).simpleMethod(); doReturn("bar").when(mock).simpleMethod(); assertEquals("bar", mock.simpleMethod()); } @Test public void shouldStubWithArgs() throws Exception { doReturn("foo").when(mock).simpleMethod("foo"); doReturn("bar").when(mock).simpleMethod(eq("one"), anyInt()); assertEquals("foo", mock.simpleMethod("foo")); assertEquals("bar", mock.simpleMethod("one", 234)); assertEquals(null, mock.simpleMethod("xxx", 234)); } class FooRuntimeException extends RuntimeException {} @Test public void shouldStubWithThrowable() throws Exception { doThrow(new FooRuntimeException()).when(mock).voidMethod(); try { mock.voidMethod(); fail(); } catch (FooRuntimeException e) {} } @Test public void shouldAllowSettingValidCheckedException() throws Exception { doThrow(new IOException()).when(mock).throwsIOException(0); try { mock.throwsIOException(0); fail(); } catch (IOException e) {} } class FooCheckedException extends Exception {} @Test public void shouldDetectInvalidCheckedException() throws Exception { try { doThrow(new FooCheckedException()).when(mock).throwsIOException(0); fail(); } catch (Exception e) { assertContains("Checked exception is invalid", e.getMessage()); } } @Test public void shouldScreamWhenReturnSetForVoid() throws Exception { try { doReturn("foo").when(mock).voidMethod(); fail(); } catch (MockitoException e) { assertContains("Cannot stub a void method with a return value", e.getMessage()); } } @Test public void shouldScreamWhenNotAMockPassed() throws Exception { try { doReturn("foo").when("foo").toString(); fail(); } catch (Exception e) { assertContains("Argument passed to when() is not a mock", e.getMessage()); } } @Test public void shouldScreamWhenNullPassed() throws Exception { try { doReturn("foo").when((Object) null).toString(); fail(); } catch (Exception e) { assertContains("Argument passed to when() is null", e.getMessage()); } } @Test public void shouldAllowChainedStubbing() { doReturn("foo"). doThrow(new RuntimeException()). doReturn("bar") .when(mock).simpleMethod(); assertEquals("foo", mock.simpleMethod()); try { mock.simpleMethod(); fail(); } catch (RuntimeException e) {} assertEquals("bar", mock.simpleMethod()); assertEquals("bar", mock.simpleMethod()); } @Test public void shouldAllowChainedStubbingOnVoidMethods() { doNothing(). doNothing(). doThrow(new RuntimeException()) .when(mock).voidMethod(); mock.voidMethod(); mock.voidMethod(); try { mock.voidMethod(); fail(); } catch (RuntimeException e) {} try { mock.voidMethod(); fail(); } catch (RuntimeException e) {} } @Test public void shouldStubWithGenericAnswer() { doAnswer(new Answer<Object>() { public Object answer(InvocationOnMock invocation) throws Throwable { return "foo"; } }) .when(mock).simpleMethod(); assertEquals("foo", mock.simpleMethod()); } @Test public void shouldNotAllowDoNothingOnNonVoids() { try { doNothing().when(mock).simpleMethod(); fail(); } catch (MockitoException e) { assertContains("Only void methods can doNothing()", e.getMessage()); } } @Test public void shouldStubbingBeTreatedAsInteraction() throws Exception { doReturn("foo").when(mock).simpleMethod(); mock.simpleMethod(); try { verifyNoMoreInteractions(mock); fail(); } catch (NoInteractionsWanted e) {} } @Test public void shouldVerifyStubbedCall() throws Exception { doReturn("foo").when(mock).simpleMethod(); mock.simpleMethod(); mock.simpleMethod(); verify(mock, times(2)).simpleMethod(); verifyNoMoreInteractions(mock); } @Test public void shouldAllowStubbingToString() throws Exception { doReturn("test").when(mock).toString(); assertEquals("test", mock.toString()); } @Test public void shouldDetectInvalidReturnType() throws Exception { try { doReturn("foo").when(mock).booleanObjectReturningMethod(); fail(); } catch (Exception e) { - assertContains("String cannot be returned by booleanObjectReturningMethod" + + assertContains("String cannot be returned by booleanObjectReturningMethod()" + "\n" + - "booleanObjectReturningMethod should return Boolean", + "booleanObjectReturningMethod() should return Boolean", e.getMessage()); } } @Test public void shouldDetectWhenNullAssignedToBoolean() throws Exception { try { doReturn(null).when(mock).intReturningMethod(); fail(); } catch (Exception e) { assertContains("null cannot be returned by intReturningMethod", e.getMessage()); } } @Test public void shouldAllowStubbingWhenTypesMatchSignature() throws Exception { doReturn("foo").when(mock).objectReturningMethodNoArgs(); doReturn("foo").when(mock).simpleMethod(); doReturn(1).when(mock).intReturningMethod(); doReturn(new Integer(2)).when(mock).intReturningMethod(); } } \ No newline at end of file

diff --git a/eol-globi-data-tool/src/test/java/org/eol/globi/export/EOLExporterOccurrencesTest.java b/eol-globi-data-tool/src/test/java/org/eol/globi/export/EOLExporterOccurrencesTest.java index 2c8359d6..759cd980 100644 --- a/eol-globi-data-tool/src/test/java/org/eol/globi/export/EOLExporterOccurrencesTest.java +++ b/eol-globi-data-tool/src/test/java/org/eol/globi/export/EOLExporterOccurrencesTest.java @@ -1,147 +1,147 @@ package org.eol.globi.export; import org.eol.globi.data.GraphDBTestCase; import org.eol.globi.data.LifeStage; import org.eol.globi.data.NodeFactoryException; import org.eol.globi.domain.BodyPart; import org.eol.globi.domain.Location; import org.eol.globi.domain.PhysiologicalState; import org.eol.globi.domain.Specimen; import org.eol.globi.domain.Study; import org.junit.Test; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; import java.io.IOException; import java.io.StringWriter; import java.text.ParseException; import java.text.SimpleDateFormat; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; public class EOLExporterOccurrencesTest extends GraphDBTestCase { @Test public void exportMissingLength() throws IOException, NodeFactoryException, ParseException { createTestData(null); String expected = getExpectedHeader(); expected += getExpectedData(); Study myStudy1 = nodeFactory.findStudy("myStudy"); StringWriter row = new StringWriter(); exportOccurrences().exportStudy(myStudy1, row, true); assertThat(row.getBuffer().toString().trim(), equalTo(expected.trim())); } private String getExpectedData() { - return "\nglobi:3,EOL:327955,,JUVENILE,DIGESTATE,BONE,,,,,,,,,,123.0,345.9,,-60.0,,,,1992-03-30T08:00:00Z,myStudy" + - "\nglobi:6,EOL:328607,,,,,,,,,,,,,,123.0,345.9,,-60.0,,,,1992-03-30T08:00:00Z,myStudy" + - "\nglobi:8,EOL:328607,,,,,,,,,,,,,,123.0,345.9,,-60.0,,,,1992-03-30T08:00:00Z,myStudy"; + return "\nglobi:occur:3,EOL:327955,,JUVENILE,DIGESTATE,BONE,,,,,,,,,,123.0,345.9,,-60.0,,,,1992-03-30T08:00:00Z,myStudy" + + "\nglobi:occur:6,EOL:328607,,,,,,,,,,,,,,123.0,345.9,,-60.0,,,,1992-03-30T08:00:00Z,myStudy" + + "\nglobi:occur:8,EOL:328607,,,,,,,,,,,,,,123.0,345.9,,-60.0,,,,1992-03-30T08:00:00Z,myStudy"; } private String getExpectedHeader() { String header = "\"occurrenceID\",\"taxonID\",\"sex\",\"lifeStage\",\"physiologicalState\",\"bodyPart\",\"reproductiveCondition\",\"behavior\",\"establishmentMeans\",\"occurrenceRemarks\",\"individualCount\",\"preparations\",\"fieldNotes\",\"samplingProtocol\",\"samplingEffort\",\"decimalLatitude\",\"decimalLongitude\",\"depth\",\"altitude\",\"locality\",\"identifiedBy\",\"dateIdentified\",\"eventDate\",\"eventID\"" + "\n\"http://rs.tdwg.org/dwc/terms/occurrenceID\",\"http://rs.tdwg.org/dwc/terms/taxonID\",\"http://rs.tdwg.org/dwc/terms/sex\",\"http://rs.tdwg.org/dwc/terms/lifeStage\",\"http:/eol.org/globi/terms/physiologicalState\",\"http:/eol.org/globi/terms/bodyPart\",\"http://rs.tdwg.org/dwc/terms/reproductiveCondition\",\"http://rs.tdwg.org/dwc/terms/behavior\",\"http://rs.tdwg.org/dwc/terms/establishmentMeans\",\"http://rs.tdwg.org/dwc/terms/occurrenceRemarks\",\"http://rs.tdwg.org/dwc/terms/individualCount\",\"http://rs.tdwg.org/dwc/terms/preparations\",\"http://rs.tdwg.org/dwc/terms/fieldNotes\",\"http://rs.tdwg.org/dwc/terms/samplingProtocol\",\"http://rs.tdwg.org/dwc/terms/samplingEffort\",\"http://rs.tdwg.org/dwc/terms/decimalLatitude\",\"http://rs.tdwg.org/dwc/terms/decimalLongitude\",\"http://eol.org/globi/depth\",\"http://eol.org/globi/altitude\",\"http://rs.tdwg.org/dwc/terms/locality\",\"http://rs.tdwg.org/dwc/terms/identifiedBy\",\"http://rs.tdwg.org/dwc/terms/dateIdentified\",\"http://rs.tdwg.org/dwc/terms/eventDate\",\"http://rs.tdwg.org/dwc/terms/eventID\""; return header; } @Test public void exportNoHeader() throws IOException, NodeFactoryException, ParseException { createTestData(null); String expected = getExpectedData(); Study myStudy1 = nodeFactory.findStudy("myStudy"); StringWriter row = new StringWriter(); exportOccurrences().exportStudy(myStudy1, row, false); assertThat(row.getBuffer().toString(), equalTo(expected)); } private EOLExporterOccurrences exportOccurrences() { return new EOLExporterOccurrences(); } @Test public void exportToCSV() throws NodeFactoryException, IOException, ParseException { createTestData(123.0); String expected = ""; expected += getExpectedHeader(); expected += getExpectedData(); Study myStudy1 = nodeFactory.findStudy("myStudy"); StringWriter row = new StringWriter(); exportOccurrences().exportStudy(myStudy1, row, true); assertThat(row.getBuffer().toString(), equalTo(expected)); } @Test public void dontExportToCSVSpecimenEmptyStomach() throws NodeFactoryException, IOException { Study myStudy = nodeFactory.createStudy("myStudy"); Specimen specimen = nodeFactory.createSpecimen("Homo sapiens"); myStudy.collected(specimen); StringWriter row = new StringWriter(); exportOccurrences().exportStudy(myStudy, row, true); String expected = ""; expected += getExpectedHeader(); - expected += "\nglobi:3,,,,,,,,,,,,,,,,,,,,,,,myStudy"; + expected += "\nglobi:occur:3,,,,,,,,,,,,,,,,,,,,,,,myStudy"; assertThat(row.getBuffer().toString(), equalTo(expected)); } private void createTestData(Double length) throws NodeFactoryException, ParseException { Study myStudy = nodeFactory.createStudy("myStudy"); Specimen specimen = nodeFactory.createSpecimen("Homo sapiens", "EOL:327955"); specimen.setStomachVolumeInMilliLiter(666.0); specimen.setLifeStage(LifeStage.JUVENILE); specimen.setPhysiologicalState(PhysiologicalState.DIGESTATE); specimen.setBodyPart(BodyPart.BONE); Relationship collected = myStudy.collected(specimen); Transaction transaction = myStudy.getUnderlyingNode().getGraphDatabase().beginTx(); try { collected.setProperty(Specimen.DATE_IN_UNIX_EPOCH, new SimpleDateFormat("yyyy.MM.dd").parse("1992.03.30").getTime()); transaction.success(); } finally { transaction.finish(); } eatWolf(specimen); eatWolf(specimen); if (null != length) { specimen.setLengthInMm(length); } Location location = nodeFactory.getOrCreateLocation(123.0, 345.9, -60.0); specimen.caughtIn(location); } private Specimen eatWolf(Specimen specimen) throws NodeFactoryException { Specimen otherSpecimen = nodeFactory.createSpecimen("Canis lupus", "EOL:328607"); otherSpecimen.setVolumeInMilliLiter(124.0); specimen.ate(otherSpecimen); return otherSpecimen; } @Test public void darwinCoreMetaTable() throws IOException { EOLExporterOccurrences exporter = exportOccurrences(); StringWriter writer = new StringWriter(); exporter.exportDarwinCoreMetaTable(writer, "testtest.csv"); assertThat(writer.toString(), is(exporter.getMetaTablePrefix() + "testtest.csv" + exporter.getMetaTableSuffix())); } }

diff --git a/src/minecraft/org/getspout/spout/gui/GenericLabel.java b/src/minecraft/org/getspout/spout/gui/GenericLabel.java index 6b664979..da8404fa 100644 --- a/src/minecraft/org/getspout/spout/gui/GenericLabel.java +++ b/src/minecraft/org/getspout/spout/gui/GenericLabel.java @@ -1,158 +1,158 @@ package org.getspout.spout.gui; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.lwjgl.opengl.GL11; import org.getspout.spout.client.SpoutClient; import org.getspout.spout.packet.PacketUtil; import net.minecraft.src.FontRenderer; public class GenericLabel extends GenericWidget implements Label{ protected String text = ""; protected Align vAlign = Align.FIRST; protected Align hAlign = Align.FIRST; protected int hexColor = 0xFFFFFF; protected boolean auto = true; public GenericLabel(){ } public int getVersion() { return 2; } public GenericLabel(String text) { this.text = text; } @Override public WidgetType getType() { return WidgetType.Label; } @Override public int getNumBytes() { return super.getNumBytes() + PacketUtil.getNumBytes(getText()) + 7; } @Override public void readData(DataInputStream input) throws IOException { super.readData(input); this.setText(PacketUtil.readString(input)); this.setAlignX(Align.getAlign(input.readByte())); this.setAlignY(Align.getAlign(input.readByte())); this.setAuto(input.readBoolean()); this.setHexColor(input.readInt()); } @Override public void writeData(DataOutputStream output) throws IOException { super.writeData(output); PacketUtil.writeString(output, getText()); output.writeByte(hAlign.getId()); output.writeByte(vAlign.getId()); output.writeBoolean(getAuto()); output.writeInt(getHexColor()); } @Override public String getText() { return text; } @Override public Label setText(String text) { this.text = text; return this; } @Override public boolean getAuto() { return auto; } @Override public Label setAuto(boolean auto) { this.auto = auto; return this; } @Override public Align getAlignX() { return hAlign; } @Override public Align getAlignY() { return vAlign; } @Override public Label setAlignX(Align pos) { this.hAlign = pos; return this; } @Override public Label setAlignY(Align pos) { this.vAlign = pos; return this; } @Override public int getHexColor() { return hexColor; } @Override public Label setHexColor(int hex) { hexColor = hex; return this; } public void render() { FontRenderer font = SpoutClient.getHandle().fontRenderer; String lines[] = getText().split("\\n"); double swidth = 0; for (int i = 0; i < lines.length; i++) { swidth = font.getStringWidth(lines[i]) > swidth ? font.getStringWidth(lines[i]) : swidth; } double sheight = lines.length * 10; double height = getHeight(); double width = getWidth(); double top = getScreenY(); switch (vAlign) { case SECOND: top += (int) ((auto ? screen.getHeight() : height) / 2 - (auto ? (sheight * (screen.getHeight() / 240f)) : height) / 2); break; case THIRD: top += (int) ((auto ? screen.getHeight() : height) - (auto ? (sheight * (screen.getHeight() / 240f)) : height)); break; } double aleft = getScreenX(); switch (hAlign) { - case SECOND: aleft = ((auto ? screen.getWidth() : width) / 2) - ((auto ? (swidth * (screen.getWidth() / 427f)) : width) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; - case THIRD: aleft = (auto ? screen.getWidth() : width) - (auto ? (swidth * (screen.getWidth() / 427f)) : width); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; + case SECOND: aleft += ((width) / 2) - ((auto ? (swidth * (screen.getWidth() / 427f)) : width) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; + case THIRD: aleft += (width) - (auto ? (swidth * (screen.getWidth() / 427f)) : width); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; } GL11.glPushMatrix(); GL11.glTranslatef((float) aleft, (float) top, 0); if (auto) { GL11.glScalef((float) (screen.getWidth() / 427f), (float) (screen.getHeight() / 240f), 1); } else { GL11.glScalef((float) (getWidth() / swidth), (float) (getHeight() / sheight), 1); } for (int i = 0; i < lines.length; i++) { double left = 0; switch (hAlign) { case SECOND: left = (swidth / 2) - (font.getStringWidth(lines[i]) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; case THIRD: left = swidth - font.getStringWidth(lines[i]); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; } font.drawStringWithShadow(lines[i], (int) left, i * 10, getHexColor()); } GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } }

public void render() { FontRenderer font = SpoutClient.getHandle().fontRenderer; String lines[] = getText().split("\\n"); double swidth = 0; for (int i = 0; i < lines.length; i++) { swidth = font.getStringWidth(lines[i]) > swidth ? font.getStringWidth(lines[i]) : swidth; } double sheight = lines.length * 10; double height = getHeight(); double width = getWidth(); double top = getScreenY(); switch (vAlign) { case SECOND: top += (int) ((auto ? screen.getHeight() : height) / 2 - (auto ? (sheight * (screen.getHeight() / 240f)) : height) / 2); break; case THIRD: top += (int) ((auto ? screen.getHeight() : height) - (auto ? (sheight * (screen.getHeight() / 240f)) : height)); break; } double aleft = getScreenX(); switch (hAlign) { case SECOND: aleft = ((auto ? screen.getWidth() : width) / 2) - ((auto ? (swidth * (screen.getWidth() / 427f)) : width) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; case THIRD: aleft = (auto ? screen.getWidth() : width) - (auto ? (swidth * (screen.getWidth() / 427f)) : width); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; } GL11.glPushMatrix(); GL11.glTranslatef((float) aleft, (float) top, 0); if (auto) { GL11.glScalef((float) (screen.getWidth() / 427f), (float) (screen.getHeight() / 240f), 1); } else { GL11.glScalef((float) (getWidth() / swidth), (float) (getHeight() / sheight), 1); } for (int i = 0; i < lines.length; i++) { double left = 0; switch (hAlign) { case SECOND: left = (swidth / 2) - (font.getStringWidth(lines[i]) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; case THIRD: left = swidth - font.getStringWidth(lines[i]); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; } font.drawStringWithShadow(lines[i], (int) left, i * 10, getHexColor()); } GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); }

public void render() { FontRenderer font = SpoutClient.getHandle().fontRenderer; String lines[] = getText().split("\\n"); double swidth = 0; for (int i = 0; i < lines.length; i++) { swidth = font.getStringWidth(lines[i]) > swidth ? font.getStringWidth(lines[i]) : swidth; } double sheight = lines.length * 10; double height = getHeight(); double width = getWidth(); double top = getScreenY(); switch (vAlign) { case SECOND: top += (int) ((auto ? screen.getHeight() : height) / 2 - (auto ? (sheight * (screen.getHeight() / 240f)) : height) / 2); break; case THIRD: top += (int) ((auto ? screen.getHeight() : height) - (auto ? (sheight * (screen.getHeight() / 240f)) : height)); break; } double aleft = getScreenX(); switch (hAlign) { case SECOND: aleft += ((width) / 2) - ((auto ? (swidth * (screen.getWidth() / 427f)) : width) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; case THIRD: aleft += (width) - (auto ? (swidth * (screen.getWidth() / 427f)) : width); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; } GL11.glPushMatrix(); GL11.glTranslatef((float) aleft, (float) top, 0); if (auto) { GL11.glScalef((float) (screen.getWidth() / 427f), (float) (screen.getHeight() / 240f), 1); } else { GL11.glScalef((float) (getWidth() / swidth), (float) (getHeight() / sheight), 1); } for (int i = 0; i < lines.length; i++) { double left = 0; switch (hAlign) { case SECOND: left = (swidth / 2) - (font.getStringWidth(lines[i]) / 2); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 854f; break; case THIRD: left = swidth - font.getStringWidth(lines[i]); break;// - (font.getStringWidth(lines[i]) * getScreen().getWidth()) / 427f; break; } font.drawStringWithShadow(lines[i], (int) left, i * 10, getHexColor()); } GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); }

diff --git a/app/controllers/Sessions.java b/app/controllers/Sessions.java index 59abdca..4ac9eb6 100644 --- a/app/controllers/Sessions.java +++ b/app/controllers/Sessions.java @@ -1,93 +1,97 @@ package controllers; import play.*; import play.mvc.*; import java.util.*; import models.Comment; import models.Member; import models.Session; import models.Speaker; import models.activity.Activity; import org.apache.commons.lang.StringUtils; import play.cache.Cache; import play.data.validation.Required; import play.data.validation.Valid; import play.data.validation.Validation; import play.libs.Images; public class Sessions extends Controller { public static void index() { List<Session> sessions = Session.findAll(); Logger.info(sessions.size() + " sessions"); render("Sessions/list.html", sessions); } public static void create(final String speakerLogin) { Speaker speaker = Speaker.findByLogin(speakerLogin); Session talk = new Session(); talk.addSpeaker(speaker); render("Sessions/edit.html", talk); } public static void edit(final Long sessionId) { Session talk = Session.findById(sessionId); render("Sessions/edit.html", talk); } public static void show(final Long sessionId) { - show(sessionId, true); + internalShow(sessionId, true); } - private static void show(final Long sessionId, boolean countLook) { + public static void show(final Long sessionId, boolean count) { + internalShow(sessionId, count); + } + + private static void internalShow(final Long sessionId, boolean count) { Session talk = Session.findById(sessionId); // Don't count look when coming from internal redirect - if (countLook) { + if (count) { talk.lookedBy(Member.findByLogin(Security.connected())); } List<Activity> activities = Activity.recentsBySession(talk, 1, 10); render(talk, activities); } - + public static void postComment( Long talkId, @Required String login, @Required String content) { Session talk = Session.findById(talkId); if (Validation.hasErrors()) { render("Sessions/show.html", talk); } Member author = Member.findByLogin(login); talk.addComment(new Comment(author, talk, content)); talk.save(); flash.success("Merci pour votre commentaire %s", author); show(talkId, false); } public static void captcha(String id) { Images.Captcha captcha = Images.captcha(); String code = captcha.getText(); Cache.set(id, code, "10mn"); renderBinary(captcha); } public static void save(@Valid Session talk,String[] interests, String newInterests) { Logger.info("Tentative d'enregistrement de la session " + talk); if (interests != null) { talk.updateInterests(interests); } if (Validation.hasErrors()) { Logger.error(Validation.errors().toString()); render("Sessions/edit.html", talk); } if (newInterests != null) { talk.addInterests(StringUtils.splitByWholeSeparator(newInterests, ",")); } talk.update(); flash.success("Session " + talk + " enregistrée"); Logger.info("Session " + talk + " enregistrée"); show(talk.id, false); } } \ No newline at end of file

diff --git a/src/org/mozilla/javascript/ScriptOrFnNode.java b/src/org/mozilla/javascript/ScriptOrFnNode.java index 95a0a28f..d83f1797 100644 --- a/src/org/mozilla/javascript/ScriptOrFnNode.java +++ b/src/org/mozilla/javascript/ScriptOrFnNode.java @@ -1,209 +1,209 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Netscape Public * License Version 1.1 (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.mozilla.org/NPL/ * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. * * The Original Code is Rhino code, released * May 6, 1999. * * The Initial Developer of the Original Code is Netscape * Communications Corporation. Portions created by Netscape are * Copyright (C) 1997-1999 Netscape Communications Corporation. All * Rights Reserved. * * Contributor(s): * Igor Bukanov * * Alternatively, the contents of this file may be used under the * terms of the GNU Public License (the "GPL"), in which case the * provisions of the GPL are applicable instead of those above. * If you wish to allow use of your version of this file only * under the terms of the GPL and not to allow others to use your * version of this file under the NPL, indicate your decision by * deleting the provisions above and replace them with the notice * and other provisions required by the GPL. If you do not delete * the provisions above, a recipient may use your version of this * file under either the NPL or the GPL. */ package org.mozilla.javascript; public class ScriptOrFnNode extends Node { public ScriptOrFnNode(int nodeType) { super(nodeType); } public final String getSourceName() { return sourceName; } public final void setSourceName(String sourceName) { this.sourceName = sourceName; } public final int getEncodedSourceStart() { return encodedSourceStart; } public final int getEncodedSourceEnd() { return encodedSourceEnd; } public final void setEncodedSourceBounds(int start, int end) { this.encodedSourceStart = start; this.encodedSourceEnd = end; } public final int getBaseLineno() { return baseLineno; } public final void setBaseLineno(int lineno) { // One time action if (lineno < 0 || baseLineno >= 0) Kit.codeBug(); baseLineno = lineno; } - public final int getEndLineno() { return baseLineno; } + public final int getEndLineno() { return endLineno; } public final void setEndLineno(int lineno) { // One time action if (lineno < 0 || endLineno >= 0) Kit.codeBug(); endLineno = lineno; } public final int getFunctionCount() { if (functions == null) { return 0; } return functions.size(); } public final FunctionNode getFunctionNode(int i) { return (FunctionNode)functions.get(i); } public final int addFunction(FunctionNode fnNode) { if (fnNode == null) Kit.codeBug(); if (functions == null) { functions = new ObjArray(); } functions.add(fnNode); return functions.size() - 1; } public final int getRegexpCount() { if (regexps == null) { return 0; } return regexps.size() / 2; } public final String getRegexpString(int index) { return (String)regexps.get(index * 2); } public final String getRegexpFlags(int index) { return (String)regexps.get(index * 2 + 1); } public final int addRegexp(String string, String flags) { if (string == null) Kit.codeBug(); if (regexps == null) { regexps = new ObjArray(); } regexps.add(string); regexps.add(flags); return regexps.size() / 2 - 1; } public final boolean hasParamOrVar(String name) { return itsVariableNames.has(name); } public final int getParamOrVarIndex(String name) { return itsVariableNames.get(name, -1); } public final String getParamOrVarName(int index) { return (String)itsVariables.get(index); } public final int getParamCount() { return varStart; } public final int getParamAndVarCount() { return itsVariables.size(); } public final String[] getParamAndVarNames() { int N = itsVariables.size(); if (N == 0) { return ScriptRuntime.emptyStrings; } String[] array = new String[N]; itsVariables.toArray(array); return array; } public final void addParam(String name) { // Check addparam is not called after addLocal if (varStart != itsVariables.size()) Kit.codeBug(); // Allow non-unique parameter names: use the last occurrence int index = varStart++; itsVariables.add(name); itsVariableNames.put(name, index); } public final void addVar(String name) { int vIndex = itsVariableNames.get(name, -1); if (vIndex != -1) { // There's already a variable or parameter with this name. return; } int index = itsVariables.size(); itsVariables.add(name); itsVariableNames.put(name, index); } public final void removeParamOrVar(String name) { int i = itsVariableNames.get(name, -1); if (i != -1) { itsVariables.remove(i); itsVariableNames.remove(name); ObjToIntMap.Iterator iter = itsVariableNames.newIterator(); for (iter.start(); !iter.done(); iter.next()) { int v = iter.getValue(); if (v > i) { iter.setValue(v - 1); } } } } public final Object getCompilerData() { return compilerData; } public final void setCompilerData(Object data) { if (data == null) throw new IllegalArgumentException(); // Can only call once if (compilerData != null) throw new IllegalStateException(); compilerData = data; } private int encodedSourceStart; private int encodedSourceEnd; private String sourceName; private int baseLineno = -1; private int endLineno = -1; private ObjArray functions; private ObjArray regexps; // a list of the formal parameters and local variables private ObjArray itsVariables = new ObjArray(); // mapping from name to index in list private ObjToIntMap itsVariableNames = new ObjToIntMap(11); private int varStart; // index in list of first variable private Object compilerData; }

diff --git a/src/org/nationsatwar/kitty/Commands/SummonCommand.java b/src/org/nationsatwar/kitty/Commands/SummonCommand.java index da6e793..91130ba 100644 --- a/src/org/nationsatwar/kitty/Commands/SummonCommand.java +++ b/src/org/nationsatwar/kitty/Commands/SummonCommand.java @@ -1,66 +1,68 @@ package org.nationsatwar.kitty.Commands; import java.io.File; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.nationsatwar.kitty.Kitty; import org.nationsatwar.kitty.Sumo.SumoObject; import org.nationsatwar.kitty.Utility.AIUtility; import org.nationsatwar.kitty.Utility.ConfigHandler; public final class SummonCommand { protected final Kitty plugin; public SummonCommand(Kitty plugin) { this.plugin = plugin; } /** * Handles the 'Summon' command. * <p> * Creates a new Sumo as specified from the (sumoName).yml FileConfiguration * * @param player Person sending the command * @param sumoName The name of the Sumo to spawn */ public final void execute(Player player, String sumoName) { sumoName = sumoName.toLowerCase(); + Kitty.log("Debug: " + ConfigHandler.getFullSumoPath(sumoName)); + File sumoFile = new File(ConfigHandler.getFullSumoPath(sumoName)); // Returns if the sumoFile does not exist if (!sumoFile.exists()) { player.sendMessage(ChatColor.YELLOW + "Sumo: " + sumoName + " does not exist. Please try again."); return; } FileConfiguration sumoConfig = YamlConfiguration.loadConfiguration(sumoFile); EntityType entityType = EntityType.fromName(sumoConfig.getString(ConfigHandler.sumoEntityType)); // Returns if the Entity Type as specified in the config file is invalid if (entityType == null) { player.sendMessage(ChatColor.YELLOW + "Entity Type for: " + sumoName + " does not exist."); return; } Location spawnLocation = AIUtility.randomizeLocation(player.getLocation(), 5); Entity entity = player.getWorld().spawnEntity(spawnLocation, entityType); SumoObject sumo = new SumoObject(plugin, entity, player, sumoName); plugin.sumoManager.addSumo(player.getName(), sumo); } } \ No newline at end of file diff --git a/src/org/nationsatwar/kitty/Kitty.java b/src/org/nationsatwar/kitty/Kitty.java index e095e64..9f53cf2 100644 --- a/src/org/nationsatwar/kitty/Kitty.java +++ b/src/org/nationsatwar/kitty/Kitty.java @@ -1,60 +1,60 @@ package org.nationsatwar.kitty; import java.util.logging.Logger; import org.bukkit.plugin.java.JavaPlugin; import org.nationsatwar.kitty.Events.DamageEvents; import org.nationsatwar.kitty.Events.TargetEvents; import org.nationsatwar.kitty.Utility.CommandParser; import org.nationsatwar.kitty.Utility.ConfigHandler; /** * The iSpy parent class. * <p> * Custom scripting plugin for Minecraft * * @author Aculem */ public final class Kitty extends JavaPlugin { - public final CommandParser commandParser = new CommandParser(this);; + public final CommandParser commandParser = new CommandParser(this); public final SumoManager sumoManager = new SumoManager(this); private static final Logger log = Logger.getLogger("Minecraft"); /** * Initializes the plugin on server startup. */ public void onEnable() { // Creates all the default Sumos packaged with the plugin ConfigHandler.createDefaultSumoFiles(); // Register Events getServer().getPluginManager().registerEvents(new DamageEvents(this), this); getServer().getPluginManager().registerEvents(new TargetEvents(this), this); // Set Command Executor getCommand("kitty").setExecutor(commandParser); log("Kitty has been enabled."); } /** * Handles the plugin on server stop. */ public void onDisable() { log("Kitty has been disabled."); } /** * Plugin logger handler. Useful for debugging. * * @param logMessage Message to send to the console. */ public static void log(String logMessage) { log.info("Kitty: " + logMessage); } } \ No newline at end of file

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java index ff5d2e26..29799cbd 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java @@ -1,1768 +1,1767 @@ /* 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 org.activiti.engine.impl.bpmn.parser; import java.io.InputStream; import java.lang.reflect.Field; import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.JavaDelegation; import org.activiti.engine.impl.bpmn.Assignment; import org.activiti.engine.impl.bpmn.BoundaryTimerEventActivity; import org.activiti.engine.impl.bpmn.BpmnInterface; import org.activiti.engine.impl.bpmn.BpmnInterfaceImplementation; import org.activiti.engine.impl.bpmn.CallActivityBehaviour; import org.activiti.engine.impl.bpmn.ClassStructureDefinition; import org.activiti.engine.impl.bpmn.Condition; import org.activiti.engine.impl.bpmn.Data; import org.activiti.engine.impl.bpmn.DataInputAssociation; import org.activiti.engine.impl.bpmn.DataOutputAssociation; import org.activiti.engine.impl.bpmn.DataRef; import org.activiti.engine.impl.bpmn.ExclusiveGatewayActivity; import org.activiti.engine.impl.bpmn.ExpressionExecutionListener; import org.activiti.engine.impl.bpmn.ExpressionTaskListener; import org.activiti.engine.impl.bpmn.IOSpecification; import org.activiti.engine.impl.bpmn.ItemDefinition; import org.activiti.engine.impl.bpmn.ItemKind; import org.activiti.engine.impl.bpmn.JavaDelegationDelegate; import org.activiti.engine.impl.bpmn.MailActivityBehavior; import org.activiti.engine.impl.bpmn.ManualTaskActivity; import org.activiti.engine.impl.bpmn.MessageDefinition; import org.activiti.engine.impl.bpmn.NoneEndEventActivity; import org.activiti.engine.impl.bpmn.NoneStartEventActivity; import org.activiti.engine.impl.bpmn.Operation; import org.activiti.engine.impl.bpmn.OperationImplementation; import org.activiti.engine.impl.bpmn.ParallelGatewayActivity; import org.activiti.engine.impl.bpmn.ReceiveTaskActivity; import org.activiti.engine.impl.bpmn.ScriptTaskActivity; import org.activiti.engine.impl.bpmn.ServiceTaskExpressionActivityBehavior; import org.activiti.engine.impl.bpmn.StructureDefinition; import org.activiti.engine.impl.bpmn.SubProcessActivity; import org.activiti.engine.impl.bpmn.TaskActivity; import org.activiti.engine.impl.bpmn.UserTaskActivity; import org.activiti.engine.impl.bpmn.WebServiceActivityBehavior; import org.activiti.engine.impl.cfg.ProcessEngineConfiguration; import org.activiti.engine.impl.el.Expression; import org.activiti.engine.impl.el.ExpressionManager; import org.activiti.engine.impl.el.FixedValue; import org.activiti.engine.impl.el.UelExpressionCondition; import org.activiti.engine.impl.form.DefaultStartFormHandler; import org.activiti.engine.impl.form.DefaultTaskFormHandler; import org.activiti.engine.impl.form.StartFormHandler; import org.activiti.engine.impl.form.TaskFormHandler; import org.activiti.engine.impl.jobexecutor.TimerDeclarationImpl; import org.activiti.engine.impl.jobexecutor.TimerExecuteNestedActivityJobHandler; import org.activiti.engine.impl.pvm.delegate.ActivityBehavior; import org.activiti.engine.impl.pvm.delegate.ExecutionListener; import org.activiti.engine.impl.pvm.delegate.TaskListener; import org.activiti.engine.impl.pvm.process.ActivityImpl; import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl; import org.activiti.engine.impl.pvm.process.ScopeImpl; import org.activiti.engine.impl.pvm.process.TransitionImpl; import org.activiti.engine.impl.repository.DeploymentEntity; import org.activiti.engine.impl.repository.ProcessDefinitionEntity; import org.activiti.engine.impl.scripting.ScriptingEngines; import org.activiti.engine.impl.task.TaskDefinition; import org.activiti.engine.impl.util.ReflectUtil; import org.activiti.engine.impl.util.xml.Element; import org.activiti.engine.impl.util.xml.Parse; import org.activiti.engine.impl.variable.VariableDeclaration; /** * Specific parsing of one BPMN 2.0 XML file, created by the {@link BpmnParser}. * * @author Tom Baeyens * @author Joram Barrez * @author Christian Stettler * @author Frederik Heremans */ public class BpmnParse extends Parse { public static final String PROPERTYNAME_CONDITION = "condition"; public static final String PROPERTYNAME_VARIABLE_DECLARATIONS = "variableDeclarations"; public static final String PROPERTYNAME_TIMER_DECLARATION = "timerDeclarations"; public static final String PROPERTYNAME_INITIAL = "initial"; public static final String PROPERTYNAME_INITIATOR_VARIABLE_NAME = "initiatorVariableName"; private static final Logger LOG = Logger.getLogger(BpmnParse.class.getName()); protected DeploymentEntity deployment; /** * The end result of the parsing: a list of process definition. */ protected List<ProcessDefinitionEntity> processDefinitions = new ArrayList<ProcessDefinitionEntity>(); /** * Map containing the BPMN 2.0 messages, stored during the first phase * of parsing since other elements can reference these messages. * * Messages are defined outside the process definition(s), which means * that this map doesn't need to be re-initialized for each new process * definition. */ protected Map<String, MessageDefinition> messages = new HashMap<String, MessageDefinition>(); /** * Map that contains the {@link StructureDefinition} */ protected Map<String, StructureDefinition> structures = new HashMap<String, StructureDefinition>(); /** * Map that contains the {@link BpmnInterfaceImplementation} */ protected Map<String, BpmnInterfaceImplementation> interfaceImplementations = new HashMap<String, BpmnInterfaceImplementation>(); /** * Map that contains the {@link OperationImplementation} */ protected Map<String, OperationImplementation> operationImplementations = new HashMap<String, OperationImplementation>(); /** * Map containing the BPMN 2.0 item definitions, stored during the first phase * of parsing since other elements can reference these item definitions. * * Item definitions are defined outside the process definition(s), which means * that this map doesn't need to be re-initialized for each new process * definition. */ protected Map<String, ItemDefinition> itemDefinitions = new HashMap<String, ItemDefinition>(); /** * Map containing the the {@link BpmnInterface}s defined in the XML file. The * key is the id of the interface. * * Interfaces are defined outside the process definition(s), which means that * this map doesn't need to be re-initialized for each new process definition. */ protected Map<String, BpmnInterface> bpmnInterfaces = new HashMap<String, BpmnInterface>(); /** * Map containing the {@link Operation}s defined in the XML file. The key is * the id of the operations. * * Operations are defined outside the process definition(s), which means that * this map doesn't need to be re-initialized for each new process definition. */ protected Map<String, Operation> operations = new HashMap<String, Operation>(); protected ExpressionManager expressionManager; protected List<BpmnParseListener> parseListeners; protected Map<String, XMLImporter> importers = new HashMap<String, XMLImporter>(); protected Map<String, String> prefixs = new HashMap<String, String>(); protected String targetNamespace; /** * Constructor to be called by the {@link BpmnParser}. * * Note the package modifier here: only the {@link BpmnParser} is allowed to * create instances. */ BpmnParse(BpmnParser parser) { super(parser); this.expressionManager = parser.getExpressionManager(); this.parseListeners = parser.getParseListeners(); setSchemaResource(ReflectUtil.getResource(BpmnParser.SCHEMA_RESOURCE).toString()); this.initializeXSDItemDefinitions(); } private void initializeXSDItemDefinitions() { this.itemDefinitions.put("http://www.w3.org/2001/XMLSchema:string", new ItemDefinition("http://www.w3.org/2001/XMLSchema:string", new ClassStructureDefinition(String.class))); } public BpmnParse deployment(DeploymentEntity deployment) { this.deployment = deployment; return this; } @Override public BpmnParse execute() { super.execute(); // schema validation parseDefinitionsAttributes(); parseImports(); parseItemDefinitions(); parseMessages(); parseInterfaces(); parseProcessDefinitions(); if (hasWarnings()) { logWarnings(); } if (hasErrors()) { throwActivitiExceptionForErrors(); } return this; } private void parseDefinitionsAttributes() { String typeLanguage = rootElement.attribute("typeLanguage"); String expressionLanguage = rootElement.attribute("expressionLanguage"); this.targetNamespace = rootElement.attribute("targetNamespace"); if (typeLanguage != null) { if (typeLanguage.contains("XMLSchema")) { LOG.info("XMLSchema currently not supported as typeLanguage"); } } - if (expressionLanguage != null) { if(expressionLanguage.contains("XPath")) { - LOG.info("XPath currently not supported as typeLanguage"); + LOG.info("XPath currently not supported as expressionLanguage"); } } for (String attribute : rootElement.attributes()) { if (attribute.startsWith("xmlns:")) { String prefixValue = rootElement.attribute(attribute); String prefixName = attribute.substring(6); this.prefixs.put(prefixName, prefixValue); } } } protected String resolveName(String name) { if (name == null) { return null; } int indexOfP = name.indexOf(':'); if (indexOfP != -1) { String prefix = name.substring(0, indexOfP); String resolvedPrefix = this.prefixs.get(prefix); return resolvedPrefix + ":" + name.substring(indexOfP + 1); } else { return name; } } /** * Parses the rootElement importing structures * * @param rootElement * The root element of the XML file. */ private void parseImports() { List<Element> imports = rootElement.elements("import"); for (Element theImport : imports) { String importType = theImport.attribute("importType"); XMLImporter importer = this.getImporter(importType, theImport); if (importer == null) { addError("Could not import item of type " + importType, theImport); } else { importer.importFrom(theImport, this); } } } private XMLImporter getImporter(String importType, Element theImport) { if (this.importers.containsKey(importType)) { return this.importers.get(importType); } else { if (importType.equals("http://schemas.xmlsoap.org/wsdl/")) { Class< ? > wsdlImporterClass; try { wsdlImporterClass = Class.forName("org.activiti.engine.impl.webservice.WSDLImporter", true, Thread.currentThread().getContextClassLoader()); XMLImporter newInstance = (XMLImporter) wsdlImporterClass.newInstance(); this.importers.put(importType, newInstance); return newInstance; } catch (Exception e) { addError("Could not find importer for type " + importType, theImport); } } return null; } } /** * Parses the itemDefinitions of the given definitions file. Item definitions * are not contained within a process element, but they can be referenced from * inner process elements. * * @param definitionsElement * The root element of the XML file. */ public void parseItemDefinitions() { for (Element itemDefinitionElement : rootElement.elements("itemDefinition")) { String id = itemDefinitionElement.attribute("id"); String structureRef = this.resolveName(itemDefinitionElement.attribute("structureRef")); String itemKind = itemDefinitionElement.attribute("itemKind"); StructureDefinition structure = null; try { //it is a class Class<?> classStructure = ReflectUtil.loadClass(structureRef); structure = new ClassStructureDefinition(classStructure); } catch (ActivitiException e) { //it is a reference to a different structure structure = this.structures.get(structureRef); } ItemDefinition itemDefinition = new ItemDefinition(this.targetNamespace + ":" + id, structure); if (itemKind != null) { itemDefinition.setItemKind(ItemKind.valueOf(itemKind)); } itemDefinitions.put(itemDefinition.getId(), itemDefinition); } } /** * Parses the messages of the given definitions file. Messages * are not contained within a process element, but they can be referenced from * inner process elements. * * @param definitionsElement * The root element of the XML file/ */ public void parseMessages() { for (Element messageElement : rootElement.elements("message")) { String id = messageElement.attribute("id"); String itemRef = this.resolveName(messageElement.attribute("itemRef")); if (!this.itemDefinitions.containsKey(itemRef)) { addError(itemRef + " does not exist", messageElement); } else { ItemDefinition itemDefinition = this.itemDefinitions.get(itemRef); MessageDefinition message = new MessageDefinition(this.targetNamespace + ":" + id, itemDefinition); this.messages.put(message.getId(), message); } } } /** * Parses the interfaces and operations defined withing the root element. * * @param definitionsElement * The root element of the XML file/ */ public void parseInterfaces() { for (Element interfaceElement : rootElement.elements("interface")) { // Create the interface String id = interfaceElement.attribute("id"); String name = interfaceElement.attribute("name"); String implementationRef = this.resolveName(interfaceElement.attribute("implementationRef")); BpmnInterface bpmnInterface = new BpmnInterface(this.targetNamespace + ":" + id, name); bpmnInterface.setImplementation(this.interfaceImplementations.get(implementationRef)); // Handle all its operations for (Element operationElement : interfaceElement.elements("operation")) { Operation operation = parseOperation(operationElement, bpmnInterface); bpmnInterface.addOperation(operation); } bpmnInterfaces.put(bpmnInterface.getId(), bpmnInterface); } } public Operation parseOperation(Element operationElement, BpmnInterface bpmnInterface) { Element inMessageRefElement = operationElement.element("inMessageRef"); String inMessageRef = this.resolveName(inMessageRefElement.getText()); if (!this.messages.containsKey(inMessageRef)) { addError(inMessageRef + " does not exist", inMessageRefElement); return null; } else { MessageDefinition inMessage = this.messages.get(inMessageRef); String id = operationElement.attribute("id"); String name = operationElement.attribute("name"); String implementationRef = this.resolveName(operationElement.attribute("implementationRef")); Operation operation = new Operation(this.targetNamespace + ":" + id, name, bpmnInterface, inMessage); operation.setImplementation(this.operationImplementations.get(implementationRef)); Element outMessageRefElement = operationElement.element("outMessageRef"); String outMessageRef = this.resolveName(outMessageRefElement.getText()); if (this.messages.containsKey(outMessageRef)) { MessageDefinition outMessage = this.messages.get(outMessageRef); operation.setOutMessage(outMessage); } operations.put(operation.getId(), operation); return operation; } } /** * Parses all the process definitions defined within the 'definitions' root * element. * * @param definitionsElement * The root element of the XML file. */ public void parseProcessDefinitions() { // TODO: parse specific definitions signalData (id, imports, etc) for (Element processElement : rootElement.elements("process")) { processDefinitions.add(parseProcess(processElement)); } } /** * Parses one process (ie anything inside a &lt;process&gt; element). * * @param processElement * The 'process' element. * @return The parsed version of the XML: a {@link ProcessDefinitionImpl} * object. */ public ProcessDefinitionEntity parseProcess(Element processElement) { ProcessDefinitionEntity processDefinition = new ProcessDefinitionEntity(); /* * Mapping object model - bpmn xml: processDefinition.id -> generated by * activiti engine processDefinition.key -> bpmn id (required) * processDefinition.name -> bpmn name (optional) */ processDefinition.setKey(processElement.attribute("id")); processDefinition.setName(processElement.attribute("name")); processDefinition.setCategory(rootElement.attribute("targetNamespace")); processDefinition.setProperty("documentation", parseDocumentation(processElement)); processDefinition.setTaskDefinitions(new HashMap<String, TaskDefinition>()); processDefinition.setDeploymentId(deployment.getId()); String historyLevelText = processElement.attribute("history"); if (historyLevelText!=null) { processDefinition.setHistoryLevel(ProcessEngineConfiguration.parseHistoryLevel(historyLevelText)); } if (LOG.isLoggable(Level.FINE)) { LOG.fine("Parsing process " + processDefinition.getKey()); } parseScope(processElement, processDefinition); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseProcess(processElement, processDefinition); } return processDefinition; } /** * Parses a scope: a process, subprocess, etc. * * Note that a process definition is a scope on itself. * * @param scopeElement The XML element defining the scope * @param parentScope The scope that contains the nested scope. */ public void parseScope(Element scopeElement, ScopeImpl parentScope) { // Not yet supported on process level (PVM additions needed): // parseProperties(processElement); parseStartEvents(scopeElement, parentScope); parseActivities(scopeElement, parentScope); parseEndEvents(scopeElement, parentScope); parseBoundaryEvents(scopeElement, parentScope); parseSequenceFlow(scopeElement, parentScope); parseExecutionListenersOnScope(scopeElement, parentScope); IOSpecification ioSpecification = parseIOSpecification(scopeElement.element("ioSpecification")); parentScope.setIoSpecification(ioSpecification); } protected IOSpecification parseIOSpecification(Element ioSpecificationElement) { if (ioSpecificationElement == null) { return null; } IOSpecification ioSpecification = new IOSpecification(); for (Element dataInputElement : ioSpecificationElement.elements("dataInput")) { String id = dataInputElement.attribute("id"); String itemSubjectRef = this.resolveName(dataInputElement.attribute("itemSubjectRef")); ItemDefinition itemDefinition = this.itemDefinitions.get(itemSubjectRef); Data dataInput = new Data(this.targetNamespace + ":" + id, itemDefinition); ioSpecification.addInput(dataInput); } for (Element dataOutputElement : ioSpecificationElement.elements("dataOutput")) { String id = dataOutputElement.attribute("id"); String itemSubjectRef = this.resolveName(dataOutputElement.attribute("itemSubjectRef")); ItemDefinition itemDefinition = this.itemDefinitions.get(itemSubjectRef); Data dataOutput = new Data(this.targetNamespace + ":" + id, itemDefinition); ioSpecification.addOutput(dataOutput); } for (Element inputSetElement : ioSpecificationElement.elements("inputSet")) { for (Element dataInputRef : inputSetElement.elements("dataInputRefs")) { DataRef dataRef = new DataRef(dataInputRef.getText()); ioSpecification.addInputRef(dataRef); } } for (Element outputSetElement : ioSpecificationElement.elements("outputSet")) { for (Element dataInputRef : outputSetElement.elements("dataOutputRefs")) { DataRef dataRef = new DataRef(dataInputRef.getText()); ioSpecification.addOutputRef(dataRef); } } return ioSpecification; } protected DataInputAssociation parseDataInputAssociation(Element dataAssociationElement) { String sourceRef = dataAssociationElement.element("sourceRef").getText(); String targetRef = dataAssociationElement.element("targetRef").getText(); DataInputAssociation dataAssociation = new DataInputAssociation(sourceRef, targetRef); for (Element assigmentElement : dataAssociationElement.elements("assignment")) { Expression from = this.expressionManager.createExpression(assigmentElement.element("from").getText()); Expression to = this.expressionManager.createExpression(assigmentElement.element("to").getText()); Assignment assignment = new Assignment(from, to); dataAssociation.addAssignment(assignment); } return dataAssociation; } /** * Parses the start events of a certain level in the process (process, * subprocess or another scope). * * @param parentElement * The 'parent' element that contains the start events (process, * subprocess). * @param scope * The {@link ScopeImpl} to which the start events must be * added. */ public void parseStartEvents(Element parentElement, ScopeImpl scope) { List<Element> startEventElements = parentElement.elements("startEvent"); if (startEventElements.size() > 1) { addError("Multiple start events are currently unsupported", parentElement); } else if (startEventElements.size() > 0) { Element startEventElement = startEventElements.get(0); String id = startEventElement.attribute("id"); String name = startEventElement.attribute("name"); String documentation = parseDocumentation(startEventElement); ActivityImpl startEventActivity = scope.createActivity(id); startEventActivity.setProperty("name", name); startEventActivity.setProperty("documentation", documentation); if (scope instanceof ProcessDefinitionEntity) { ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) scope; if (processDefinition.getInitial()!=null) { // in order to support this, the initial should here be replaced with // a kind of hidden decision activity that has pvm transitions to all // of the visible bpmn start events addError("multiple startEvents in a process definition are not yet supported", startEventElement); } processDefinition.setInitial(startEventActivity); StartFormHandler startFormHandler; String startFormHandlerClassName = startEventElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "formHandlerClass"); if (startFormHandlerClassName!=null) { startFormHandler = (StartFormHandler) ReflectUtil.instantiate(startFormHandlerClassName); } else { startFormHandler = new DefaultStartFormHandler(); } startFormHandler.parseConfiguration(startEventElement, deployment, this); processDefinition.setStartFormHandler(startFormHandler); String initiatorVariableName = startEventElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "initiator"); if (initiatorVariableName != null) { processDefinition.setProperty(PROPERTYNAME_INITIATOR_VARIABLE_NAME, initiatorVariableName); } } else { scope.setProperty(PROPERTYNAME_INITIAL, startEventActivity); } // Currently only none start events supported // TODO: a subprocess is only allowed to have a none start event startEventActivity.setActivityBehavior(new NoneStartEventActivity()); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseStartEvent(startEventElement, scope, startEventActivity); } } } /** * Parses the activities of a certain level in the process (process, * subprocess or another scope). * * @param parentElement * The 'parent' element that contains the activities (process, * subprocess). * @param scopeElement * The {@link ScopeImpl} to which the activities must be * added. */ public void parseActivities(Element parentElement, ScopeImpl scopeElement) { for (Element activityElement : parentElement.elements()) { if (activityElement.getTagName().equals("exclusiveGateway")) { parseExclusiveGateway(activityElement, scopeElement); } else if (activityElement.getTagName().equals("parallelGateway")) { parseParallelGateway(activityElement, scopeElement); } else if (activityElement.getTagName().equals("scriptTask")) { parseScriptTask(activityElement, scopeElement); } else if (activityElement.getTagName().equals("serviceTask")) { parseServiceTask(activityElement, scopeElement); } else if (activityElement.getTagName().equals("task")) { parseTask(activityElement, scopeElement); } else if (activityElement.getTagName().equals("manualTask")) { parseManualTask(activityElement, scopeElement); } else if (activityElement.getTagName().equals("userTask")) { parseUserTask(activityElement, scopeElement); } else if (activityElement.getTagName().equals("receiveTask")) { parseReceiveTask(activityElement, scopeElement); } else if (activityElement.getTagName().equals("subProcess")) { parseSubProcess(activityElement, scopeElement); } else if (activityElement.getTagName().equals("callActivity")) { parseCallActivity(activityElement, scopeElement); } else if (activityElement.getTagName().equals("sendTask") || activityElement.getTagName().equals("adHocSubProcess") || activityElement.getTagName().equals("businessRuleTask") || activityElement.getTagName().equals("complexGateway") || activityElement.getTagName().equals("eventBasedGateway") || activityElement.getTagName().equals("transaction")) { addWarning("Ignoring unsupported activity type", activityElement); } } } /** * Generic parsing method for most flow elements: parsing of the documentation * sub-element. */ public String parseDocumentation(Element element) { Element docElement = element.element("documentation"); if (docElement != null) { return docElement.getText().trim(); } return null; } /** * Parses the generic information of an activity element (id, name), and * creates a new {@link ActivityImpl} on the given scope element. */ public ActivityImpl parseAndCreateActivityOnScopeElement(Element activityElement, ScopeImpl scopeElement) { String id = activityElement.attribute("id"); String name = activityElement.attribute("name"); String documentation = parseDocumentation(activityElement); if (LOG.isLoggable(Level.FINE)) { LOG.fine("Parsing activity " + id); } ActivityImpl activity = scopeElement.createActivity(id); activity.setProperty("name", name); activity.setProperty("documentation", documentation); activity.setProperty("type", activityElement.getTagName()); activity.setProperty("line", activityElement.getLine()); return activity; } /** * Parses an exclusive gateway declaration. */ public void parseExclusiveGateway(Element exclusiveGwElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(exclusiveGwElement, scope); activity.setActivityBehavior(new ExclusiveGatewayActivity()); parseExecutionListenersOnScope(exclusiveGwElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseExclusiveGateway(exclusiveGwElement, scope, activity); } } /** * Parses a parallel gateway declaration. */ public void parseParallelGateway(Element parallelGwElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(parallelGwElement, scope); activity.setActivityBehavior(new ParallelGatewayActivity()); parseExecutionListenersOnScope(parallelGwElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseParallelGateway(parallelGwElement, scope, activity); } } /** * Parses a scriptTask declaration. */ public void parseScriptTask(Element scriptTaskElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(scriptTaskElement, scope); String script = null; String language = null; String resultVariableName = null; Element scriptElement = scriptTaskElement.element("script"); if (scriptElement != null) { script = scriptElement.getText(); if (language == null) { language = scriptTaskElement.attribute("scriptFormat"); } if (language == null) { language = ScriptingEngines.DEFAULT_SCRIPTING_LANGUAGE; } resultVariableName = scriptTaskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "resultVariableName"); } activity.setActivityBehavior(new ScriptTaskActivity(script, language, resultVariableName)); parseExecutionListenersOnScope(scriptTaskElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseScriptTask(scriptTaskElement, scope, activity); } } /** * Parses a serviceTask declaration. */ public void parseServiceTask(Element serviceTaskElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(serviceTaskElement, scope); String type = serviceTaskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "type"); String className = serviceTaskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "class"); String expression = serviceTaskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "expression"); String resultVariableName = serviceTaskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "resultVariableName"); String implementation = serviceTaskElement.attribute("implementation"); String operationRef = this.resolveName(serviceTaskElement.attribute("operationRef")); List<FieldDeclaration> fieldDeclarations = parseFieldDeclarationsOnServiceTask(serviceTaskElement); if (type != null) { if (type.equalsIgnoreCase("mail")) { parseEmailServiceTask(activity, serviceTaskElement, fieldDeclarations); } else { addError("Invalid usage of type attribute: '" + type + "'", serviceTaskElement); } } else if (className != null && className.trim().length() > 0) { if (resultVariableName != null) { addError("'resultVariableName' not supported for service tasks using 'class'", serviceTaskElement); } Object delegateInstance = instantiateDelegate(className, fieldDeclarations); if (delegateInstance instanceof ActivityBehavior) { activity.setActivityBehavior((ActivityBehavior) delegateInstance); } else if (delegateInstance instanceof JavaDelegation) { activity.setActivityBehavior(new JavaDelegationDelegate((JavaDelegation) delegateInstance)); } else { addError(delegateInstance.getClass().getName()+" doesn't implement "+JavaDelegation.class.getName()+" nor "+ActivityBehavior.class.getName(), serviceTaskElement); } } else if (expression != null && expression.trim().length() > 0) { activity.setActivityBehavior(new ServiceTaskExpressionActivityBehavior(expressionManager.createExpression(expression), resultVariableName)); } else if (implementation != null && operationRef != null && implementation.equalsIgnoreCase("##WebService")) { if (!this.operations.containsKey(operationRef)) { addError(operationRef + " does not exist" , serviceTaskElement); } else { Operation operation = this.operations.get(operationRef); WebServiceActivityBehavior webServiceActivityBehavior = new WebServiceActivityBehavior(operation); Element ioSpecificationElement = serviceTaskElement.element("ioSpecification"); if (ioSpecificationElement != null) { IOSpecification ioSpecification = this.parseIOSpecification(ioSpecificationElement); webServiceActivityBehavior.setIoSpecification(ioSpecification); } for (Element dataAssociationElement : serviceTaskElement.elements("dataInputAssociation")) { DataInputAssociation dataAssociation = this.parseDataInputAssociation(dataAssociationElement); webServiceActivityBehavior.addDataInputAssociation(dataAssociation); } for (Element dataAssociationElement : serviceTaskElement.elements("dataOutputAssociation")) { DataOutputAssociation dataAssociation = this.parseDataOutputAssociation(dataAssociationElement); webServiceActivityBehavior.addDataOutputAssociation(dataAssociation); } activity.setActivityBehavior(webServiceActivityBehavior); } } else { addError("'class', 'type', or 'expression' attribute is mandatory on serviceTask", serviceTaskElement); } parseExecutionListenersOnScope(serviceTaskElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseServiceTask(serviceTaskElement, scope, activity); } } private DataOutputAssociation parseDataOutputAssociation(Element dataAssociationElement) { String targetRef = dataAssociationElement.element("targetRef").getText(); Expression transformation = this.expressionManager.createExpression(dataAssociationElement.element("transformation").getText()); DataOutputAssociation dataOutputAssociation = new DataOutputAssociation(targetRef, transformation); return dataOutputAssociation; } protected void parseEmailServiceTask(ActivityImpl activity, Element serviceTaskElement, List<FieldDeclaration> fieldDeclarations) { validateFieldDeclarationsForEmail(serviceTaskElement, fieldDeclarations); activity.setActivityBehavior(instantiateAndHandleFieldDeclarations(MailActivityBehavior.class, fieldDeclarations)); } protected void validateFieldDeclarationsForEmail(Element serviceTaskElement, List<FieldDeclaration> fieldDeclarations) { boolean toDefined = false; boolean textOrHtmlDefined = false; for (FieldDeclaration fieldDeclaration : fieldDeclarations) { if (fieldDeclaration.getName().equals("to")) { toDefined = true; } if (fieldDeclaration.getName().equals("html")) { textOrHtmlDefined = true; } if (fieldDeclaration.getName().equals("text")) { textOrHtmlDefined = true; } } if (!toDefined) { addError("No recipient is defined on the mail activity", serviceTaskElement); } if (!textOrHtmlDefined) { addError("Text or html field should be provided", serviceTaskElement); } } public List<FieldDeclaration> parseFieldDeclarationsOnServiceTask(Element serviceTaskElement) { Element extensionElement = serviceTaskElement.element("extensionElements"); if (extensionElement != null) { return parseFieldDeclarations(extensionElement); } return new ArrayList<FieldDeclaration>(); } public List<FieldDeclaration> parseFieldDeclarations(Element element) { List<FieldDeclaration> fieldDeclarations = new ArrayList<FieldDeclaration>(); List<Element> fieldDeclarationElements = element.elementsNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "field"); if (fieldDeclarationElements != null && !fieldDeclarationElements.isEmpty()) { for (Element fieldDeclarationElement : fieldDeclarationElements) { FieldDeclaration fieldDeclaration = parseFieldDeclaration(element, fieldDeclarationElement); if(fieldDeclaration != null) { fieldDeclarations.add(fieldDeclaration); } } } return fieldDeclarations; } protected FieldDeclaration parseFieldDeclaration(Element serviceTaskElement, Element fieldDeclarationElement) { String fieldName = fieldDeclarationElement.attribute("name"); FieldDeclaration fieldDeclaration = parseStringFieldDeclaration(fieldDeclarationElement, serviceTaskElement, fieldName); if(fieldDeclaration == null) { fieldDeclaration = parseExpressionFieldDeclaration(fieldDeclarationElement, serviceTaskElement, fieldName); } if(fieldDeclaration == null) { addError("One of the following is mandatory on a field declaration: one of attributes stringValue|expression " + "or one of child elements string|expression", serviceTaskElement); } return fieldDeclaration; } protected FieldDeclaration parseStringFieldDeclaration(Element fieldDeclarationElement, Element serviceTaskElement, String fieldName) { try { String fieldValue = getStringValueFromAttributeOrElement("stringValue", "string", null, fieldDeclarationElement); if(fieldValue != null) { return new FieldDeclaration(fieldName, Expression.class.getName(), new FixedValue(fieldValue)); } } catch (ActivitiException ae) { if (ae.getMessage().contains("multiple elements with tag name")) { addError("Multiple string field declarations found", serviceTaskElement); } else { addError("Error when paring field declarations: " + ae.getMessage(), serviceTaskElement); } } return null; } protected FieldDeclaration parseExpressionFieldDeclaration(Element fieldDeclarationElement, Element serviceTaskElement, String fieldName) { try { String expression = getStringValueFromAttributeOrElement("expression", "expression", null, fieldDeclarationElement); if(expression != null && expression.trim().length() > 0) { return new FieldDeclaration(fieldName, Expression.class.getName(), expressionManager.createExpression(expression)); } } catch(ActivitiException ae) { if (ae.getMessage().contains("multiple elements with tag name")) { addError("Multiple expression field declarations found", serviceTaskElement); } else { addError("Error when paring field declarations: " + ae.getMessage(), serviceTaskElement); } } return null; } protected String getStringValueFromAttributeOrElement(String attributeName, String elementName, String namespace, Element element) { String value = null; String attributeValue = element.attributeNS(namespace, attributeName); Element childElement = element.elementNS(namespace, elementName); String stringElementText = null; if(attributeValue != null && childElement != null) { addError("Can't use attribute '" + attributeName + "' and element '" + elementName + "' together, only use one", element); } else if (childElement != null) { stringElementText = childElement.getText(); if (stringElementText == null || stringElementText.length() == 0) { addError("No valid value found in attribute '" + attributeName + "' nor element '" + elementName + "'", element); } else { // Use text of element value = stringElementText; } } else if(attributeValue != null && attributeValue.length() > 0) { // Using attribute value = attributeValue; } return value; } /** * Parses a task with no specific type (behaves as passthrough). */ public void parseTask(Element taskElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(taskElement, scope); activity.setActivityBehavior(new TaskActivity()); parseExecutionListenersOnScope(taskElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseTask(taskElement, scope, activity); } } /** * Parses a manual task. */ public void parseManualTask(Element manualTaskElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(manualTaskElement, scope); activity.setActivityBehavior(new ManualTaskActivity()); parseExecutionListenersOnScope(manualTaskElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseManualTask(manualTaskElement, scope, activity); } } /** * Parses a receive task. */ public void parseReceiveTask(Element receiveTaskElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(receiveTaskElement, scope); activity.setActivityBehavior(new ReceiveTaskActivity()); parseExecutionListenersOnScope(receiveTaskElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseManualTask(receiveTaskElement, scope, activity); } } /* userTask specific finals */ protected static final String HUMAN_PERFORMER = "humanPerformer"; protected static final String POTENTIAL_OWNER = "potentialOwner"; protected static final String RESOURCE_ASSIGNMENT_EXPR = "resourceAssignmentExpression"; protected static final String FORMAL_EXPRESSION = "formalExpression"; protected static final String USER_PREFIX = "user("; protected static final String GROUP_PREFIX = "group("; protected static final String ASSIGNEE_EXTENSION = "assignee"; protected static final String CANDIDATE_USERS_EXTENSION = "candidateUsers"; protected static final String CANDIDATE_GROUPS_EXTENSION = "candidateGroups"; /** * Parses a userTask declaration. */ public void parseUserTask(Element userTaskElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(userTaskElement, scope); TaskDefinition taskDefinition = parseTaskDefinition(userTaskElement, activity.getId(), (ProcessDefinitionEntity) scope.getProcessDefinition()); UserTaskActivity userTaskActivity = new UserTaskActivity(expressionManager, taskDefinition); activity.setActivityBehavior(userTaskActivity); parseProperties(userTaskElement, activity); parseExecutionListenersOnScope(userTaskElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseUserTask(userTaskElement, scope, activity); } } public TaskDefinition parseTaskDefinition(Element taskElement, String taskDefinitionKey, ProcessDefinitionEntity processDefinition) { TaskFormHandler taskFormHandler; String taskFormHandlerClassName = taskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "formHandlerClass"); if (taskFormHandlerClassName!=null) { taskFormHandler = (TaskFormHandler) ReflectUtil.instantiate(taskFormHandlerClassName); } else { taskFormHandler = new DefaultTaskFormHandler(); } taskFormHandler.parseConfiguration(taskElement, deployment, this); TaskDefinition taskDefinition = new TaskDefinition(taskFormHandler); taskDefinition.setKey(taskDefinitionKey); processDefinition.getTaskDefinitions().put(taskDefinitionKey, taskDefinition); String name = taskElement.attribute("name"); if (name != null) { taskDefinition.setNameExpression(expressionManager.createExpression(name)); } String descriptionStr = parseDocumentation(taskElement); if(descriptionStr != null) { taskDefinition.setDescriptionExpression(expressionManager.createExpression(descriptionStr)); } parseHumanPerformer(taskElement, taskDefinition); parsePotentialOwner(taskElement, taskDefinition); // Activiti custom extension parseUserTaskCustomExtensions(taskElement, taskDefinition); return taskDefinition; } protected void parseHumanPerformer(Element taskElement, TaskDefinition taskDefinition) { List<Element> humanPerformerElements = taskElement.elements(HUMAN_PERFORMER); if (humanPerformerElements.size() > 1) { addError("Invalid task definition: multiple " + HUMAN_PERFORMER + " sub elements defined for " + taskDefinition.getNameExpression(), taskElement); } else if (humanPerformerElements.size() == 1) { Element humanPerformerElement = humanPerformerElements.get(0); if (humanPerformerElement != null) { parseHumanPerformerResourceAssignment(humanPerformerElement, taskDefinition); } } } protected void parsePotentialOwner(Element taskElement, TaskDefinition taskDefinition) { List<Element> potentialOwnerElements = taskElement.elements(POTENTIAL_OWNER); for (Element potentialOwnerElement : potentialOwnerElements) { parsePotentialOwnerResourceAssignment(potentialOwnerElement, taskDefinition); } } protected void parseHumanPerformerResourceAssignment(Element performerElement, TaskDefinition taskDefinition) { Element raeElement = performerElement.element(RESOURCE_ASSIGNMENT_EXPR); if (raeElement != null) { Element feElement = raeElement.element(FORMAL_EXPRESSION); if (feElement != null) { taskDefinition.setAssigneeExpression(expressionManager.createExpression(feElement.getText())); } } } protected void parsePotentialOwnerResourceAssignment(Element performerElement, TaskDefinition taskDefinition) { Element raeElement = performerElement.element(RESOURCE_ASSIGNMENT_EXPR); if (raeElement != null) { Element feElement = raeElement.element(FORMAL_EXPRESSION); if (feElement != null) { String[] assignmentExpressions = splitCommaSeparatedExpression(feElement.getText()); for (String assignmentExpression : assignmentExpressions) { assignmentExpression = assignmentExpression.trim(); if (assignmentExpression.startsWith(USER_PREFIX)) { String userAssignementId = getAssignmentId(assignmentExpression, USER_PREFIX); taskDefinition.addCandidateUserIdExpression(expressionManager.createExpression(userAssignementId)); } else if (assignmentExpression.startsWith(GROUP_PREFIX)) { String groupAssignementId = getAssignmentId(assignmentExpression, GROUP_PREFIX); taskDefinition.addCandidateGroupIdExpression(expressionManager.createExpression(groupAssignementId)); } else { // default: given string is a goupId, as-is. taskDefinition.addCandidateGroupIdExpression(expressionManager.createExpression(assignmentExpression)); } } } } } protected String[] splitCommaSeparatedExpression(String expression) { if (expression == null) { addError("Invalid: no content for " + FORMAL_EXPRESSION + " provided", rootElement); } return expression.split(","); } protected String getAssignmentId(String expression, String prefix) { return expression.substring(prefix.length(), expression.length() - 1).trim(); } protected void parseUserTaskCustomExtensions(Element taskElement, TaskDefinition taskDefinition) { // assignee String assignee = taskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, ASSIGNEE_EXTENSION); if (assignee != null) { if (taskDefinition.getAssigneeExpression() == null) { taskDefinition.setAssigneeExpression(expressionManager.createExpression(assignee)); } else { addError("Invalid usage: duplicate assignee declaration for task " + taskDefinition.getNameExpression(), taskElement); } } // Candidate users String candidateUsersString = taskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, CANDIDATE_USERS_EXTENSION); if (candidateUsersString != null) { String[] candidateUsers = candidateUsersString.split(","); for (String candidateUser : candidateUsers) { taskDefinition.addCandidateUserIdExpression(expressionManager.createExpression(candidateUser.trim())); } } // Candidate groups String candidateGroupsString = taskElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, CANDIDATE_GROUPS_EXTENSION); if (candidateGroupsString != null) { String[] candidateGroups = candidateGroupsString.split(","); for (String candidateGroup : candidateGroups) { taskDefinition.addCandidateGroupIdExpression(expressionManager.createExpression(candidateGroup.trim())); } } // Task listeners parseTaskListeners(taskElement, taskDefinition); } protected void parseTaskListeners(Element userTaskElement, TaskDefinition taskDefinition) { Element extentionsElement = userTaskElement.element("extensionElements"); if(extentionsElement != null) { List<Element> taskListenerElements = extentionsElement.elementsNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "taskListener"); for(Element taskListenerElement : taskListenerElements) { String eventName = taskListenerElement.attribute("event"); if (eventName != null) { if (TaskListener.EVENTNAME_CREATE.equals(eventName) || TaskListener.EVENTNAME_ASSIGNMENT.equals(eventName) || TaskListener.EVENTNAME_COMPLETE.equals(eventName)) { TaskListener taskListener = parseTaskListener(taskListenerElement); taskDefinition.addTaskListener(eventName, taskListener); } else { addError("Invalid eventName for taskListener: choose 'create' |'assignment'", userTaskElement); } } else { addError("Event is mandatory on taskListener", userTaskElement); } } } } protected TaskListener parseTaskListener(Element taskListenerElement) { TaskListener taskListener = null; String className = taskListenerElement.attribute("class"); String expression = taskListenerElement.attribute( "expression"); if(className != null && className.trim().length() > 0) { Object delegateInstance = instantiateDelegate(className, parseFieldDeclarations(taskListenerElement)); if (delegateInstance instanceof TaskListener) { taskListener = (TaskListener) delegateInstance; } else { addError(delegateInstance.getClass().getName()+" doesn't implement "+TaskListener.class, taskListenerElement); } } else if(expression != null && expression.trim().length() > 0) { taskListener = new ExpressionTaskListener(expressionManager.createExpression(expression)); } else { addError("Element 'class' or 'expression' is mandatory on taskListener", taskListenerElement); } return taskListener; } /** * Parses the end events of a certain level in the process (process, * subprocess or another scope). * * @param parentElement * The 'parent' element that contains the end events (process, * subprocess). * @param scope * The {@link ScopeImpl} to which the end events must be * added. */ public void parseEndEvents(Element parentElement, ScopeImpl scope) { for (Element endEventElement : parentElement.elements("endEvent")) { String id = endEventElement.attribute("id"); String name = endEventElement.attribute("name"); String documentation = parseDocumentation(endEventElement); ActivityImpl activity = scope.createActivity(id); activity.setProperty("name", name); activity.setProperty("documentation", documentation); // Only none end events are currently supported activity.setActivityBehavior(new NoneEndEventActivity()); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseEndEvent(endEventElement, scope, activity); } } } /** * Parses the boundary events of a certain 'level' (process, subprocess or * other scope). * * Note that the boundary events are not parsed during the parsing of the bpmn * activities, since the semantics are different (boundaryEvent needs to be * added as nested activity to the reference activity on PVM level). * * @param parentElement * The 'parent' element that contains the activities (process, * subprocess). * @param scopeElement * The {@link ScopeImpl} to which the activities must be * added. */ public void parseBoundaryEvents(Element parentElement, ScopeImpl scopeElement) { for (Element boundaryEventElement : parentElement.elements("boundaryEvent")) { // The boundary event is attached to an activity, reference by the // 'attachedToRef' attribute String attachedToRef = boundaryEventElement.attribute("attachedToRef"); if (attachedToRef == null || attachedToRef.equals("")) { addError("AttachedToRef is required when using a timerEventDefinition", boundaryEventElement); } // Representation structure-wise is a nested activity in the activity to // which its attached String id = boundaryEventElement.attribute("id"); if (LOG.isLoggable(Level.FINE)) { LOG.fine("Parsing boundary event " + id); } ActivityImpl parentActivity = scopeElement.findActivity(attachedToRef); if (parentActivity == null) { addError("Invalid reference in boundary event. Make sure that the referenced activity is " + "defined in the same scope as the boundary event", boundaryEventElement); } ActivityImpl nestedActivity = parentActivity.createActivity(id); nestedActivity.setProperty("name", boundaryEventElement.attribute("name")); nestedActivity.setProperty("documentation", parseDocumentation(boundaryEventElement)); String cancelActivity = boundaryEventElement.attribute("cancelActivity", "true"); boolean interrupting = cancelActivity.equals("true") ? true : false; // Depending on the sub-element definition, the correct activityBehavior // parsing is selected Element timerEventDefinition = boundaryEventElement.element("timerEventDefinition"); if (timerEventDefinition != null) { parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity); } else { addError("Unsupported boundary event type", boundaryEventElement); } } } /** * Parses a boundary timer event. The end-result will be that the given nested * activity will get the appropriate {@link ActivityBehavior}. * * @param timerEventDefinition * The XML element corresponding with the timer event details * @param interrupting * Indicates whether this timer is interrupting. * @param timerActivity * The activity which maps to the structure of the timer event on the * boundary of another activity. Note that this is NOT the activity * onto which the boundary event is attached, but a nested activity * inside this activity, specifically created for this event. */ public void parseBoundaryTimerEventDefinition(Element timerEventDefinition, boolean interrupting, ActivityImpl timerActivity) { BoundaryTimerEventActivity boundaryTimerEventActivity = new BoundaryTimerEventActivity(); boundaryTimerEventActivity.setInterrupting(interrupting); // TimeDate // TimeCycle // TimeDuration Element timeDuration = timerEventDefinition.element("timeDuration"); String timeDurationText = null; if (timeDuration != null) { timeDurationText = timeDuration.getText(); } // Parse the timer declaration // TODO move the timer declaration into the bpmn activity or next to the TimerSession TimerDeclarationImpl timerDeclaration = new TimerDeclarationImpl(timeDurationText, TimerExecuteNestedActivityJobHandler.TYPE); timerDeclaration.setJobHandlerConfiguration(timerActivity.getId()); addTimerDeclaration(timerActivity.getParent(), timerDeclaration); if (timerActivity.getParent() instanceof ActivityImpl) { ((ActivityImpl)timerActivity.getParent()).setScope(true); } timerActivity.setActivityBehavior(boundaryTimerEventActivity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, timerActivity); } } @SuppressWarnings("unchecked") protected void addTimerDeclaration(ScopeImpl scope, TimerDeclarationImpl timerDeclaration) { List<TimerDeclarationImpl> timerDeclarations = (List<TimerDeclarationImpl>) scope.getProperty(PROPERTYNAME_TIMER_DECLARATION); if (timerDeclarations==null) { timerDeclarations = new ArrayList<TimerDeclarationImpl>(); scope.setProperty(PROPERTYNAME_TIMER_DECLARATION, timerDeclarations); } timerDeclarations.add(timerDeclaration); } @SuppressWarnings("unchecked") protected void addVariableDeclaration(ScopeImpl scope, VariableDeclaration variableDeclaration) { List<VariableDeclaration> variableDeclarations = (List<VariableDeclaration>) scope.getProperty(PROPERTYNAME_VARIABLE_DECLARATIONS); if (variableDeclarations==null) { variableDeclarations = new ArrayList<VariableDeclaration>(); scope.setProperty(PROPERTYNAME_VARIABLE_DECLARATIONS, variableDeclarations); } variableDeclarations.add(variableDeclaration); } /** * Parses a subprocess (formely known as an embedded subprocess): a subprocess * defined withing another process definition. * * @param subProcessElement The XML element corresponding with the subprocess definition * @param scope The current scope on which the subprocess is defined. */ public void parseSubProcess(Element subProcessElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(subProcessElement, scope); activity.setScope(true); activity.setActivityBehavior(new SubProcessActivity()); parseScope(subProcessElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseSubProcess(subProcessElement, scope, activity); } } /** * Parses a call activity (currenly only supporting calling subprocesses). * * @param callActivityElement The XML element defining the call activity * @param scope The current scope on which the call activity is defined. */ public void parseCallActivity(Element callActivityElement, ScopeImpl scope) { ActivityImpl activity = parseAndCreateActivityOnScopeElement(callActivityElement, scope); String calledElement = callActivityElement.attribute("calledElement"); if (calledElement == null) { addError("Missing attribute 'calledElement'", callActivityElement); } activity.setActivityBehavior(new CallActivityBehaviour(calledElement)); parseExecutionListenersOnScope(callActivityElement, activity); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseCallActivity(callActivityElement, scope, activity); } } /** * Parses the properties of an element (if any) that can contain properties * (processes, activities, etc.) * * Returns true if property subelemens are found. * * @param element * The element that can contain properties. * @param activity * The activity where the property declaration is done. */ public void parseProperties(Element element, ActivityImpl activity) { List<Element> propertyElements = element.elements("property"); for (Element propertyElement : propertyElements) { parseProperty(propertyElement, activity); } } /** * Parses one property definition. * * @param propertyElement * The 'property' element that defines how a property looks like and * is handled. */ public void parseProperty(Element propertyElement, ActivityImpl activity) { String id = propertyElement.attribute("id"); String name = propertyElement.attribute("name"); // If name isn't given, use the id as name if (name == null) { if (id == null) { addError("Invalid property usage on line " + propertyElement.getLine() + ": no id or name specified.", propertyElement); } else { name = id; } } String itemSubjectRef = propertyElement.attribute("itemSubjectRef"); String type = null; if (itemSubjectRef != null) { ItemDefinition itemDefinition = itemDefinitions.get(itemSubjectRef); if (itemDefinition != null) { StructureDefinition structure = itemDefinition.getStructureDefinition(); type = structure.getId(); } else { addError("Invalid itemDefinition reference: " + itemSubjectRef + " not found", propertyElement); } } parsePropertyCustomExtensions(activity, propertyElement, name, type); } /** * Parses the custom extensions for properties. * * @param activity * The activity where the property declaration is done. * @param propertyElement * The 'property' element defining the property. * @param propertyName * The name of the property. * @param propertyType * The type of the property. */ public void parsePropertyCustomExtensions(ActivityImpl activity, Element propertyElement, String propertyName, String propertyType) { if (propertyType == null) { String type = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "type"); propertyType = type != null ? type : "string"; // default is string } VariableDeclaration variableDeclaration = new VariableDeclaration(propertyName, propertyType); addVariableDeclaration(activity, variableDeclaration); activity.setScope(true); String src = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "src"); if (src != null) { variableDeclaration.setSourceVariableName(src); } String srcExpr = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "srcExpr"); if (srcExpr != null) { Expression sourceExpression = expressionManager.createExpression(srcExpr); variableDeclaration.setSourceExpression(sourceExpression); } String dst = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "dst"); if (dst != null) { variableDeclaration.setDestinationVariableName(dst); } String destExpr = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "dstExpr"); if (destExpr != null) { Expression destinationExpression = expressionManager.createExpression(destExpr); variableDeclaration.setDestinationExpression(destinationExpression); } String link = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "link"); if (link != null) { variableDeclaration.setLink(link); } String linkExpr = propertyElement.attributeNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "linkExpr"); if (linkExpr != null) { Expression linkExpression = expressionManager.createExpression(linkExpr); variableDeclaration.setLinkExpression(linkExpression); } for (BpmnParseListener parseListener: parseListeners) { parseListener.parseProperty(propertyElement, variableDeclaration, activity); } } /** * Parses all sequence flow of a scope. * * @param processElement * The 'process' element wherein the sequence flow are defined. * @param scope * The scope to which the sequence flow must be added. */ public void parseSequenceFlow(Element processElement, ScopeImpl scope) { for (Element sequenceFlowElement : processElement.elements("sequenceFlow")) { String id = sequenceFlowElement.attribute("id"); String sourceRef = sequenceFlowElement.attribute("sourceRef"); String destinationRef = sequenceFlowElement.attribute("targetRef"); // Implicit check: sequence flow cannot cross (sub) process boundaries: we don't do a processDefinition.findActivity here ActivityImpl sourceActivity = scope.findActivity(sourceRef); ActivityImpl destinationActivity = scope.findActivity(destinationRef); if (sourceActivity != null && destinationActivity != null) { TransitionImpl transition = sourceActivity.createOutgoingTransition(id); transition.setProperty("name", sequenceFlowElement.attribute("name")); transition.setProperty("documentation", parseDocumentation(sequenceFlowElement)); transition.setDestination(destinationActivity); parseSequenceFlowConditionExpression(sequenceFlowElement, transition); parseExecutionListenersOnTransition(sequenceFlowElement, transition); for (BpmnParseListener parseListener: parseListeners) { parseListener.parseSequenceFlow(sequenceFlowElement, scope, transition); } } else if (sourceActivity == null) { addError("Invalid source '" + sourceRef + "' of sequence flow '" + id + "'", sequenceFlowElement); } else if (destinationActivity == null) { addError("Invalid destination '" + destinationRef + "' of sequence flow '" + id + "'", sequenceFlowElement); } } } /** * Parses a condition expression on a sequence flow. * * @param seqFlowElement * The 'sequenceFlow' element that can contain a condition. * @param seqFlow * The sequenceFlow object representation to which the condition must * be added. */ public void parseSequenceFlowConditionExpression(Element seqFlowElement, TransitionImpl seqFlow) { Element conditionExprElement = seqFlowElement.element("conditionExpression"); if (conditionExprElement != null) { String expr = conditionExprElement.getText().trim(); String type = conditionExprElement.attributeNS(BpmnParser.XSI_NS, "type"); if (type != null && !type.equals("tFormalExpression")) { addError("Invalid type, only tFormalExpression is currently supported", conditionExprElement); } Condition condition = new UelExpressionCondition(expressionManager.createExpression(expr)); seqFlow.setProperty(PROPERTYNAME_CONDITION, condition); } } /** * Parses all execution-listeners on a scope. * * @param scopeElement the XML element containing the scope definition. * @param scope the scope to add the executionListeners to. */ public void parseExecutionListenersOnScope(Element scopeElement, ScopeImpl scope) { Element extentionsElement = scopeElement.element("extensionElements"); if(extentionsElement != null) { List<Element> listenerElements = extentionsElement.elementsNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "executionListener"); for(Element listenerElement :listenerElements) { String eventName = listenerElement.attribute("event"); if(isValidEventNameForScope(eventName, listenerElement)) { ExecutionListener listener = parseExecutionListener(listenerElement); if(listener != null) { scope.addExecutionListener(eventName, listener); } } } } } /** * Check if the given event name is valid. If not, an appropriate error is added. */ protected boolean isValidEventNameForScope(String eventName, Element listenerElement) { if(eventName != null && eventName.trim().length() > 0) { if("start".equals(eventName) || "end".equals(eventName)) { return true; } else { addError("Attribute 'eventName' must be one of {start|end}", listenerElement); } } else { addError("Attribute 'eventName' is mandatory on listener", listenerElement); } return false; } public void parseExecutionListenersOnTransition(Element activitiElement, TransitionImpl activity) { Element extentionsElement = activitiElement.element("extensionElements"); if(extentionsElement != null) { List<Element> listenerElements = extentionsElement.elementsNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS, "executionListener"); for(Element listenerElement : listenerElements) { ExecutionListener listener = parseExecutionListener(listenerElement); if(listener != null) { // Since a transition only fires event 'take', we don't parse the eventName, it is ignored activity.addExecutionListener(listener); } } } } /** * Parses an {@link ExecutionListener} implementation for the given executionListener element. * * @param executionListenerElement the XML element containing the executionListener definition. */ public ExecutionListener parseExecutionListener(Element executionListenerElement) { ExecutionListener executionListener = null; String className = executionListenerElement.attribute("class"); String expression = executionListenerElement.attribute( "expression"); if(className != null && className.trim().length() > 0) { Object delegateInstance = instantiateDelegate(className, parseFieldDeclarations(executionListenerElement)); if (delegateInstance instanceof ExecutionListener) { executionListener = (ExecutionListener) delegateInstance; } else if (delegateInstance instanceof JavaDelegation) { executionListener = new JavaDelegationDelegate((JavaDelegation) delegateInstance); } else { addError(delegateInstance.getClass().getName()+" doesn't implement "+JavaDelegation.class.getName()+" nor "+ExecutionListener.class.getName(), executionListenerElement); } } else if(expression != null && expression.trim().length() > 0) { executionListener = new ExpressionExecutionListener(expressionManager.createExpression(expression)); } else { addError("Element 'class' or 'expression' is mandatory on executionListener", executionListenerElement); } return executionListener; } /** * Retrieves the {@link Operation} corresponding with the given operation * identifier. */ public Operation getOperation(String operationId) { return operations.get(operationId); } /* Getters, setters and Parser overriden operations */ public List<ProcessDefinitionEntity> getProcessDefinitions() { return processDefinitions; } public BpmnParse name(String name) { super.name(name); return this; } public BpmnParse sourceInputStream(InputStream inputStream) { super.sourceInputStream(inputStream); return this; } public BpmnParse sourceResource(String resource, ClassLoader classLoader) { super.sourceResource(resource, classLoader); return this; } public BpmnParse sourceResource(String resource) { super.sourceResource(resource); return this; } public BpmnParse sourceString(String string) { super.sourceString(string); return this; } public BpmnParse sourceUrl(String url) { super.sourceUrl(url); return this; } public BpmnParse sourceUrl(URL url) { super.sourceUrl(url); return this; } public void addStructure(StructureDefinition structure) { this.structures.put(structure.getId(), structure); } public void addService(BpmnInterfaceImplementation bpmnInterfaceImplementation) { this.interfaceImplementations.put(bpmnInterfaceImplementation.getName(), bpmnInterfaceImplementation); } public void addOperation(OperationImplementation operationImplementation) { this.operationImplementations.put(operationImplementation.getId(), operationImplementation); } public Boolean parseBooleanAttribute(String booleanText) { if ("true".equals(booleanText) || "enabled".equals(booleanText) || "on".equals(booleanText) || "active".equals(booleanText) || "yes".equals(booleanText) ) { return Boolean.TRUE; } if ("false".equals(booleanText) || "disabled".equals(booleanText) || "off".equals(booleanText) || "inactive".equals(booleanText) || "no".equals(booleanText) ) { return Boolean.FALSE; } return null; } @SuppressWarnings("unchecked") protected <T> T instantiateAndHandleFieldDeclarations(Class<T> clazz, List<FieldDeclaration> fieldDeclarations) { return (T) instantiateDelegate(clazz.getName(), fieldDeclarations); } protected Object instantiateDelegate(String className, List<FieldDeclaration> fieldDeclarations) { Object object = ReflectUtil.instantiate(className); if(fieldDeclarations != null) { for(FieldDeclaration declaration : fieldDeclarations) { Field field = ReflectUtil.getField(declaration.getName(), object); if(field == null) { throw new ActivitiException("Field definition uses unexisting field '" + declaration.getName() + "' on class " + className); } // Check if the delegate field's type is correct if(!fieldTypeCompatible(declaration, field)) { throw new ActivitiException("Incompatible type set on field declaration '" + declaration.getName() + "' for class " + className + ". Declared value has type " + declaration.getValue().getClass().getName() + ", while expecting " + field.getType().getName()); } ReflectUtil.setField(field, object, declaration.getValue()); } } return object; } protected boolean fieldTypeCompatible(FieldDeclaration declaration, Field field) { if(declaration.getValue() != null) { return field.getType().isAssignableFrom(declaration.getValue().getClass()); } else { // Null can be set any field type return true; } } }

diff --git a/SeriesGuide/src/com/battlelancer/seriesguide/ui/OverviewFragment.java b/SeriesGuide/src/com/battlelancer/seriesguide/ui/OverviewFragment.java index 3a1283b20..09d095a54 100644 --- a/SeriesGuide/src/com/battlelancer/seriesguide/ui/OverviewFragment.java +++ b/SeriesGuide/src/com/battlelancer/seriesguide/ui/OverviewFragment.java @@ -1,851 +1,851 @@ /* * Copyright 2011 Uwe Trottmann * * 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 com.battlelancer.seriesguide.ui; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.database.Cursor; import android.graphics.Color; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.LoaderManager; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.text.TextUtils; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.animation.AnimationUtils; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.RatingBar; import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.battlelancer.seriesguide.Constants; import com.battlelancer.seriesguide.enums.TraktAction; import com.battlelancer.seriesguide.provider.SeriesContract.Episodes; import com.battlelancer.seriesguide.provider.SeriesContract.ListItemTypes; import com.battlelancer.seriesguide.provider.SeriesContract.Seasons; import com.battlelancer.seriesguide.provider.SeriesContract.Shows; import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Tables; import com.battlelancer.seriesguide.ui.dialogs.CheckInDialogFragment; import com.battlelancer.seriesguide.ui.dialogs.ListsDialogFragment; import com.battlelancer.seriesguide.util.DBUtils; import com.battlelancer.seriesguide.util.FetchArtTask; import com.battlelancer.seriesguide.util.FlagTask; import com.battlelancer.seriesguide.util.ServiceUtils; import com.battlelancer.seriesguide.util.ShareUtils; import com.battlelancer.seriesguide.util.ShareUtils.ShareItems; import com.battlelancer.seriesguide.util.ShareUtils.ShareMethod; import com.battlelancer.seriesguide.util.TraktSummaryTask; import com.battlelancer.seriesguide.util.TraktTask; import com.battlelancer.seriesguide.util.TraktTask.TraktActionCompleteEvent; import com.battlelancer.seriesguide.util.Utils; import com.google.analytics.tracking.android.EasyTracker; import com.uwetrottmann.androidutils.AndroidUtils; import com.uwetrottmann.androidutils.CheatSheet; import com.uwetrottmann.seriesguide.R; import de.greenrobot.event.EventBus; /** * Displays general information about a show and its next episode. */ public class OverviewFragment extends SherlockFragment implements LoaderManager.LoaderCallbacks<Cursor> { private static final String TAG = "Overview"; private static final int EPISODE_LOADER_ID = 100; private static final int SHOW_LOADER_ID = 101; private boolean mMultiPane; private FetchArtTask mArtTask; private TraktSummaryTask mTraktTask; private Cursor mEpisodeCursor; private Cursor mShowCursor; private String mShowTitle; private View mContainerShow; private View mDividerShow; /** * All values have to be integer. */ public interface InitBundle { String SHOW_TVDBID = "show_tvdbid"; } public static OverviewFragment newInstance(int showId) { OverviewFragment f = new OverviewFragment(); // Supply index input as an argument. Bundle args = new Bundle(); args.putInt(InitBundle.SHOW_TVDBID, showId); f.setArguments(args); return f; } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { if (container == null) { return null; } View v = inflater.inflate(R.layout.overview_fragment, container, false); v.findViewById(R.id.imageViewFavorite).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onToggleShowFavorited(v); } }); mContainerShow = v.findViewById(R.id.containerOverviewShow); mDividerShow = v.findViewById(R.id.spacerOverviewShow); return v; } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); // Are we in a multi-pane layout? View seasonsFragment = getActivity().findViewById(R.id.fragment_seasons); mMultiPane = seasonsFragment != null && seasonsFragment.getVisibility() == View.VISIBLE; // do not display show info header in multi pane layout mContainerShow.setVisibility(mMultiPane ? View.GONE : View.VISIBLE); mDividerShow.setVisibility(mMultiPane ? View.VISIBLE : View.GONE); getLoaderManager().initLoader(SHOW_LOADER_ID, null, this); getLoaderManager().initLoader(EPISODE_LOADER_ID, null, this); setHasOptionsMenu(true); } @Override public void onResume() { super.onResume(); EventBus.getDefault().register(this); } @Override public void onPause() { super.onPause(); EventBus.getDefault().unregister(this); } @Override public void onDestroy() { super.onDestroy(); if (mArtTask != null) { mArtTask.cancel(true); mArtTask = null; } if (mTraktTask != null) { mTraktTask.cancel(true); mTraktTask = null; } } @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.overview_menu, menu); // enable/disable menu items boolean isEpisodeVisible; if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { isEpisodeVisible = true; boolean isCollected = mEpisodeCursor.getInt(EpisodeQuery.COLLECTED) == 1 ? true : false; menu.findItem(R.id.menu_overview_flag_collected).setIcon( isCollected ? R.drawable.ic_collected : R.drawable.ic_action_collect); } else { isEpisodeVisible = false; } menu.findItem(R.id.menu_overview_checkin).setEnabled(isEpisodeVisible && !mMultiPane); menu.findItem(R.id.menu_overview_flag_watched).setEnabled(isEpisodeVisible && !mMultiPane); menu.findItem(R.id.menu_overview_flag_collected).setEnabled(isEpisodeVisible && !mMultiPane); menu.findItem(R.id.menu_overview_calendarevent).setEnabled(isEpisodeVisible && !mMultiPane); menu.findItem(R.id.menu_overview_share).setEnabled(isEpisodeVisible); menu.findItem(R.id.menu_overview_rate).setEnabled(isEpisodeVisible); menu.findItem(R.id.menu_overview_manage_lists).setEnabled(isEpisodeVisible); // hide some items on larger screens, we use inline buttons there menu.findItem(R.id.menu_overview_checkin).setVisible(!mMultiPane); menu.findItem(R.id.menu_overview_flag_watched).setVisible(!mMultiPane); menu.findItem(R.id.menu_overview_flag_collected).setVisible(!mMultiPane); menu.findItem(R.id.menu_overview_calendarevent).setVisible(!mMultiPane); // move some items to the overflow menu on smaller screens menu.findItem(R.id.menu_overview_rate).setShowAsAction( mMultiPane ? MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT : MenuItem.SHOW_AS_ACTION_NEVER); menu.findItem(R.id.menu_overview_manage_lists).setShowAsAction( mMultiPane ? MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT : MenuItem.SHOW_AS_ACTION_NEVER); } @Override public boolean onOptionsItemSelected(MenuItem item) { int itemId = item.getItemId(); if (itemId == R.id.menu_checkin) { onCheckIn(); return true; } else if (itemId == R.id.menu_overview_flag_watched) { onFlagWatched(); return true; } else if (itemId == R.id.menu_overview_flag_collected) { onToggleCollected(); return true; } else if (itemId == R.id.menu_overview_calendarevent) { onAddCalendarEvent(); return true; } else if (itemId == R.id.menu_overview_rate) { onRateOnTrakt(); return true; } else if (itemId == R.id.menu_overview_share) { // share episode fireTrackerEvent("Share"); onShareEpisode(ShareMethod.OTHER_SERVICES); return true; } else if (itemId == R.id.menu_overview_manage_lists) { fireTrackerEvent("Manage lists"); if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { ListsDialogFragment.showListsDialog(mEpisodeCursor.getString(EpisodeQuery._ID), ListItemTypes.EPISODE, getFragmentManager()); } return true; } return super.onOptionsItemSelected(item); } private int getShowId() { return getArguments().getInt(InitBundle.SHOW_TVDBID); } private void onAddCalendarEvent() { fireTrackerEvent("Add to calendar"); if (mShowCursor != null && mShowCursor.moveToFirst() && mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { final int seasonNumber = mEpisodeCursor.getInt(EpisodeQuery.SEASON); final int episodeNumber = mEpisodeCursor.getInt(EpisodeQuery.NUMBER); final String episodeTitle = mEpisodeCursor.getString(EpisodeQuery.TITLE); // add calendar event ShareUtils.onAddCalendarEvent( getActivity(), mShowCursor.getString(ShowQuery.SHOW_TITLE), buildEpisodeString(seasonNumber, episodeNumber, episodeTitle), mEpisodeCursor.getLong(EpisodeQuery.FIRSTAIREDMS), mShowCursor.getInt(ShowQuery.SHOW_RUNTIME)); } } private void onCheckIn() { fireTrackerEvent("Check-In"); if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { int episodeTvdbId = mEpisodeCursor.getInt(EpisodeQuery._ID); // check in CheckInDialogFragment f = CheckInDialogFragment.newInstance(getActivity(), episodeTvdbId); f.show(getFragmentManager(), "checkin-dialog"); } } private void onFlagWatched() { fireTrackerEvent("Flag Watched"); if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { final int season = mEpisodeCursor.getInt(EpisodeQuery.SEASON); final int episode = mEpisodeCursor.getInt(EpisodeQuery.NUMBER); new FlagTask(getActivity(), getShowId()) .episodeWatched(mEpisodeCursor.getInt(EpisodeQuery._ID), season, episode, true) .execute(); } } private void onRateOnTrakt() { // rate episode on trakt.tv fireTrackerEvent("Rate (trakt)"); if (ServiceUtils.isTraktCredentialsValid(getActivity())) { onShareEpisode(ShareMethod.RATE_TRAKT); } else { startActivity(new Intent(getActivity(), ConnectTraktActivity.class)); } } private void onShareEpisode(ShareMethod shareMethod) { if (mShowCursor != null && mShowCursor.moveToFirst() && mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { final int seasonNumber = mEpisodeCursor.getInt(EpisodeQuery.SEASON); final int episodeNumber = mEpisodeCursor.getInt(EpisodeQuery.NUMBER); // build share data Bundle shareData = new Bundle(); shareData.putInt(ShareItems.SEASON, seasonNumber); shareData.putInt(ShareItems.EPISODE, episodeNumber); shareData.putInt(ShareItems.TVDBID, getShowId()); String episodestring = buildEpisodeString(seasonNumber, episodeNumber, mEpisodeCursor.getString(EpisodeQuery.TITLE)); shareData.putString(ShareItems.EPISODESTRING, episodestring); final StringBuilder shareString = new StringBuilder(getString(R.string.share_checkout)); shareString.append(" \"").append(mShowCursor.getString(ShowQuery.SHOW_TITLE)); shareString.append(" - ").append(episodestring).append("\""); shareData.putString(ShareItems.SHARESTRING, shareString.toString()); String imdbId = mEpisodeCursor.getString(EpisodeQuery.IMDBID); if (TextUtils.isEmpty(imdbId)) { // fall back to show IMDb id imdbId = mShowCursor.getString(ShowQuery.SHOW_IMDBID); } shareData.putString(ShareItems.IMDBID, imdbId); ShareUtils.onShareEpisode(getActivity(), shareData, shareMethod); } } private void onToggleCollected() { fireTrackerEvent("Toggle Collected"); if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { final int season = mEpisodeCursor.getInt(EpisodeQuery.SEASON); final int episode = mEpisodeCursor.getInt(EpisodeQuery.NUMBER); final boolean isCollected = mEpisodeCursor.getInt(EpisodeQuery.COLLECTED) == 1 ? true : false; new FlagTask(getActivity(), getShowId()) .episodeCollected(mEpisodeCursor.getInt(EpisodeQuery._ID), season, episode, !isCollected) .execute(); } } private void onToggleShowFavorited(View v) { if (v.getTag() == null) { return; } boolean isFavorited = (Boolean) v.getTag(); ContentValues values = new ContentValues(); values.put(Shows.FAVORITE, !isFavorited); getActivity().getContentResolver().update( Shows.buildShowUri(String.valueOf(getShowId())), values, null, null); Utils.runNotificationService(getActivity()); } private String buildEpisodeString(int seasonNumber, int episodeNumber, String episodeTitle) { final SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(getActivity()); return Utils.getNextEpisodeString(prefs, seasonNumber, episodeNumber, episodeTitle); } public static class EpisodeLoader extends CursorLoader { private String mShowId; public EpisodeLoader(Context context, String showId) { super(context); mShowId = showId; setProjection(EpisodeQuery.PROJECTION); } @Override public Cursor loadInBackground() { // get episode id, set query params int episodeId = (int) DBUtils.updateLatestEpisode(getContext(), mShowId); setUri(Episodes.buildEpisodeWithShowUri(String.valueOf(episodeId))); return super.loadInBackground(); } } interface EpisodeQuery { String[] PROJECTION = new String[] { Tables.EPISODES + "." + Episodes._ID, Shows.REF_SHOW_ID, Episodes.OVERVIEW, Episodes.NUMBER, Episodes.SEASON, Episodes.WATCHED, Episodes.FIRSTAIREDMS, Episodes.GUESTSTARS, Tables.EPISODES + "." + Episodes.RATING, Episodes.IMAGE, Episodes.DVDNUMBER, Episodes.TITLE, Seasons.REF_SEASON_ID, Episodes.COLLECTED, Episodes.IMDBID, Episodes.ABSOLUTE_NUMBER }; int _ID = 0; int REF_SHOW_ID = 1; int OVERVIEW = 2; int NUMBER = 3; int SEASON = 4; int WATCHED = 5; int FIRSTAIREDMS = 6; int GUESTSTARS = 7; int RATING = 8; int IMAGE = 9; int DVDNUMBER = 10; int TITLE = 11; int REF_SEASON_ID = 12; int COLLECTED = 13; int IMDBID = 14; int ABSOLUTE_NUMBER = 15; } interface ShowQuery { String[] PROJECTION = new String[] { Shows._ID, Shows.TITLE, Shows.STATUS, Shows.AIRSTIME, Shows.AIRSDAYOFWEEK, Shows.NETWORK, Shows.POSTER, Shows.IMDBID, Shows.RUNTIME, Shows.FAVORITE }; int SHOW_TITLE = 1; int SHOW_STATUS = 2; int SHOW_AIRSTIME = 3; int SHOW_AIRSDAYOFWEEK = 4; int SHOW_NETWORK = 5; int SHOW_POSTER = 6; int SHOW_IMDBID = 7; int SHOW_RUNTIME = 8; int SHOW_FAVORITE = 9; } @Override public Loader<Cursor> onCreateLoader(int id, Bundle args) { switch (id) { case EPISODE_LOADER_ID: default: return new EpisodeLoader(getActivity(), String.valueOf(getShowId())); case SHOW_LOADER_ID: return new CursorLoader(getActivity(), Shows.buildShowUri(String .valueOf(getShowId())), ShowQuery.PROJECTION, null, null, null); } } @SuppressLint("NewApi") @Override public void onLoadFinished(Loader<Cursor> loader, Cursor data) { if (isAdded()) { switch (loader.getId()) { case EPISODE_LOADER_ID: getSherlockActivity().invalidateOptionsMenu(); onPopulateEpisodeData(data); break; case SHOW_LOADER_ID: onPopulateShowData(data); break; } } } @Override public void onLoaderReset(Loader<Cursor> loader) { switch (loader.getId()) { case EPISODE_LOADER_ID: mEpisodeCursor = null; break; case SHOW_LOADER_ID: mShowCursor = null; break; } } public void onEvent(TraktActionCompleteEvent event) { if (event.mTraktTaskArgs.getInt(TraktTask.InitBundle.TRAKTACTION) == TraktAction.RATE_EPISODE.index) { onLoadTraktRatings(false); } } private void fireTrackerEvent(String label) { EasyTracker.getTracker().sendEvent(TAG, "Action Item", label, (long) 0); } @SuppressLint("NewApi") private void onPopulateEpisodeData(Cursor episode) { mEpisodeCursor = episode; final TextView episodeTitle = (TextView) getView().findViewById(R.id.episodeTitle); final TextView episodeTime = (TextView) getView().findViewById(R.id.episodeTime); final TextView episodeInfo = (TextView) getView().findViewById(R.id.episodeInfo); final View episodemeta = getView().findViewById(R.id.episode_meta_container); final View episodePrimaryContainer = getView().findViewById(R.id.episode_primary_container); final View episodePrimaryClicker = getView().findViewById(R.id.episode_primary_click_dummy); final View buttons = getView().findViewById(R.id.buttonbar); final View ratings = getView().findViewById(R.id.ratingbar); if (episode != null && episode.moveToFirst()) { episodePrimaryContainer.setBackgroundResource(0); // some episode properties final int episodeId = episode.getInt(EpisodeQuery._ID); final int seasonNumber = episode.getInt(EpisodeQuery.SEASON); final int episodeNumber = episode.getInt(EpisodeQuery.NUMBER); final int episodeAbsoluteNumber = episode.getInt(EpisodeQuery.ABSOLUTE_NUMBER); final String title = episode.getString(EpisodeQuery.TITLE); // title episodeTitle.setText(title); episodeTitle.setVisibility(View.VISIBLE); // number StringBuilder infoText = new StringBuilder(); infoText.append(getString(R.string.season)).append(" ").append(seasonNumber); infoText.append(" "); infoText.append(getString(R.string.episode)).append(" ") .append(episodeNumber); if (episodeAbsoluteNumber > 0 && episodeAbsoluteNumber != episodeNumber) { infoText.append(" (").append(episodeAbsoluteNumber).append(")"); } episodeInfo.setText(infoText); episodeInfo.setVisibility(View.VISIBLE); // air date long airtime = episode.getLong(EpisodeQuery.FIRSTAIREDMS); if (airtime != -1) { final String[] dayAndTime = Utils.formatToTimeAndDay(airtime, getActivity()); episodeTime.setText(new StringBuilder().append(dayAndTime[2]).append(" (") .append(dayAndTime[1]) .append(")")); episodeTime.setVisibility(View.VISIBLE); } // make title and image clickable episodePrimaryClicker.setOnClickListener(new OnClickListener() { @TargetApi(Build.VERSION_CODES.JELLY_BEAN) @Override public void onClick(View view) { // display episode details Intent intent = new Intent(getActivity(), EpisodesActivity.class); intent.putExtra(EpisodesActivity.InitBundle.EPISODE_TVDBID, episodeId); startActivity(intent); getActivity().overridePendingTransition(R.anim.blow_up_enter, R.anim.blow_up_exit); } }); episodePrimaryClicker.setFocusable(true); if (mMultiPane) { buttons.setVisibility(View.VISIBLE); // check-in button buttons.findViewById(R.id.checkinButton).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onCheckIn(); } }); // watched button View watchedButton = buttons.findViewById(R.id.watchedButton); watchedButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onFlagWatched(); } }); CheatSheet.setup(watchedButton, R.string.mark_episode); // collected button boolean isCollected = episode.getInt(EpisodeQuery.COLLECTED) == 1; ImageButton collectedButton = (ImageButton) buttons .findViewById(R.id.collectedButton); collectedButton.setImageResource(isCollected ? R.drawable.ic_collected : R.drawable.ic_action_collect); collectedButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onToggleCollected(); } }); CheatSheet.setup(collectedButton, isCollected ? R.string.uncollect : R.string.collect); // calendar button View calendarButton = buttons.findViewById(R.id.calendarButton); calendarButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onAddCalendarEvent(); } }); CheatSheet.setup(calendarButton); } else { buttons.setVisibility(View.GONE); } ratings.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onRateOnTrakt(); } }); ratings.setFocusable(true); - CheatSheet.setup(ratings, R.string.menu_rate_trakt); + CheatSheet.setup(ratings, R.string.menu_rate_episode); // load all other info onLoadEpisodeDetails(episode); // episode image onLoadImage(episode.getString(EpisodeQuery.IMAGE)); episodemeta.setVisibility(View.VISIBLE); } else { // no next episode: display single line info text, remove other // views episodeTitle.setText(R.string.no_nextepisode); episodeTime.setVisibility(View.GONE); episodeInfo.setVisibility(View.GONE); episodemeta.setVisibility(View.GONE); episodePrimaryContainer.setBackgroundResource(R.color.background_dim); episodePrimaryClicker.setOnClickListener(null); episodePrimaryClicker.setClickable(false); episodePrimaryClicker.setFocusable(false); buttons.setVisibility(View.GONE); ratings.setOnClickListener(null); ratings.setClickable(false); ratings.setFocusable(false); onLoadImage(null); } // enable/disable applicable menu items getSherlockActivity().invalidateOptionsMenu(); // animate view into visibility final View contentContainer = getView().findViewById(R.id.content_container); if (contentContainer.getVisibility() == View.GONE) { final View progressContainer = getView().findViewById(R.id.progress_container); progressContainer.startAnimation(AnimationUtils .loadAnimation(episodemeta.getContext(), android.R.anim.fade_out)); progressContainer.setVisibility(View.GONE); contentContainer.startAnimation(AnimationUtils .loadAnimation(episodemeta.getContext(), android.R.anim.fade_in)); contentContainer.setVisibility(View.VISIBLE); } } private void onLoadEpisodeDetails(final Cursor episode) { final int seasonNumber = episode.getInt(EpisodeQuery.SEASON); final int episodeNumber = episode.getInt(EpisodeQuery.NUMBER); final String episodeTitle = episode.getString(EpisodeQuery.TITLE); // Description, DVD episode number, guest stars, absolute number ((TextView) getView().findViewById(R.id.TextViewEpisodeDescription)).setText(episode .getString(EpisodeQuery.OVERVIEW)); Utils.setLabelValueOrHide(getView().findViewById(R.id.labelDvd), (TextView) getView() .findViewById(R.id.textViewEpisodeDVDnumber), episode .getDouble(EpisodeQuery.DVDNUMBER)); Utils.setLabelValueOrHide(getView().findViewById(R.id.labelGuestStars), (TextView) getView().findViewById(R.id.TextViewEpisodeGuestStars), Utils .splitAndKitTVDBStrings(episode.getString(EpisodeQuery.GUESTSTARS))); // TVDb rating final String ratingText = episode.getString(EpisodeQuery.RATING); if (ratingText != null && ratingText.length() != 0) { ((RatingBar) getView().findViewById(R.id.bar)).setProgress((int) (Double .valueOf(ratingText) / 0.1)); ((TextView) getView().findViewById(R.id.value)).setText(ratingText + "/10"); } // Google Play button View playButton = getView().findViewById(R.id.buttonGooglePlay); Utils.setUpGooglePlayButton(mShowTitle + " " + episodeTitle, playButton, TAG); // Amazon button View amazonButton = getView().findViewById(R.id.buttonAmazon); Utils.setUpAmazonButton(mShowTitle + " " + episodeTitle, amazonButton, TAG); // IMDb button String imdbId = episode.getString(EpisodeQuery.IMDBID); if (TextUtils.isEmpty(imdbId) && mShowCursor != null) { // fall back to show IMDb id imdbId = mShowCursor.getString(ShowQuery.SHOW_IMDBID); } Utils.setUpImdbButton(imdbId, getView().findViewById(R.id.buttonShowInfoIMDB), TAG, getActivity()); // TVDb button final String seasonId = episode.getString(EpisodeQuery.REF_SEASON_ID); getView().findViewById(R.id.buttonTVDB).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { Intent i = new Intent(Intent.ACTION_VIEW, Uri .parse(Constants.TVDB_EPISODE_URL_1 + getShowId() + Constants.TVDB_EPISODE_URL_2 + seasonId + Constants.TVDB_EPISODE_URL_3 + mEpisodeCursor.getString(EpisodeQuery._ID))); startActivity(i); } } }); // trakt shouts button getView().findViewById(R.id.buttonShouts).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst()) { Intent i = new Intent(getActivity(), TraktShoutsActivity.class); i.putExtras(TraktShoutsActivity.createInitBundleEpisode(getShowId(), seasonNumber, episodeNumber, episodeTitle)); startActivity(i); } } }); // trakt ratings onLoadTraktRatings(true); } private void onLoadTraktRatings(boolean isUseCachedValues) { if (mEpisodeCursor != null && mEpisodeCursor.moveToFirst() && (mTraktTask == null || mTraktTask.getStatus() != AsyncTask.Status.RUNNING)) { int seasonNumber = mEpisodeCursor.getInt(EpisodeQuery.SEASON); int episodeNumber = mEpisodeCursor.getInt(EpisodeQuery.NUMBER); mTraktTask = new TraktSummaryTask(getSherlockActivity(), getView(), isUseCachedValues) .episode(getShowId(), seasonNumber, episodeNumber); AndroidUtils.executeAsyncTask(mTraktTask, new Void[] {}); } } private void onLoadImage(String imagePath) { final FrameLayout container = (FrameLayout) getView().findViewById(R.id.imageContainer); // clean up a previous task if (mArtTask != null) { mArtTask.cancel(true); mArtTask = null; } mArtTask = (FetchArtTask) new FetchArtTask(imagePath, container, getActivity()); AndroidUtils.executeAsyncTask(mArtTask, new Void[] { null }); } private void onPopulateShowData(Cursor show) { if (show == null || !show.moveToFirst()) { return; } mShowCursor = show; // title mShowTitle = show.getString(ShowQuery.SHOW_TITLE); ((TextView) getView().findViewById(R.id.seriesname)).setText(mShowTitle); // set show title in action bar final ActionBar actionBar = getSherlockActivity().getSupportActionBar(); actionBar.setTitle(mShowTitle); // status final TextView statusText = (TextView) getView().findViewById(R.id.showStatus); int status = show.getInt(ShowQuery.SHOW_STATUS); if (status == 1) { TypedValue outValue = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.textColorSgGreen, outValue, true); statusText.setTextColor(getResources().getColor(outValue.resourceId)); statusText.setText(getString(R.string.show_isalive)); } else if (status == 0) { statusText.setTextColor(Color.GRAY); statusText.setText(getString(R.string.show_isnotalive)); } // favorite final ImageView favorited = (ImageView) getView().findViewById(R.id.imageViewFavorite); boolean isFavorited = show.getInt(ShowQuery.SHOW_FAVORITE) == 1; if (isFavorited) { TypedValue outValue = new TypedValue(); getSherlockActivity().getTheme().resolveAttribute(R.attr.drawableStar, outValue, true); favorited.setImageResource(outValue.resourceId); } else { favorited.setImageResource(R.drawable.ic_action_star_0); } CheatSheet.setup(favorited, isFavorited ? R.string.context_unfavorite : R.string.context_favorite); favorited.setTag(isFavorited); // poster final ImageView background = (ImageView) getView().findViewById(R.id.background); Utils.setPosterBackground(background, show.getString(ShowQuery.SHOW_POSTER), getActivity()); // air time and network final StringBuilder timeAndNetwork = new StringBuilder(); final String airsDay = show.getString(ShowQuery.SHOW_AIRSDAYOFWEEK); final long airstime = show.getLong(ShowQuery.SHOW_AIRSTIME); if (!TextUtils.isEmpty(airsDay) && airstime != -1) { String[] values = Utils.parseMillisecondsToTime(airstime, airsDay, getActivity()); timeAndNetwork.append(values[1]).append(" ").append(values[0]); } else { timeAndNetwork.append(getString(R.string.show_noairtime)); } final String network = show.getString(ShowQuery.SHOW_NETWORK); if (!TextUtils.isEmpty(network)) { timeAndNetwork.append(" ").append(getString(R.string.show_network)).append(" ") .append(network); } ((TextView) getActivity().findViewById(R.id.showmeta)).setText(timeAndNetwork.toString()); } } diff --git a/SeriesGuide/src/com/battlelancer/seriesguide/ui/ShowInfoFragment.java b/SeriesGuide/src/com/battlelancer/seriesguide/ui/ShowInfoFragment.java index 384e8afce..bf0220b84 100644 --- a/SeriesGuide/src/com/battlelancer/seriesguide/ui/ShowInfoFragment.java +++ b/SeriesGuide/src/com/battlelancer/seriesguide/ui/ShowInfoFragment.java @@ -1,320 +1,320 @@ package com.battlelancer.seriesguide.ui; import android.content.Intent; import android.graphics.Color; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.app.LoaderManager.LoaderCallbacks; import android.support.v4.app.ShareCompat; import android.support.v4.app.ShareCompat.IntentBuilder; import android.support.v4.content.Loader; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.RatingBar; import android.widget.TextView; import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.battlelancer.seriesguide.Constants; import com.battlelancer.seriesguide.enums.TraktAction; import com.battlelancer.seriesguide.items.Series; import com.battlelancer.seriesguide.loaders.ShowLoader; import com.battlelancer.seriesguide.provider.SeriesContract.ListItemTypes; import com.battlelancer.seriesguide.ui.dialogs.ListsDialogFragment; import com.battlelancer.seriesguide.ui.dialogs.TraktRateDialogFragment; import com.battlelancer.seriesguide.util.ImageProvider; import com.battlelancer.seriesguide.util.TraktSummaryTask; import com.battlelancer.seriesguide.util.TraktTask; import com.battlelancer.seriesguide.util.TraktTask.TraktActionCompleteEvent; import com.battlelancer.seriesguide.util.Utils; import com.google.analytics.tracking.android.EasyTracker; import com.uwetrottmann.androidutils.AndroidUtils; import com.uwetrottmann.androidutils.CheatSheet; import com.uwetrottmann.seriesguide.R; import de.greenrobot.event.EventBus; public class ShowInfoFragment extends SherlockFragment implements LoaderCallbacks<Series> { public interface InitBundle { String SHOW_TVDBID = "tvdbid"; } private static final String TAG = "Show Info"; private static final int LOADER_ID = R.layout.show_info; public static ShowInfoFragment newInstance(int showTvdbId) { ShowInfoFragment f = new ShowInfoFragment(); Bundle args = new Bundle(); args.putInt(InitBundle.SHOW_TVDBID, showTvdbId); f.setArguments(args); return f; } private Series mShow; private TraktSummaryTask mTraktTask; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.show_info, container, false); } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); getLoaderManager().initLoader(LOADER_ID, null, this); setHasOptionsMenu(true); } @Override public void onResume() { super.onResume(); EventBus.getDefault().register(this); } @Override public void onPause() { super.onPause(); EventBus.getDefault().unregister(this); } @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.showinfo_menu, menu); } @Override public boolean onOptionsItemSelected(MenuItem item) { int itemId = item.getItemId(); if (itemId == R.id.menu_show_rate) { onRateOnTrakt(); return true; } else if (itemId == R.id.menu_show_manage_lists) { ListsDialogFragment.showListsDialog(String.valueOf(getShowTvdbId()), ListItemTypes.SHOW, getFragmentManager()); return true; } else if (itemId == R.id.menu_show_share) { onShareShow(); return true; } return super.onOptionsItemSelected(item); } @Override public Loader<Series> onCreateLoader(int loaderId, Bundle args) { return new ShowLoader(getActivity(), getShowTvdbId()); } @Override public void onLoadFinished(Loader<Series> loader, Series data) { if (data != null) { mShow = data; } if (isAdded()) { onPopulateShowData(); } } @Override public void onLoaderReset(Loader<Series> loader) { } public void onEvent(TraktActionCompleteEvent event) { if (event.mTraktTaskArgs.getInt(TraktTask.InitBundle.TRAKTACTION) == TraktAction.RATE_EPISODE.index) { onLoadTraktRatings(false); } } private void onPopulateShowData() { if (mShow == null) { return; } TextView seriesname = (TextView) getView().findViewById(R.id.title); TextView overview = (TextView) getView().findViewById(R.id.TextViewShowInfoOverview); TextView info = (TextView) getView().findViewById(R.id.showInfo); TextView status = (TextView) getView().findViewById(R.id.showStatus); // Name seriesname.setText(mShow.getTitle()); // Overview if (TextUtils.isEmpty(mShow.getOverview())) { overview.setText(""); } else { overview.setText(mShow.getOverview()); } // air time StringBuilder infoText = new StringBuilder(); if (mShow.getAirsDayOfWeek().length() == 0 || mShow.getAirsTime() == -1) { infoText.append(getString(R.string.show_noairtime)); } else { String[] values = Utils.parseMillisecondsToTime(mShow.getAirsTime(), mShow.getAirsDayOfWeek(), getActivity()); infoText.append(values[1]).append(" ").append(values[0]); } // network if (mShow.getNetwork().length() != 0) { infoText.append(" ").append(getString(R.string.show_network)).append(" ") .append(mShow.getNetwork()); } info.setText(infoText); // Running state if (mShow.getStatus() == 1) { TypedValue outValue = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.textColorSgGreen, outValue, true); status.setTextColor(getResources().getColor(outValue.resourceId)); status.setText(getString(R.string.show_isalive)); } else if (mShow.getStatus() == 0) { status.setTextColor(Color.GRAY); status.setText(getString(R.string.show_isnotalive)); } // first airdate long airtime = Utils.buildEpisodeAirtime(mShow.getFirstAired(), mShow.getAirsTime()); Utils.setValueOrPlaceholder(getView().findViewById(R.id.TextViewShowInfoFirstAirdate), Utils.formatToDate(airtime, getActivity())); // Others Utils.setValueOrPlaceholder(getView().findViewById(R.id.TextViewShowInfoActors), Utils.splitAndKitTVDBStrings(mShow.getActors())); Utils.setValueOrPlaceholder(getView().findViewById(R.id.TextViewShowInfoContentRating), mShow.getContentRating()); Utils.setValueOrPlaceholder(getView().findViewById(R.id.TextViewShowInfoGenres), Utils.splitAndKitTVDBStrings(mShow.getGenres())); Utils.setValueOrPlaceholder(getView().findViewById(R.id.TextViewShowInfoRuntime), mShow.getRuntime() + " " + getString(R.string.show_airtimeunit)); // TVDb rating String ratingText = mShow.getRating(); if (ratingText != null && ratingText.length() != 0) { RatingBar ratingBar = (RatingBar) getView().findViewById(R.id.bar); ratingBar.setProgress((int) (Double.valueOf(ratingText) / 0.1)); TextView rating = (TextView) getView().findViewById(R.id.value); rating.setText(ratingText + "/10"); } View ratings = getView().findViewById(R.id.ratingbar); ratings.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { onRateOnTrakt(); } }); ratings.setFocusable(true); - CheatSheet.setup(ratings, R.string.menu_rate_trakt); + CheatSheet.setup(ratings, R.string.menu_rate_show); // Last edit date TextView lastEdit = (TextView) getView().findViewById(R.id.lastEdit); long lastEditRaw = mShow.getLastEdit(); if (lastEditRaw > 0) { lastEdit.setText(DateUtils.formatDateTime(getActivity(), lastEditRaw * 1000, DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME)); } else { lastEdit.setText(R.string.unknown); } // Google Play button View playButton = getView().findViewById(R.id.buttonGooglePlay); Utils.setUpGooglePlayButton(mShow.getTitle(), playButton, TAG); // Amazon button View amazonButton = getView().findViewById(R.id.buttonAmazon); Utils.setUpAmazonButton(mShow.getTitle(), amazonButton, TAG); // IMDb button View imdbButton = (View) getView().findViewById(R.id.buttonShowInfoIMDB); final String imdbId = mShow.getImdbId(); Utils.setUpImdbButton(imdbId, imdbButton, TAG, getActivity()); // TVDb button View tvdbButton = (View) getView().findViewById(R.id.buttonTVDB); final String tvdbId = mShow.getId(); if (tvdbButton != null) { tvdbButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { fireTrackerEvent("TVDb"); Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.TVDB_SHOW_URL + tvdbId)); startActivity(i); } }); } // Shout button getView().findViewById(R.id.buttonShouts).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { fireTrackerEvent("Shouts"); Intent i = new Intent(getActivity(), TraktShoutsActivity.class); i.putExtras(TraktShoutsActivity.createInitBundleShow(mShow.getTitle(), getShowTvdbId())); startActivity(i); } }); // Poster final ImageView poster = (ImageView) getView().findViewById(R.id.ImageViewShowInfoPoster); ImageProvider.getInstance(getActivity()).loadImage(poster, mShow.getPoster(), false); // Utils.setPosterBackground((ImageView) getView().findViewById(R.id.background), // mShow.getPoster(), getActivity()); // trakt ratings onLoadTraktRatings(true); } private void fireTrackerEvent(String label) { EasyTracker.getTracker().sendEvent(TAG, "Context Item", label, (long) 0); } private int getShowTvdbId() { return getArguments().getInt(InitBundle.SHOW_TVDBID); } private void onRateOnTrakt() { TraktRateDialogFragment newFragment = TraktRateDialogFragment .newInstance(getShowTvdbId()); newFragment.show(getFragmentManager(), "traktratedialog"); } private void onLoadTraktRatings(boolean isUseCachedValues) { if (mShow != null && (mTraktTask == null || mTraktTask.getStatus() != AsyncTask.Status.RUNNING)) { mTraktTask = new TraktSummaryTask(getActivity(), getView().findViewById( R.id.ratingbar), isUseCachedValues).show(getShowTvdbId()); AndroidUtils.executeAsyncTask(mTraktTask, new Void[] {}); } } private void onShareShow() { if (mShow != null) { // Share intent IntentBuilder ib = ShareCompat.IntentBuilder .from(getActivity()) .setChooserTitle(R.string.share_show) .setText( getString(R.string.share_checkout) + " \"" + mShow.getTitle() + "\" " + Utils.IMDB_TITLE_URL + mShow.getImdbId()) .setType("text/plain"); ib.startChooser(); } } }

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index b0bf292e..fe566418 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1,603 +1,604 @@ /* * Copyright (C) 2009 The Android Open Source Project * * 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 com.android.camera; import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.res.Resources; import android.content.res.TypedArray; import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.Camera.Size; import android.media.CamcorderProfile; import android.util.FloatMath; import android.util.Log; import com.android.gallery3d.common.ApiHelper; import java.util.ArrayList; import java.util.List; /** * Provides utilities and keys for Camera settings. */ public class CameraSettings { private static final int NOT_FOUND = -1; public static final String KEY_VERSION = "pref_version_key"; public static final String KEY_LOCAL_VERSION = "pref_local_version_key"; public static final String KEY_RECORD_LOCATION = RecordLocationPreference.KEY; public static final String KEY_VIDEO_QUALITY = "pref_video_quality_key"; public static final String KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL = "pref_video_time_lapse_frame_interval_key"; public static final String KEY_PICTURE_SIZE = "pref_camera_picturesize_key"; public static final String KEY_JPEG_QUALITY = "pref_camera_jpegquality_key"; public static final String KEY_FOCUS_MODE = "pref_camera_focusmode_key"; public static final String KEY_FLASH_MODE = "pref_camera_flashmode_key"; public static final String KEY_VIDEOCAMERA_FLASH_MODE = "pref_camera_video_flashmode_key"; public static final String KEY_WHITE_BALANCE = "pref_camera_whitebalance_key"; public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key"; public static final String KEY_EXPOSURE = "pref_camera_exposure_key"; public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key"; public static final String KEY_CAMERA_ID = "pref_camera_id_key"; public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key"; public static final String KEY_CAMERA_FIRST_USE_HINT_SHOWN = "pref_camera_first_use_hint_shown_key"; public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN = "pref_video_first_use_hint_shown_key"; public static final String EXPOSURE_DEFAULT_VALUE = "0"; public static final int CURRENT_VERSION = 5; public static final int CURRENT_LOCAL_VERSION = 2; private static final String TAG = "CameraSettings"; private final Context mContext; private final Parameters mParameters; private final CameraInfo[] mCameraInfo; private final int mCameraId; public CameraSettings(Activity activity, Parameters parameters, int cameraId, CameraInfo[] cameraInfo) { mContext = activity; mParameters = parameters; mCameraId = cameraId; mCameraInfo = cameraInfo; } public PreferenceGroup getPreferenceGroup(int preferenceRes) { PreferenceInflater inflater = new PreferenceInflater(mContext); PreferenceGroup group = (PreferenceGroup) inflater.inflate(preferenceRes); if (mParameters != null) initPreference(group); return group; } @TargetApi(ApiHelper.VERSION_CODES.HONEYCOMB) public static String getDefaultVideoQuality(int cameraId, String defaultQuality) { if (ApiHelper.HAS_FINE_RESOLUTION_QUALITY_LEVELS) { if (CamcorderProfile.hasProfile( cameraId, Integer.valueOf(defaultQuality))) { return defaultQuality; } } return Integer.toString(CamcorderProfile.QUALITY_HIGH); } public static void initialCameraPictureSize( Context context, Parameters parameters) { // When launching the camera app first time, we will set the picture // size to the first one in the list defined in "arrays.xml" and is also // supported by the driver. List<Size> supported = parameters.getSupportedPictureSizes(); if (supported == null) return; for (String candidate : context.getResources().getStringArray( R.array.pref_camera_picturesize_entryvalues)) { if (setCameraPictureSize(candidate, supported, parameters)) { SharedPreferences.Editor editor = ComboPreferences .get(context).edit(); editor.putString(KEY_PICTURE_SIZE, candidate); editor.apply(); return; } } Log.e(TAG, "No supported picture size found"); } public static void removePreferenceFromScreen( PreferenceGroup group, String key) { removePreference(group, key); } public static boolean setCameraPictureSize( String candidate, List<Size> supported, Parameters parameters) { int index = candidate.indexOf('x'); if (index == NOT_FOUND) return false; int width = Integer.parseInt(candidate.substring(0, index)); int height = Integer.parseInt(candidate.substring(index + 1)); for (Size size : supported) { if (size.width == width && size.height == height) { parameters.setPictureSize(width, height); return true; } } return false; } public static int getMaxVideoDuration(Context context) { int duration = 0; // in milliseconds, 0 means unlimited. try { duration = context.getResources().getInteger(R.integer.max_video_recording_length); } catch (Resources.NotFoundException ex) { } return duration; } private void initPreference(PreferenceGroup group) { ListPreference videoQuality = group.findPreference(KEY_VIDEO_QUALITY); ListPreference timeLapseInterval = group.findPreference(KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL); ListPreference pictureSize = group.findPreference(KEY_PICTURE_SIZE); ListPreference whiteBalance = group.findPreference(KEY_WHITE_BALANCE); ListPreference sceneMode = group.findPreference(KEY_SCENE_MODE); ListPreference flashMode = group.findPreference(KEY_FLASH_MODE); ListPreference focusMode = group.findPreference(KEY_FOCUS_MODE); IconListPreference exposure = (IconListPreference) group.findPreference(KEY_EXPOSURE); IconListPreference cameraIdPref = (IconListPreference) group.findPreference(KEY_CAMERA_ID); ListPreference videoFlashMode = group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE); ListPreference videoEffect = group.findPreference(KEY_VIDEO_EFFECT); ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR); // Since the screen could be loaded from different resources, we need // to check if the preference is available here if (videoQuality != null) { filterUnsupportedOptions(group, videoQuality, getSupportedVideoQuality()); } if (pictureSize != null) { filterUnsupportedOptions(group, pictureSize, sizeListToStringList( mParameters.getSupportedPictureSizes())); filterSimilarPictureSize(group, pictureSize); } if (whiteBalance != null) { filterUnsupportedOptions(group, whiteBalance, mParameters.getSupportedWhiteBalance()); } if (sceneMode != null) { filterUnsupportedOptions(group, sceneMode, mParameters.getSupportedSceneModes()); } if (flashMode != null) { filterUnsupportedOptions(group, flashMode, mParameters.getSupportedFlashModes()); } if (focusMode != null) { if (!Util.isFocusAreaSupported(mParameters)) { filterUnsupportedOptions(group, focusMode, mParameters.getSupportedFocusModes()); } else { // Remove the focus mode if we can use tap-to-focus. removePreference(group, focusMode.getKey()); } } if (videoFlashMode != null) { filterUnsupportedOptions(group, videoFlashMode, mParameters.getSupportedFlashModes()); } if (exposure != null) buildExposureCompensation(group, exposure); if (cameraIdPref != null) buildCameraId(group, cameraIdPref); if (timeLapseInterval != null) { if (ApiHelper.HAS_TIME_LAPSE_RECORDING) { resetIfInvalid(timeLapseInterval); } else { removePreference(group, timeLapseInterval.getKey()); } } if (videoEffect != null) { if (ApiHelper.HAS_EFFECTS_RECORDING) { initVideoEffect(group, videoEffect); resetIfInvalid(videoEffect); } else { filterUnsupportedOptions(group, videoEffect, null); } } if (cameraHdr != null && (!ApiHelper.HAS_CAMERA_HDR || !Util.isCameraHdrSupported(mParameters))) { removePreference(group, cameraHdr.getKey()); } } private void buildExposureCompensation( PreferenceGroup group, IconListPreference exposure) { int max = mParameters.getMaxExposureCompensation(); int min = mParameters.getMinExposureCompensation(); - if (max == 0 && min == 0) { + //checks if value is both 0 or both values either negitive + if ((max == 0 && min == 0) || (min < 0 || max < 0)) { removePreference(group, exposure.getKey()); return; } float step = mParameters.getExposureCompensationStep(); // show only integer values for exposure compensation int maxValue = (int) FloatMath.floor(max * step); int minValue = (int) FloatMath.ceil(min * step); CharSequence entries[] = new CharSequence[maxValue - minValue + 1]; CharSequence entryValues[] = new CharSequence[maxValue - minValue + 1]; int[] icons = new int[maxValue - minValue + 1]; TypedArray iconIds = mContext.getResources().obtainTypedArray( R.array.pref_camera_exposure_icons); for (int i = minValue; i <= maxValue; ++i) { entryValues[maxValue - i] = Integer.toString(Math.round(i / step)); StringBuilder builder = new StringBuilder(); if (i > 0) builder.append('+'); entries[maxValue - i] = builder.append(i).toString(); icons[maxValue - i] = iconIds.getResourceId(3 + i, 0); } exposure.setUseSingleIcon(true); exposure.setEntries(entries); exposure.setEntryValues(entryValues); exposure.setLargeIconIds(icons); } private void buildCameraId( PreferenceGroup group, IconListPreference preference) { int numOfCameras = mCameraInfo.length; if (numOfCameras < 2) { removePreference(group, preference.getKey()); return; } CharSequence[] entryValues = new CharSequence[numOfCameras]; for (int i = 0; i < numOfCameras; ++i) { entryValues[i] = "" + i; } preference.setEntryValues(entryValues); } private static boolean removePreference(PreferenceGroup group, String key) { for (int i = 0, n = group.size(); i < n; i++) { CameraPreference child = group.get(i); if (child instanceof PreferenceGroup) { if (removePreference((PreferenceGroup) child, key)) { return true; } } if (child instanceof ListPreference && ((ListPreference) child).getKey().equals(key)) { group.removePreference(i); return true; } } return false; } private void filterUnsupportedOptions(PreferenceGroup group, ListPreference pref, List<String> supported) { // Remove the preference if the parameter is not supported or there is // only one options for the settings. if (supported == null || supported.size() <= 1) { removePreference(group, pref.getKey()); return; } pref.filterUnsupported(supported); if (pref.getEntries().length <= 1) { removePreference(group, pref.getKey()); return; } resetIfInvalid(pref); } private void filterSimilarPictureSize(PreferenceGroup group, ListPreference pref) { pref.filterDuplicated(); if (pref.getEntries().length <= 1) { removePreference(group, pref.getKey()); return; } resetIfInvalid(pref); } private void resetIfInvalid(ListPreference pref) { // Set the value to the first entry if it is invalid. String value = pref.getValue(); if (pref.findIndexOfValue(value) == NOT_FOUND) { pref.setValueIndex(0); } } private static List<String> sizeListToStringList(List<Size> sizes) { ArrayList<String> list = new ArrayList<String>(); for (Size size : sizes) { list.add(String.format("%dx%d", size.width, size.height)); } return list; } public static void upgradeLocalPreferences(SharedPreferences pref) { int version; try { version = pref.getInt(KEY_LOCAL_VERSION, 0); } catch (Exception ex) { version = 0; } if (version == CURRENT_LOCAL_VERSION) return; SharedPreferences.Editor editor = pref.edit(); if (version == 1) { // We use numbers to represent the quality now. The quality definition is identical to // that of CamcorderProfile.java. editor.remove("pref_video_quality_key"); } editor.putInt(KEY_LOCAL_VERSION, CURRENT_LOCAL_VERSION); editor.apply(); } public static void upgradeGlobalPreferences(SharedPreferences pref) { upgradeOldVersion(pref); upgradeCameraId(pref); } private static void upgradeOldVersion(SharedPreferences pref) { int version; try { version = pref.getInt(KEY_VERSION, 0); } catch (Exception ex) { version = 0; } if (version == CURRENT_VERSION) return; SharedPreferences.Editor editor = pref.edit(); if (version == 0) { // We won't use the preference which change in version 1. // So, just upgrade to version 1 directly version = 1; } if (version == 1) { // Change jpeg quality {65,75,85} to {normal,fine,superfine} String quality = pref.getString(KEY_JPEG_QUALITY, "85"); if (quality.equals("65")) { quality = "normal"; } else if (quality.equals("75")) { quality = "fine"; } else { quality = "superfine"; } editor.putString(KEY_JPEG_QUALITY, quality); version = 2; } if (version == 2) { editor.putString(KEY_RECORD_LOCATION, pref.getBoolean(KEY_RECORD_LOCATION, false) ? RecordLocationPreference.VALUE_ON : RecordLocationPreference.VALUE_NONE); version = 3; } if (version == 3) { // Just use video quality to replace it and // ignore the current settings. editor.remove("pref_camera_videoquality_key"); editor.remove("pref_camera_video_duration_key"); } editor.putInt(KEY_VERSION, CURRENT_VERSION); editor.apply(); } private static void upgradeCameraId(SharedPreferences pref) { // The id stored in the preference may be out of range if we are running // inside the emulator and a webcam is removed. // Note: This method accesses the global preferences directly, not the // combo preferences. int cameraId = readPreferredCameraId(pref); if (cameraId == 0) return; // fast path int n = CameraHolder.instance().getNumberOfCameras(); if (cameraId < 0 || cameraId >= n) { writePreferredCameraId(pref, 0); } } public static int readPreferredCameraId(SharedPreferences pref) { return Integer.parseInt(pref.getString(KEY_CAMERA_ID, "0")); } public static void writePreferredCameraId(SharedPreferences pref, int cameraId) { Editor editor = pref.edit(); editor.putString(KEY_CAMERA_ID, Integer.toString(cameraId)); editor.apply(); } public static int readExposure(ComboPreferences preferences) { String exposure = preferences.getString( CameraSettings.KEY_EXPOSURE, EXPOSURE_DEFAULT_VALUE); try { return Integer.parseInt(exposure); } catch (Exception ex) { Log.e(TAG, "Invalid exposure: " + exposure); } return 0; } public static int readEffectType(SharedPreferences pref) { String effectSelection = pref.getString(KEY_VIDEO_EFFECT, "none"); if (effectSelection.equals("none")) { return EffectsRecorder.EFFECT_NONE; } else if (effectSelection.startsWith("goofy_face")) { return EffectsRecorder.EFFECT_GOOFY_FACE; } else if (effectSelection.startsWith("backdropper")) { return EffectsRecorder.EFFECT_BACKDROPPER; } Log.e(TAG, "Invalid effect selection: " + effectSelection); return EffectsRecorder.EFFECT_NONE; } public static Object readEffectParameter(SharedPreferences pref) { String effectSelection = pref.getString(KEY_VIDEO_EFFECT, "none"); if (effectSelection.equals("none")) { return null; } int separatorIndex = effectSelection.indexOf('/'); String effectParameter = effectSelection.substring(separatorIndex + 1); if (effectSelection.startsWith("goofy_face")) { if (effectParameter.equals("squeeze")) { return EffectsRecorder.EFFECT_GF_SQUEEZE; } else if (effectParameter.equals("big_eyes")) { return EffectsRecorder.EFFECT_GF_BIG_EYES; } else if (effectParameter.equals("big_mouth")) { return EffectsRecorder.EFFECT_GF_BIG_MOUTH; } else if (effectParameter.equals("small_mouth")) { return EffectsRecorder.EFFECT_GF_SMALL_MOUTH; } else if (effectParameter.equals("big_nose")) { return EffectsRecorder.EFFECT_GF_BIG_NOSE; } else if (effectParameter.equals("small_eyes")) { return EffectsRecorder.EFFECT_GF_SMALL_EYES; } } else if (effectSelection.startsWith("backdropper")) { // Parameter is a string that either encodes the URI to use, // or specifies 'gallery'. return effectParameter; } Log.e(TAG, "Invalid effect selection: " + effectSelection); return null; } public static void restorePreferences(Context context, ComboPreferences preferences, Parameters parameters) { int currentCameraId = readPreferredCameraId(preferences); // Clear the preferences of both cameras. int backCameraId = CameraHolder.instance().getBackCameraId(); if (backCameraId != -1) { preferences.setLocalId(context, backCameraId); Editor editor = preferences.edit(); editor.clear(); editor.apply(); } int frontCameraId = CameraHolder.instance().getFrontCameraId(); if (frontCameraId != -1) { preferences.setLocalId(context, frontCameraId); Editor editor = preferences.edit(); editor.clear(); editor.apply(); } // Switch back to the preferences of the current camera. Otherwise, // we may write the preference to wrong camera later. preferences.setLocalId(context, currentCameraId); upgradeGlobalPreferences(preferences.getGlobal()); upgradeLocalPreferences(preferences.getLocal()); // Write back the current camera id because parameters are related to // the camera. Otherwise, we may switch to the front camera but the // initial picture size is that of the back camera. initialCameraPictureSize(context, parameters); writePreferredCameraId(preferences, currentCameraId); } private ArrayList<String> getSupportedVideoQuality() { ArrayList<String> supported = new ArrayList<String>(); // Check for supported quality if (ApiHelper.HAS_FINE_RESOLUTION_QUALITY_LEVELS) { getFineResolutionQuality(supported); } else { supported.add(Integer.toString(CamcorderProfile.QUALITY_HIGH)); CamcorderProfile high = CamcorderProfile.get( mCameraId, CamcorderProfile.QUALITY_HIGH); CamcorderProfile low = CamcorderProfile.get( mCameraId, CamcorderProfile.QUALITY_LOW); if (high.videoFrameHeight * high.videoFrameWidth > low.videoFrameHeight * low.videoFrameWidth) { supported.add(Integer.toString(CamcorderProfile.QUALITY_LOW)); } } return supported; } @TargetApi(ApiHelper.VERSION_CODES.HONEYCOMB) private void getFineResolutionQuality(ArrayList<String> supported) { if (CamcorderProfile.hasProfile(mCameraId, CamcorderProfile.QUALITY_1080P)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_1080P)); } if (CamcorderProfile.hasProfile(mCameraId, CamcorderProfile.QUALITY_720P)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_720P)); } if (CamcorderProfile.hasProfile(mCameraId, CamcorderProfile.QUALITY_480P)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_480P)); } } /** * Enable video mode for certain cameras. * * @param params * @param on */ public static void setVideoMode(Parameters params, boolean on) { if (Util.useSamsungCamMode()) { params.set("cam_mode", on ? "1" : "0"); } if (Util.useHTCCamMode()) { params.set("cam-mode", on ? "1" : "0"); } } /** * Set video size for certain cameras. * * @param params * @param profile */ public static void setEarlyVideoSize(Parameters params, CamcorderProfile profile) { if (Util.needsEarlyVideoSize()) { params.set("video-size", profile.videoFrameWidth + "x" + profile.videoFrameHeight); } } private void initVideoEffect(PreferenceGroup group, ListPreference videoEffect) { CharSequence[] values = videoEffect.getEntryValues(); boolean goofyFaceSupported = EffectsRecorder.isEffectSupported(EffectsRecorder.EFFECT_GOOFY_FACE); boolean backdropperSupported = EffectsRecorder.isEffectSupported(EffectsRecorder.EFFECT_BACKDROPPER) && Util.isAutoExposureLockSupported(mParameters) && Util.isAutoWhiteBalanceLockSupported(mParameters); ArrayList<String> supported = new ArrayList<String>(); for (CharSequence value : values) { String effectSelection = value.toString(); if (!goofyFaceSupported && effectSelection.startsWith("goofy_face")) continue; if (!backdropperSupported && effectSelection.startsWith("backdropper")) continue; supported.add(effectSelection); } filterUnsupportedOptions(group, videoEffect, supported); } }

diff --git a/sdkfido/src/test/java/net/erdfelt/android/sdkfido/configer/ConfigCmdLineParserTest.java b/sdkfido/src/test/java/net/erdfelt/android/sdkfido/configer/ConfigCmdLineParserTest.java index 9502dd3..bf1f900 100644 --- a/sdkfido/src/test/java/net/erdfelt/android/sdkfido/configer/ConfigCmdLineParserTest.java +++ b/sdkfido/src/test/java/net/erdfelt/android/sdkfido/configer/ConfigCmdLineParserTest.java @@ -1,257 +1,257 @@ package net.erdfelt.android.sdkfido.configer; import static org.hamcrest.Matchers.*; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.StringWriter; import java.util.List; import java.util.Properties; import net.erdfelt.android.sdkfido.FetcherConfig; import net.erdfelt.android.sdkfido.logging.Logging; import net.erdfelt.android.sdkfido.project.OutputProjectType; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.SystemUtils; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.PathAssert; import org.eclipse.jetty.toolchain.test.TestingDir; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; public class ConfigCmdLineParserTest { static { Logging.config(); } @Rule public TestingDir testingdir = new TestingDir(); @Test public void testHelp() throws CmdLineParseException { FetcherConfig config = new FetcherConfig(); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--help" }; parser.parse(args); assertNoThrowable(capture); assertContains(capture, "Usage: "); } @Test public void testInvalidOption() { FetcherConfig config = new FetcherConfig(); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--bogus-thing" }; try { parser.parse(args); Assert.fail("Expected " + CmdLineParseException.class.getName() + "\n" + capture.getBuffer()); } catch (CmdLineParseException e) { parser.usage(e); assertHasThrowable(capture, CmdLineParseException.class); assertContains(capture, "Invalid Option: --bogus-thing"); assertContains(capture, "Usage: "); } } @Test public void testSetOption() throws CmdLineParseException { FetcherConfig config = new FetcherConfig(); Assert.assertThat("Config.dryRun", config.isDryRun(), is(false)); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--dryRun", "true" }; parser.parse(args); Assert.assertThat("Config.dryRun", config.isDryRun(), is(true)); } @Test public void testSetMultipleOptions() throws CmdLineParseException { FetcherConfig config = new FetcherConfig(); File expectedDir = new File(SystemUtils.getUserHome(), FilenameUtils.separatorsToSystem(".sdkfido/work")); Assert.assertThat("Config.dryRun", config.isDryRun(), is(false)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(expectedDir)); File otherWork = testingdir.getFile("work"); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--dryRun", "true", "--workDir", otherWork.getAbsolutePath() }; parser.parse(args); Assert.assertThat("Config.dryRun", config.isDryRun(), is(true)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(otherWork)); } @Test public void testSetDeepOption() throws CmdLineParseException { FetcherConfig config = new FetcherConfig(); File expectedDir = new File(SystemUtils.getUserHome(), FilenameUtils.separatorsToSystem(".sdkfido/work")); Assert.assertThat("Config.dryRun", config.isDryRun(), is(false)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(expectedDir)); Assert.assertThat("Config.maven.groupId", config.getMaven().getGroupId(), is("com.android.sdk")); File otherWork = testingdir.getFile("work"); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--dryRun", "true", "--workDir", otherWork.getAbsolutePath(), "--maven.groupId", "com.android.sdk.testee" }; parser.parse(args); Assert.assertThat("Config.dryRun", config.isDryRun(), is(true)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(otherWork)); Assert.assertThat("Config.maven.groupId", config.getMaven().getGroupId(), is("com.android.sdk.testee")); } @Test public void testSetEnumOption() throws CmdLineParseException { FetcherConfig config = new FetcherConfig(); File expectedDir = new File(SystemUtils.getUserHome(), FilenameUtils.separatorsToSystem(".sdkfido/work")); Assert.assertThat("Config.dryRun", config.isDryRun(), is(false)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(expectedDir)); - Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.ANT)); + Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.SDK)); File otherWork = testingdir.getFile("work"); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--dryRun", "true", "--workDir", otherWork.getAbsolutePath(), "--outputType", "SDK" }; parser.parse(args); Assert.assertThat("Config.dryRun", config.isDryRun(), is(true)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(otherWork)); Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.SDK)); } @Test public void testFetchTargets() throws CmdLineParseException { FetcherConfig config = new FetcherConfig(); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "2.1", "froyo", "android-sdk-2.0_r1", "9" }; parser.parse(args); Assert.assertThat("output should not be usage", capture.getBuffer().toString(), not(containsString("Usage: "))); List<String> targets = config.getFetchTargets(); Assert.assertThat("config.fetchTargets", targets, notNullValue()); Assert.assertThat("config.fetchTarget.size", targets.size(), is(4)); Assert.assertThat("config.fetchTarget", targets, hasItem("2.1")); Assert.assertThat("config.fetchTarget", targets, hasItem("froyo")); Assert.assertThat("config.fetchTarget", targets, hasItem("android-sdk-2.0_r1")); Assert.assertThat("config.fetchTarget", targets, hasItem("9")); } @Test public void testSaveConfig() throws CmdLineParseException, IOException { testingdir.ensureEmpty(); FetcherConfig config = new FetcherConfig(); File expectedDir = new File(SystemUtils.getUserHome(), FilenameUtils.separatorsToSystem(".sdkfido/work")); Assert.assertThat("Config.dryRun", config.isDryRun(), is(false)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(expectedDir)); - Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.ANT)); + Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.SDK)); File confFile = testingdir.getFile("config.properties"); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--save-config", "--config", confFile.getAbsolutePath() }; parser.parse(args); PathAssert.assertFileExists("Config File", confFile); Properties props = loadProps(confFile); Assert.assertThat("props[dryRun]", props.getProperty("dryRun"), is("false")); Assert.assertThat("props[workDir]", props.getProperty("workDir"), is(expectedDir.getAbsolutePath())); - Assert.assertThat("props[outputType]", props.getProperty("outputType"), is("ANT")); + Assert.assertThat("props[outputType]", props.getProperty("outputType"), is("SDK")); } @Test public void testLoadConfig() throws CmdLineParseException, IOException { FetcherConfig config = new FetcherConfig(); File expectedDir = new File(SystemUtils.getUserHome(), FilenameUtils.separatorsToSystem(".sdkfido/work")); Assert.assertThat("Config.dryRun", config.isDryRun(), is(false)); Assert.assertThat("Config.workDir", config.getWorkDir(), is(expectedDir)); - Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.ANT)); + Assert.assertThat("Config.outputType", config.getOutputType(), is(OutputProjectType.SDK)); File confFile = MavenTestingUtils.getTestResourceFile("config2.properties"); StringWriter capture = new StringWriter(); ConfigCmdLineParser parser = new ConfigCmdLineParser(this, config); parser.setOut(capture); String[] args = { "--config", confFile.getAbsolutePath() }; parser.parse(args); PathAssert.assertFileExists("Config File", confFile); Assert.assertThat("Config.dryRun", config.isDryRun(), is(true)); Assert.assertThat("config.maven.groupId", config.getMaven().getGroupId(), is("com.android.sdk.testee")); Assert.assertThat("config.maven.artifactId", config.getMaven().getArtifactId(), is("artifact-test")); Assert.assertThat("config.maven.includeStubJar", config.getMaven().isIncludeStubJar(), is(false)); Assert.assertThat("config.outputType", config.getOutputType(), is(OutputProjectType.MAVEN_MULTI)); } private Properties loadProps(File propfile) throws IOException { FileReader reader = null; try { reader = new FileReader(propfile); Properties props = new Properties(); props.load(reader); return props; } finally { IOUtils.closeQuietly(reader); } } private void assertHasThrowable(StringWriter capture, Class<? extends Throwable> t) { String buf = capture.getBuffer().toString(); Assert.assertThat(buf, containsString(t.getSimpleName())); } private void assertContains(StringWriter capture, String content) { String buf = capture.getBuffer().toString(); Assert.assertThat(buf, notNullValue()); if (!buf.contains(content)) { Assert.fail("Expected a string \"" + content + "\"\n" + buf); } } private void assertNoThrowable(StringWriter capture) { String buf = capture.getBuffer().toString(); Assert.assertThat(buf, not(containsString("Throwable"))); Assert.assertThat(buf, not(containsString("Exception"))); } }

diff --git a/grisu-core/src/main/java/grisu/control/serviceInterfaces/AbstractServiceInterface.java b/grisu-core/src/main/java/grisu/control/serviceInterfaces/AbstractServiceInterface.java index f87ff86a..21ebc39e 100644 --- a/grisu-core/src/main/java/grisu/control/serviceInterfaces/AbstractServiceInterface.java +++ b/grisu-core/src/main/java/grisu/control/serviceInterfaces/AbstractServiceInterface.java @@ -1,1648 +1,1650 @@ package grisu.control.serviceInterfaces; import grisu.GrisuVersion; import grisu.backend.model.RemoteFileTransferObject; import grisu.backend.model.User; import grisu.backend.model.fs.UserFileManager; import grisu.backend.model.job.BatchJob; import grisu.backend.model.job.Job; import grisu.backend.model.job.Jobhelper; import grisu.backend.model.job.UserBatchJobManager; import grisu.backend.model.job.UserJobManager; import grisu.backend.model.job.gt5.RSLFactory; import grisu.backend.utils.LocalTemplatesHelper; import grisu.control.JobConstants; import grisu.control.ServiceInterface; import grisu.control.exceptions.BatchJobException; import grisu.control.exceptions.JobPropertiesException; import grisu.control.exceptions.JobSubmissionException; import grisu.control.exceptions.NoSuchJobException; import grisu.control.exceptions.NoValidCredentialException; import grisu.control.exceptions.RemoteFileSystemException; import grisu.jcommons.constants.Constants; import grisu.jcommons.constants.GridEnvironment; import grisu.jcommons.constants.JobSubmissionProperty; import grisu.jcommons.interfaces.GrinformationManagerDozer; import grisu.jcommons.interfaces.InformationManager; import grisu.model.MountPoint; import grisu.model.dto.DtoActionStatus; import grisu.model.dto.DtoBatchJob; import grisu.model.dto.DtoJob; import grisu.model.dto.DtoJobs; import grisu.model.dto.DtoMountPoints; import grisu.model.dto.GridFile; import grisu.model.info.dto.Application; import grisu.model.info.dto.Directory; import grisu.model.info.dto.DtoProperties; import grisu.model.info.dto.DtoProperty; import grisu.model.info.dto.DtoStringList; import grisu.model.info.dto.JobQueueMatch; import grisu.model.info.dto.Package; import grisu.model.info.dto.Queue; import grisu.model.info.dto.Site; import grisu.model.info.dto.VO; import grisu.model.info.dto.Version; import grisu.settings.ServerPropertiesManager; import grisu.utils.FileHelpers; import grisu.utils.SeveralXMLHelpers; import grith.jgrith.cred.AbstractCred; import grith.jgrith.utils.CertificateFiles; import grith.jgrith.voms.VOManagement.VOManager; import java.io.File; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; import javax.activation.DataHandler; import javax.annotation.security.RolesAllowed; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import org.apache.commons.lang.StringUtils; import org.globus.common.CoGProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.util.StatusPrinter; import com.google.common.base.Functions; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; /** * This abstract class implements most of the methods of the * {@link ServiceInterface} interface. This way developers don't have to waste * time to implement the whole interface just for some things that are site/grid * specific. Currently there are two classes that extend this abstract class: * {@link LocalServiceInterface} and WsServiceInterface (which can be found in * the grisu-ws module). * * The {@link LocalServiceInterface} is used to work with a small local database * like hsqldb so a user has got the whole grisu framework on his desktop. Of * course, all required ports have to be open from the desktop to the grid. On * the other hand no web service server is required. * * The WsServiceInterface is the main one and it is used to set up a web service * somewhere. So light-weight clients can talk to it. * * @author Markus Binsteiner */ public abstract class AbstractServiceInterface implements ServiceInterface { static Logger myLogger = null; public static CacheManager cache; - public static final InformationManager informationManager = new GrinformationManagerDozer( - ServerPropertiesManager.getInformationManagerConf()); + public static final InformationManager informationManager; - public final static AdminInterface admin = new AdminInterface(null, - informationManager, - User.userdao); + public final static AdminInterface admin; - static { + static { String logbackPath = "/etc/grisu/logback.xml"; if (new File(logbackPath).exists() && (new File(logbackPath).length() > 0)) { // configure loback from external logback.xml config file // assume SLF4J is bound to logback in the current environment LoggerContext context = (LoggerContext) LoggerFactory .getILoggerFactory(); try { JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(context); context.reset(); configurator.doConfigure(logbackPath); } catch (JoranException je) { // StatusPrinter will handle this } StatusPrinter.printInCaseOfErrorsOrWarnings(context); } String dir = ServerPropertiesManager.getCacheDirectory(); if ( StringUtils.isNotBlank(dir) ) { GridEnvironment.GRID_CACHE_DIR = dir; } + informationManager = new GrinformationManagerDozer( + ServerPropertiesManager.getInformationManagerConf()); + admin = new AdminInterface(null, + informationManager, + User.userdao); myLogger = LoggerFactory.getLogger(AbstractServiceInterface.class .getName()); myLogger.debug("Logging initiated..."); myLogger.info("============================================"); myLogger.info("Starting up backend..."); myLogger.info("============================================"); myLogger.info("Setting networkaddress.cache.ttl java security property to -1..."); java.security.Security.setProperty("networkaddress.cache.ttl", "" + -1); CoGProperties.getDefault().setProperty( CoGProperties.ENFORCE_SIGNING_POLICY, "false"); try { // LocalTemplatesHelper.copyTemplatesAndMaybeGlobusFolder(); LocalTemplatesHelper.prepareTemplates(); //String[] vos = ServerPropertiesManager.getVOsToUse(); AbstractCred.DEFAULT_VO_MANAGER = new VOManager(informationManager); Set<VO> vos = informationManager.getAllVOs(); //VOManagement.setVOsToUse(vos); // VomsesFiles.copyVomses(Arrays.asList(ServerPropertiesManager // .getVOsToUse())); CertificateFiles.copyCACerts(false); } catch (final Exception e) { // TODO Auto-generated catch block myLogger.error(e.getLocalizedMessage()); // throw new // RuntimeException("Could not initiate local backend: "+e.getLocalizedMessage()); } // create ehcache manager singleton try { // CacheManager.getInstance(); for (CacheManager cm : CacheManager.ALL_CACHE_MANAGERS) { if (cm.getName().equals("grisu")) { cache = cm; break; } } if (cache == null) { URL url = ClassLoader.getSystemResource("/grisu-ehcache.xml"); if (url == null) { url = myLogger.getClass().getResource("/grisu-ehcache.xml"); } cache = new CacheManager(url); cache.setName("grisu"); } // cache = CacheManager.getInstance(); final Cache session = cache.getCache("session"); if (session == null) { myLogger.debug("Session cache is null"); } } catch (final Exception e) { myLogger.error(e.getLocalizedMessage(), e); } // setting info manager RSLFactory.getRSLFactory().setInformationManager(informationManager); } public static final String BACKEND_VERSION = GrisuVersion.get("grisu-core"); public static final String REFRESH_STATUS_PREFIX = "REFRESH_"; // public static final InformationManager informationManager = // createInformationManager(); // public static final MatchMaker matchmaker = createMatchMaker(); // private final Map<String, List<Job>> archivedJobs = new HashMap<String, // List<Job>>(); private static String backendInfo = null; private static String hostname = null; // public static InformationManager createInformationManager() { // return InformationManagerManager // .getInformationManager(ServerPropertiesManager // .getInformationManagerConf()); // } public static Cache eternalCache() { return cache.getCache("eternal"); } public static String getBackendInfo() { if (StringUtils.isBlank(backendInfo)) { // String host = getInterfaceInfo("HOSTNAME"); // if (StringUtils.isBlank(host)) { // host = "Host unknown"; // } // String version = getInterfaceInfo("VERSION"); // if (StringUtils.isBlank(version)) { // version = "Version unknown"; // } // String name = getInterfaceInfo("NAME"); // if (StringUtils.isBlank(name)) { // name = "Backend name unknown"; // } // // backendInfo = name + " / " + host + " / version:" + version; backendInfo = "Not implemented yet."; } return backendInfo; } public static Object getFromEternalCache(Object key) { if ((key != null) && (eternalCache().get(key) != null)) { return eternalCache().get(key).getObjectValue(); } else { return null; } } public static Object getFromSessionCache(Object key) { if ((key != null) && (sessionCache().get(key) != null)) { return sessionCache().get(key).getObjectValue(); } else { return null; } } public static Object getFromShortCache(Object key) { if ((key != null) && (shortCache().get(key) != null)) { return shortCache().get(key).getObjectValue(); } else { return null; } } public static void putIntoEternalCache(Object key, Object value) { final net.sf.ehcache.Element e = new net.sf.ehcache.Element(key, value); eternalCache().put(e); } public static void putIntoSessionCache(Object key, Object value) { final net.sf.ehcache.Element e = new net.sf.ehcache.Element(key, value); sessionCache().put(e); } public static void putIntoShortCache(Object key, Object value) { final net.sf.ehcache.Element e = new net.sf.ehcache.Element(key, value); shortCache().put(e); } public static Cache sessionCache() { return cache.getCache("session"); } public static Cache shortCache() { return cache.getCache("short"); } // protected final UserDAO userdao = new UserDAO(); // private Map<String, RemoteFileTransferObject> fileTransfers = new // HashMap<String, RemoteFileTransferObject>(); private int SUBMIT_PROXY_LIFETIME = -1; public void addArchiveLocation(String alias, String value) { if (StringUtils.isBlank(value)) { getUser().removeArchiveLocation(alias); } else { getUser().addArchiveLocation(alias, value); } } public void addBookmark(String alias, String value) { if (StringUtils.isBlank(value)) { getUser().removeBookmark(alias); } else { getUser().addBookmark(alias, value); } } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#addJobProperties(java.lang.String , * java.util.Map) */ public void addJobProperties(final String jobname, final DtoJob properties) throws NoSuchJobException { getJobManager().addJobProperties(jobname, properties); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#addJobProperty(java.lang.String, * java.lang.String, java.lang.String) */ public void addJobProperty(final String jobname, final String key, final String value) throws NoSuchJobException { getJobManager().addJobProperty(jobname, key, value); } public String addJobToBatchJob(String batchjobname, String jobdescription) throws NoSuchJobException, JobPropertiesException { return getBatchJobManager().addJobToBatchJob(batchjobname, jobdescription); } public DtoStringList admin(String command, DtoProperties config) { String dn = getDN(); // yes yes yes, this is not a proper way to authenticate admin commands // for now, until admin commands are only refreshing the config files, // I'll not worry about it... if (!admin.isAdmin(dn)) { return DtoStringList.fromSingleString("No admin: " + dn); } if (StringUtils.isBlank(command)) { return DtoStringList.fromSingleString("No command specified."); } return admin.execute(command, DtoProperties.asMap(config)); } // private boolean checkWhetherGridResourceIsActuallyAvailable( // GridResource resource) { // // final String[] filesystems = informationManager // .getStagingFileSystemForSubmissionLocation(SubmissionLocationHelpers // .createSubmissionLocationString(resource)); // // for (final MountPoint mp : df().getMountpoints()) { // // for (final String fs : filesystems) { // if (mp.getRootUrl().startsWith(fs.replace(":2811", ""))) { // return true; // } // } // // } // // return false; // // } public String archiveJob(String jobname, String target) throws JobPropertiesException, NoSuchJobException, RemoteFileSystemException { return getJobManager().archiveJob(jobname, target); } public void copyBatchJobInputFile(String batchJobname, String inputFile, String filename) throws RemoteFileSystemException, NoSuchJobException { final BatchJob multiJob = getBatchJobManager().getBatchJobFromDatabase( batchJobname); final String relpathFromMountPointRoot = multiJob .getJobProperty(Constants.RELATIVE_BATCHJOB_DIRECTORY_KEY); for (final String mountPointRoot : multiJob.getAllUsedMountPoints()) { final String targetUrl = mountPointRoot + "/" + relpathFromMountPointRoot + "/" + filename; myLogger.debug("Coping multipartjob inputfile " + filename + " to: " + targetUrl); getFileManager().cpSingleFile(inputFile, targetUrl, true, true, true); } } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#cp(java.lang.String, * java.lang.String, boolean, boolean) */ public String cp(final DtoStringList sources, final String target, final boolean overwrite, final boolean waitForFileTransferToFinish) throws RemoteFileSystemException { final String handle = "cp_" + sources.asSortedSet().size() + "_files_to_" + target + "_" + new Date().getTime() + " / " + getUser().getDn(); final DtoActionStatus actionStat = new DtoActionStatus(handle, sources.asArray().length * 2); getSessionActionStatus().put(handle, actionStat); final String handleFinal = handle; final Thread cpThread = new Thread() { @Override public void run() { try { for (final String source : sources.asArray()) { actionStat.addElement("Starting transfer of file: " + source); final String filename = FileHelpers.getFilename(source); final RemoteFileTransferObject rto = getFileManager() .cpSingleFile(source, target + "/" + filename, overwrite, true, true); if (rto.isFailed()) { actionStat.setFailed(true); actionStat.setErrorCause(rto .getPossibleExceptionMessage()); actionStat.setFinished(true); actionStat.addElement("Transfer failed: " + rto.getPossibleException() .getLocalizedMessage()); throw new RemoteFileSystemException(rto .getPossibleException() .getLocalizedMessage()); } else { actionStat.addElement("Finished transfer of file: " + source); } } actionStat.setFinished(true); } catch (final Exception e) { myLogger.error(e.getLocalizedMessage(), e); actionStat.setFailed(true); actionStat.setErrorCause(e.getLocalizedMessage()); actionStat.setFinished(true); actionStat.addElement("Transfer failed: " + e.getLocalizedMessage()); } } }; cpThread.setName(actionStat.getHandle()); cpThread.start(); if (waitForFileTransferToFinish) { try { cpThread.join(); if (actionStat.isFailed()) { throw new RemoteFileSystemException( DtoActionStatus.getLastMessage(actionStat)); } } catch (final InterruptedException e) { myLogger.error(e.getLocalizedMessage(), e); } } return handle; } // private String createJob(Document jsdl, final String fqan, // final String jobnameCreationMethod, // final BatchJob optionalParentBatchJob) // throws JobPropertiesException { // // return getJobManager().createJob(jsdl, fqan, jobnameCreationMethod, // optionalParentBatchJob); // // } /** * Creates a multipartjob on the server. * * A multipartjob is just a collection of jobs that belong together to make * them more easily managable. * * @param batchJobname * the id (name) of the multipartjob * @throws JobPropertiesException */ public DtoBatchJob createBatchJob(String batchJobnameBase, String fqan, String jobnameCreationMethod) throws BatchJobException { String batchJobname = null; try { batchJobname = Jobhelper.calculateJobname(getUser(), batchJobnameBase, jobnameCreationMethod); } catch (final JobPropertiesException e2) { throw new BatchJobException("Can't calculate jobname: " + e2.getLocalizedMessage(), e2); } if (Constants.NO_JOBNAME_INDICATOR_STRING.equals(batchJobname)) { throw new BatchJobException("BatchJobname can't be " + Constants.NO_JOBNAME_INDICATOR_STRING); } try { final Job possibleJob = getJobManager() .getJobFromDatabaseOrFileSystem( batchJobname); throw new BatchJobException("Can't create multipartjob with id: " + batchJobname + ". Non-multipartjob with this id already exists..."); } catch (final NoSuchJobException e) { // that's good } try { final BatchJob multiJob = getBatchJobManager() .getBatchJobFromDatabase( batchJobname); } catch (final NoSuchJobException e) { // that's good final BatchJob multiJobCreate = new BatchJob(getDN(), batchJobname, fqan); multiJobCreate.addJobProperty(Constants.RELATIVE_PATH_FROM_JOBDIR, "../"); multiJobCreate.addJobProperty( Constants.RELATIVE_BATCHJOB_DIRECTORY_KEY, ServerPropertiesManager.getRunningJobsDirectoryName() + "/" + batchJobname); multiJobCreate.addLogMessage("MultiPartJob " + batchJobname + " created."); // multiJobCreate // .setResourcesToUse(calculateResourcesToUse(multiJobCreate)); multiJobCreate.setStatus(JobConstants.JOB_CREATED); getBatchJobManager().saveOrUpdate(multiJobCreate); try { return multiJobCreate.createDtoMultiPartJob(); } catch (final NoSuchJobException e1) { myLogger.error(e1.getLocalizedMessage(), e1); } } throw new BatchJobException("MultiPartJob with name " + batchJobname + " already exists."); } public String createJob(String jsdlString, final String fqan, final String jobnameCreationMethod) throws JobPropertiesException { Document jsdl; try { jsdl = SeveralXMLHelpers.fromString(jsdlString); } catch (final Exception e3) { myLogger.debug(e3.getLocalizedMessage(), e3); throw new RuntimeException("Invalid jsdl/xml format.", e3); } return getJobManager().createJob(jsdl, fqan, jobnameCreationMethod, null); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#deleteFile(java.lang.String) */ public String deleteFile(final String file) throws RemoteFileSystemException { return getFileManager().deleteFile(file); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#deleteFiles(java.lang.String[]) */ public String deleteFiles(final DtoStringList files) { return getFileManager().deleteFiles(files); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#df() */ public synchronized DtoMountPoints df() { return DtoMountPoints.createMountpoints(getUser().getAllMountPoints()); } public DataHandler download(final String filename) throws RemoteFileSystemException { // myLogger.debug("Downloading: " + filename); return getUser().getFileManager().download(filename); } // public GridFile fillFolder(GridFile folder, int recursionLevel) // throws RemoteFileSystemException { // // GridFile tempFolder = null; // // try { // tempFolder = getUser().getFileSystemManager().getFolderListing( // folder.getUrl(), 1); // } catch (final Exception e) { // // myLogger.error(e.getLocalizedMessage(), e); // myLogger.error( // "Error getting folder listing. I suspect this to be a bug in the commons-vfs-grid library. Sleeping for 1 seconds and then trying again...", // e); // try { // Thread.sleep(1000); // } catch (final InterruptedException e1) { // myLogger.error(e1.getLocalizedMessage(), e1); // } // tempFolder = getUser().getFileSystemManager().getFolderListing( // folder.getUrl(), 1); // // } // folder.setChildren(tempFolder.getChildren()); // // if (recursionLevel > 0) { // for (final GridFile childFolder : tempFolder.getChildren()) { // if (childFolder.isFolder()) { // folder.addChild(fillFolder(childFolder, recursionLevel - 1)); // } // } // // } // return folder; // } public boolean fileExists(final String file) throws RemoteFileSystemException { return getUser().getFileManager().fileExists(file); } public List<JobQueueMatch> findMatches( final DtoProperties jobProperties, String fqan) { if (fqan == null) { fqan = Constants.NON_VO_FQAN; } final Map<JobSubmissionProperty, String> converterMap = new HashMap<JobSubmissionProperty, String>(); for (final DtoProperty jp : jobProperties.getProperties()) { converterMap.put(JobSubmissionProperty.fromString(jp.getKey()), jp.getValue()); } List<JobQueueMatch> resources = null; resources = informationManager.findMatches(converterMap, fqan); return resources; } public List<Queue> findQueues(final DtoProperties jobProperties, String fqan) { if (fqan == null) { fqan = Constants.NON_VO_FQAN; } final Map<JobSubmissionProperty, String> converterMap = new HashMap<JobSubmissionProperty, String>(); for (final DtoProperty jp : jobProperties.getProperties()) { converterMap.put(JobSubmissionProperty.fromString(jp.getKey()), jp.getValue()); } List<Queue> resources = null; resources = informationManager.findQueues(converterMap, fqan); return resources; } public DtoActionStatus getActionStatus(String actionHandle) { final DtoActionStatus result = getSessionActionStatus().get( actionHandle); // System.out.println("Elements before: " + result.getLog().size()); return result; } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#ps() */ public DtoJobs getActiveJobs(String application, boolean refresh) { try { final List<Job> jobs = getJobManager() .getActiveJobs(application, refresh); final DtoJobs dtoJobs = new DtoJobs(); for (final Job job : jobs) { final DtoJob dtojob = DtoJob.createJob(job.getStatus(), job.getJobProperties(), job.getInputFiles(), job.getLogMessages(), false); // just to make sure dtojob.addJobProperty(Constants.JOBNAME_KEY, job.getJobname()); dtoJobs.addJob(dtojob); } return dtoJobs; } catch (final Exception e) { throw new RuntimeException(e); } } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getAllAvailableApplications(java * .lang.String[]) */ public Application[] getAllAvailableApplications(final DtoStringList fqans) { if ((fqans == null) || (fqans.asSortedSet().size() == 0)) { return informationManager.getAllApplicationsOnGrid().toArray( new Application[] {}); } final Set<Application> fqanList = Sets.newHashSet(); for (final String fqan : fqans.getStringList()) { fqanList.addAll(informationManager .getAllApplicationsOnGridForVO(fqan)); } return fqanList.toArray(new Application[] {}); } public DtoStringList getAllBatchJobnames(String application) { return getBatchJobManager().getAllBatchJobnames(application); } // /* // * (non-Javadoc) // * // * @see grisu.control.ServiceInterface#getAllHosts() // */ // public synchronized DtoHostsInfo getAllHosts() { // // final DtoHostsInfo info = DtoHostsInfo // .createHostsInfo(informationManager.getAllHosts()); // // return info; // } public DtoStringList getAllJobnames(String application) { return getJobManager().getAllJobnames(application); } public Site[] getAllSites() { final Date now = new Date(); List<Site> sites = informationManager.getAllSites(); myLogger.debug("Login benchmark - getting all sites: " + (new Date().getTime() - now.getTime()) + " ms"); return sites.toArray(new Site[] {}); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getAllSubmissionLocations() */ public synchronized Queue[] getAllSubmissionLocations() { // final DtoSubmissionLocations locs = DtoSubmissionLocations // .createSubmissionLocationsInfo(informationManager // .getAllQueues()); List<Queue> q = informationManager.getAllQueues(); // locs.removeUnuseableSubmissionLocations(informationManager, df() // .getMountpoints()); return q.toArray(new Queue[] {}); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getAllSubmissionLocations(java * .lang.String) */ public Queue[] getAllSubmissionLocationsForFqan( final String fqan) { // final DtoSubmissionLocations locs = DtoSubmissionLocations // .createSubmissionLocationsInfoFromQueues(informationManager // .getAllSubmissionLocationsForVO(fqan)); Collection<Queue> q = informationManager.getAllQueuesForVO(fqan); // locs.removeUnuseableSubmissionLocations(informationManager, df() // .getMountpoints()); return q.toArray(new Queue[] {}); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getApplicationDetails(java.lang * .String, java.lang.String, java.lang.String) */ public Package getApplicationDetailsForVersionAndSubmissionLocation( final String application, final String version, final String submissionLocation) { // String site = site_or_submissionLocation; // if (isSubmissionLocation(site_or_submissionLocation)) { // myLogger.debug("Parameter " + site_or_submissionLocation // + "is submission location not site. Calculating site..."); // site = getSiteForSubmissionLocation(site_or_submissionLocation); // myLogger.debug("Site is: " + site); // } return informationManager.getPackage(application, version, submissionLocation); // return DtoApplicationDetails // .createDetails( // informationManager.getApplicationDetails(application, version, // submissionLocation)); } // public String[] getApplicationPackagesForExecutable(String executable) { // // return informationManager // .getApplicationsThatProvideExecutable(executable); // // } public DtoJobs getArchivedJobs(String application) { final List<Job> jobs = getJobManager().getArchivedJobs(application); final DtoJobs dtoJobs = new DtoJobs(); for (final Job job : jobs) { final DtoJob dtojob = DtoJob.createJob(job.getStatus(), job.getJobProperties(), job.getInputFiles(), job.getLogMessages(), false); // just to make sure dtojob.addJobProperty(Constants.JOBNAME_KEY, job.getJobname()); dtoJobs.addJob(dtojob); } return dtoJobs; } public DtoProperties getArchiveLocations() { return DtoProperties.createProperties(getUser().getArchiveLocations()); } /** * Returns all multipart jobs for this user. * * @return all the multipartjobs of the user */ public DtoBatchJob getBatchJob(String batchJobname) throws NoSuchJobException { final BatchJob multiPartJob = getBatchJobManager() .getBatchJobFromDatabase( batchJobname); // TODO enable loading of batchjob from jobdirectory url return multiPartJob.createDtoMultiPartJob(); } private UserBatchJobManager getBatchJobManager() { return getUser().getBatchJobManager(); } public DtoProperties getBookmarks() { return DtoProperties.createProperties(getUser().getBookmarks()); } // /** // * This method has to be implemented by the endpoint specific // * ServiceInterface. Since there are a few different ways to get a proxy // * credential (myproxy, just use the one in /tmp/x509..., shibb,...) this // * needs to be implemented differently for every single situation. // * // * @return the proxy credential that is used to contact the grid // */ // protected abstract ProxyCredential getCredential(); // // /** // * This is mainly for testing, to enable credentials with specified // * lifetimes. // * // * @param fqan the vo // * @param lifetime // * the lifetime in seconds // * @return the credential // */ // protected abstract ProxyCredential getCredential(String fqan, int // lifetime); // public DtoDataLocations getDataLocationsForVO(final String fqan) { // // return DtoDataLocations.createDataLocations(fqan, // informationManager.getDataLocationsForVO(fqan)); // // } /** * Calculates the default version of an application on a site. This is * pretty hard to do, so, if you call this method, don't expect anything * that makes 100% sense, I'm afraid. * * @param application * the name of the application * @param site * the site * @return the default version of the application on this site */ private String getDefaultVersionForApplicationAtSite( final String application, final String site) { final Collection<Version> v = informationManager .getVersionsOfApplicationOnSite(application, site); final String[] versions = Collections2.transform(v, Functions.toStringFunction()).toArray(new String[] {}); double latestVersion = 0; int index = 0; try { latestVersion = Double.valueOf(versions[0]).doubleValue(); for (int i = 1; i < versions.length; i++) { if (Double.valueOf(versions[i]).doubleValue() > latestVersion) { index = i; } } return versions[index]; } catch (final NumberFormatException e) { return versions[0]; } } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getDN() */ @RolesAllowed("User") public String getDN() { return getUser().getDn(); } private UserFileManager getFileManager() { return getUser().getFileManager(); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getFileSize(java.lang.String) */ public long getFileSize(final String file) throws RemoteFileSystemException { return getUser().getFileManager().getFileSize(file); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getFqans() */ public DtoStringList getFqans() { return DtoStringList.fromStringColletion(getUser().getFqans().keySet()); } public String getInterfaceInfo(String key) { if ("HOSTNAME".equalsIgnoreCase(key)) { if (hostname == null) { try { final InetAddress addr = InetAddress.getLocalHost(); final byte[] ipAddr = addr.getAddress(); hostname = addr.getHostName(); if (StringUtils.isBlank(hostname)) { hostname = ""; } else { hostname = hostname + " / "; } hostname = hostname + addr.getHostAddress(); } catch (final UnknownHostException e) { hostname = "Unavailable"; } } return hostname; } else if ("VERSION".equalsIgnoreCase(key)) { return grisu.jcommons.utils.Version.get("grisu-core"); } else if ("API_VERSION".equalsIgnoreCase(key)) { return Integer.toString(ServiceInterface.API_VERSION); } else if ("TYPE".equalsIgnoreCase(key)) { return getInterfaceType(); } else if ("BACKEND_VERSION".equalsIgnoreCase(key)) { return BACKEND_VERSION; } return null; } abstract public String getInterfaceType(); public int getInterfaceVersion() { return API_VERSION; } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getAllJobProperties(java.lang * .String) */ public DtoJob getJob(final String jobnameOrUrl) throws NoSuchJobException { final Job job = getJobManager().getJobFromDatabaseOrFileSystem( jobnameOrUrl); // job.getJobProperties().put(Constants.JOB_STATUS_KEY, // JobConstants.translateStatus(getJobStatus(jobname))); return DtoJob.createJob(job.getStatus(), job.getJobProperties(), job.getInputFiles(), job.getLogMessages(), job.isArchived()); } private UserJobManager getJobManager() { return getUser().getJobManager(); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getJobProperty(java.lang.String, * java.lang.String) */ public String getJobProperty(final String jobname, final String key) throws NoSuchJobException { try { final Job job = getJobManager().getJobFromDatabaseOrFileSystem( jobname); if (Constants.INPUT_FILE_URLS_KEY.equals(key)) { return StringUtils.join(job.getInputFiles(), ","); } return job.getJobProperty(key); } catch (final NoSuchJobException e) { final BatchJob mpj = getBatchJobManager().getBatchJobFromDatabase( jobname); return mpj.getJobProperty(key); } } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getJobStatus(java.lang.String) */ public int getJobStatus(final String jobname) { return getJobManager().getJobStatus(jobname); } public String getJsdlDocument(final String jobname) throws NoSuchJobException { final Job job = getJobManager().getJobFromDatabaseOrFileSystem(jobname); String jsdlString; jsdlString = SeveralXMLHelpers.toString(job.getJobDescription()); return jsdlString; } // public String getStagingFileSystem(String site) { // return MountPointManager.getDefaultFileSystem(site); // } // abstract protected DtoStringList getSessionFqans(); /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getMessagesSince(java.util.Date) */ public Document getMessagesSince(final Date date) { // TODO return null; } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getMountPointForUri(java.lang * .String) */ public MountPoint getMountPointForUri(final String uri) { return getUser().getResponsibleMountpointForAbsoluteFile(uri); } protected Map<String, DtoActionStatus> getSessionActionStatus() { return getUser().getActionStatuses(); } // /* // * (non-Javadoc) // * // * @see grisu.control.ServiceInterface#getSite(java.lang.String) // */ // public String getSite(final String host_or_url) { // // return informationManager.getSiteForHostOrUrl(host_or_url); // // } // // /** // * Returns the name of the site for the given submissionLocation. // * // * @param subLoc // * the submissionLocation // * @return the name of the site for the submissionLocation or null, if the // * site can't be found // */ // public String getSiteForSubmissionLocation(final String subLoc) { // // // subLoc = queuename@cluster:contactstring#JobManager // // String queueName = subLoc.substring(0, subLoc.indexOf(":")); // String contactString = ""; // if (subLoc.indexOf("#") > 0) { // contactString = subLoc.substring(subLoc.indexOf(":") + 1, // subLoc.indexOf("#")); // } else { // contactString = subLoc.substring(subLoc.indexOf(":") + 1); // } // // return getSite(contactString); // } public String getSite(String host) { Site site = informationManager.getSiteForHostOrUrl(host); if (site == null) { return null; } return site.getName(); } /* * (non-Javadoc) * * @seeorg.vpac.grisu.control.ServiceInterface# * getStagingFileSystemForSubmissionLocation(java.lang.String) */ public DtoStringList getStagingFileSystemForSubmissionLocation( final String subLoc) { Collection<Directory> queues = informationManager .getStagingFileSystemForSubmissionLocation(subLoc); return DtoStringList.fromStringColletion(Collections2.transform(queues, Functions.toStringFunction())); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getSubmissionLocationsForApplication * (java.lang.String) */ public Queue[] getSubmissionLocationsForApplication( final String application) { // return DtoSubmissionLocations // .createSubmissionLocationsInfo(informationManager // .getAllSubmissionLocationsForApplication(application)); List<Queue> q = informationManager .getAllQueuesForApplication(application); return q.toArray(new Queue[] {}); } // public UserDAO getUserDao() { // return userdao; // } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getSubmissionLocationsForApplication * (java.lang.String, java.lang.String) */ public Queue[] getSubmissionLocationsForApplicationAndVersion( final String application, final String version) { final Collection<Queue> sls = informationManager .getAllQueues( application, version); return sls.toArray(new Queue[] {}); // return DtoSubmissionLocations.createSubmissionLocationsInfo(sls); } public Queue[] getSubmissionLocationsForApplicationAndVersionAndFqan( final String application, final String version, final String fqan) { // TODO implement a method which takes in fqan later on Collection<Queue> q = informationManager.getAllQueues(application, version); return q.toArray(new Queue[] {}); // return DtoSubmissionLocations // .createSubmissionLocationsInfo(informationManager // .getAllQueues(application, version)); } // public DtoApplicationInfo getSubmissionLocationsPerVersionOfApplication( // final String application) { // // if (ServerPropertiesManager.getMDSenabled()) { // // // myLogger.debug("Getting map of submissionlocations per version of application for: " // // + application); // final Map<String, String> appVersionMap = new HashMap<String, String>(); // final List<Version> temp = informationManager // .getAllVersionsOfApplicationOnGrid(application); // Version[] versions; // if (temp == null) { // versions = new Version[] {}; // } else { // versions = temp.toArray(new Version[] {}); // } // for (int i = 0; (versions != null) && (i < versions.length); i++) { // Collection<Queue> submitLocations = null; // try { // submitLocations = informationManager.getAllQueues(application, // versions[i].getVersion()); // if (submitLocations == null) { // myLogger.error("Couldn't find submission locations for application: \"" // + application // + "\"" // + ", version \"" // + versions[i] // + "\". Most likely the mds is not published correctly."); // continue; // } // } catch (final Exception e) { // myLogger.error("Couldn't find submission locations for application: \"" // + application // + "\"" // + ", version \"" // + versions[i] // + "\". Most likely the mds is not published correctly."); // continue; // } // final StringBuffer submitLoc = new StringBuffer(); // // if (submitLocations != null) { // List<String> list = new LinkedList<String>(submitLocations); // for (int j = 0; j < list.size(); j++) { // submitLoc.append(list.get(j)); // if (j < (list.size() - 1)) { // submitLoc.append(","); // } // } // } // appVersionMap.put(versions[i], submitLoc.toString()); // } // return DtoApplicationInfo.createApplicationInfo(application, // appVersionMap); // } public DtoStringList getUsedApplications() { return DtoStringList.fromStringColletion(getJobManager() .getUsedApplications()); } public DtoStringList getUsedApplicationsBatch() { return DtoStringList.fromStringColletion(getBatchJobManager() .getUsedApplicationsBatch()); } /** * Gets the user of the current session. Also connects the default * credential to it. * * @return the user or null if user could not be created * @throws NoValidCredentialException * if no valid credential could be found to create the user */ abstract protected User getUser(); public DtoProperties getUserProperties() { return DtoProperties.createProperties(getUser().getUserProperties()); } // /* // * (non-Javadoc) // * // * @see grisu.control.ServiceInterface#getVersionsOfApplicationOnSite // * (java.lang.String, java.lang.String) // */ // public Collection<Version> getVersionsOfApplicationOnSite( // final String application, // final String site) { // // return informationManager.getVersionsOfApplicationOnSite(application, // site); // // } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#getUserProperty(java.lang.String) */ public String getUserProperty(final String key) { final String value = getUser().getUserProperties().get(key); return value; } public List<Version> getVersionsOfApplicationOnSubmissionLocation( final String application, final String submissionLocation) { List<Version> v = informationManager .getVersionsOfApplicationOnSubmissionLocation(application, submissionLocation); return v; } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#isFolder(java.lang.String) */ public boolean isFolder(final String file) throws RemoteFileSystemException { return getUser().getFileManager().isFolder(file); } /** * Tests whether the provided String is a valid submissionLocation. All this * does at the moment is to check whether there is a ":" within the string, * so don't depend with your life on the answer to this question... * * @param submissionLocation * the submission location * @return whether the string is a submission location or not */ public boolean isSubmissionLocation(final String submissionLocation) { if (submissionLocation.indexOf(":") >= 0) { return true; } else { return false; } } public String kill(String jobname, boolean clean) throws NoSuchJobException, BatchJobException { return getJobManager().kill(jobname, clean); } public String killJobs(DtoStringList jobnames, boolean clean) { return getJobManager().killJobs(jobnames, clean); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#lastModified(java.lang.String) */ public long lastModified(final String url) throws RemoteFileSystemException { return getUser().getFileManager().lastModified(url); } public GridFile ls(final String directory, int recursion_level) throws RemoteFileSystemException { // // check whether credential still valid // getCredential(); return getUser().ls(directory, recursion_level); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#mkdir(java.lang.String) */ public boolean mkdir(final String url) throws RemoteFileSystemException { // myLogger.debug("Creating folder: " + url + "..."); return getUser().getFileManager().createFolder(url); } public String redistributeBatchJob(String batchjobname) throws NoSuchJobException, JobPropertiesException { return getBatchJobManager().redistributeBatchJob(batchjobname); } public String refreshBatchJobStatus(String batchJobname) throws NoSuchJobException { return getBatchJobManager().refreshBatchJobStatus(batchJobname); } public void removeJobFromBatchJob(String batchJobname, String jobname) throws NoSuchJobException { getBatchJobManager().removeJobFromBatchJob(batchJobname, jobname); } public DtoProperties restartBatchJob(String batchjobname, String restartPolicy, DtoProperties properties) throws NoSuchJobException, JobPropertiesException { return getBatchJobManager().restartBatchJob(batchjobname, restartPolicy, properties); } public void restartJob(String jobname, String changedJsdl) throws JobSubmissionException, NoSuchJobException { getJobManager().restartJob(jobname, changedJsdl); } public void setDebugProperties(Map<String, String> props) { for (final String key : props.keySet()) { if ("submitProxyLifetime".equals(key)) { int lt = -1; try { lt = Integer.parseInt(props.get(key)); SUBMIT_PROXY_LIFETIME = lt; } catch (final NumberFormatException e) { SUBMIT_PROXY_LIFETIME = -1; } } } } public void setUserProperties(DtoProperties properties) { if (properties == null) { return; } for (DtoProperty p : properties.getProperties()) { String key = p.getKey(); String value = p.getValue(); setUserProperty(key, value); } } public void setUserProperty(String key, String value) { getUser().setUserProperty(key, value); } public String submitJob(String jobname) throws JobSubmissionException, NoSuchJobException { return getJobManager().submitJob(jobname); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#submitSupportRequest(java.lang * .String, java.lang.String) */ public void submitSupportRequest(final String subject, final String description) { // TODO } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#umount(java.lang.String) */ public void umount(final String mountpoint) { getUser().unmountFileSystem(mountpoint); getUser().resetMountPoints(); } /* * (non-Javadoc) * * @see grisu.control.ServiceInterface#upload(javax.activation.DataSource , * java.lang.String) */ public String upload(final DataHandler source, final String filename) throws RemoteFileSystemException { return getUser().getFileManager().upload(source, filename); } public void uploadInputFile(String jobname, DataHandler inputFile, String relativePath) throws RemoteFileSystemException, NoSuchJobException { getJobManager().uploadInputFile(jobname, inputFile, relativePath); } }

diff --git a/ToureNPlaner/src/de/uni/stuttgart/informatik/ToureNPlaner/Net/Handler/ConnectionHandler.java b/ToureNPlaner/src/de/uni/stuttgart/informatik/ToureNPlaner/Net/Handler/ConnectionHandler.java index 13928b3..c3d15b5 100644 --- a/ToureNPlaner/src/de/uni/stuttgart/informatik/ToureNPlaner/Net/Handler/ConnectionHandler.java +++ b/ToureNPlaner/src/de/uni/stuttgart/informatik/ToureNPlaner/Net/Handler/ConnectionHandler.java @@ -1,39 +1,40 @@ package de.uni.stuttgart.informatik.ToureNPlaner.Net.Handler; import de.uni.stuttgart.informatik.ToureNPlaner.Net.Observer; import de.uni.stuttgart.informatik.ToureNPlaner.Net.Session; import java.io.OutputStream; import java.net.HttpURLConnection; public abstract class ConnectionHandler extends RawHandler { protected final Session session; public ConnectionHandler(Observer listener, Session session) { super(listener); this.session = session; } protected abstract boolean isPost(); protected abstract String getSuffix(); protected void handleOutput(OutputStream outputStream) throws Exception { } @Override protected HttpURLConnection getHttpUrlConnection() throws Exception { if (!isPost()) return session.openGetConnection(getSuffix()); HttpURLConnection connection = session.openPostConnection(getSuffix()); try { handleOutput(connection.getOutputStream()); - } finally { + } catch (Exception e) { connection.disconnect(); + throw e; } return connection; } } \ No newline at end of file

diff --git a/src/main/java/no/magott/spring/configuration/logging/Log4jDynamicConfigurer.java b/src/main/java/no/magott/spring/configuration/logging/Log4jDynamicConfigurer.java index 3c12361..73210d3 100644 --- a/src/main/java/no/magott/spring/configuration/logging/Log4jDynamicConfigurer.java +++ b/src/main/java/no/magott/spring/configuration/logging/Log4jDynamicConfigurer.java @@ -1,34 +1,40 @@ package no.magott.spring.configuration.logging; import org.apache.log4j.helpers.FileWatchdog; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Log4jConfigurer; import static org.springframework.util.Log4jConfigurer.CLASSPATH_URL_PREFIX;; +/** + * Enables automatic reload of log4j configuration similar to org.springframework.web.util.Log4jConfigListener + * but can be used outside a web container, such as stand alone JRE applications. + * @author morten andersen-gott + * + */ public class Log4jDynamicConfigurer implements InitializingBean, DisposableBean{ public static final String DEFAULT_LOG4J_PROPERTIES = CLASSPATH_URL_PREFIX+"log4j.properties"; private static final long DEFAULT_DELAY = FileWatchdog.DEFAULT_DELAY; private long refreshInterval = DEFAULT_DELAY; private String location =DEFAULT_LOG4J_PROPERTIES; public void afterPropertiesSet() throws Exception { Log4jConfigurer.initLogging(location, refreshInterval); } public void destroy() throws Exception { Log4jConfigurer.shutdownLogging(); } public void setRefreshInterval(long refreshInterval) { this.refreshInterval = refreshInterval; } public void setLocation(String location) { this.location = location; } }

diff --git a/source/net/sourceforge/fullsync/schedule/SchedulerImpl.java b/source/net/sourceforge/fullsync/schedule/SchedulerImpl.java index 3c24876..3c5b244 100644 --- a/source/net/sourceforge/fullsync/schedule/SchedulerImpl.java +++ b/source/net/sourceforge/fullsync/schedule/SchedulerImpl.java @@ -1,129 +1,131 @@ /* * Created on 16.10.2004 */ package net.sourceforge.fullsync.schedule; import java.util.ArrayList; /** * @author <a href="mailto:[email protected]">Jan Kopcsek</a> */ public class SchedulerImpl implements Scheduler, Runnable { private ScheduleTaskSource scheduleSource; private Thread worker; private boolean running; private boolean enabled; private ArrayList schedulerListeners; public SchedulerImpl() { this( null ); } public SchedulerImpl( ScheduleTaskSource source ) { scheduleSource = source; schedulerListeners = new ArrayList(); } public void setSource( ScheduleTaskSource source ) { scheduleSource = source; } public ScheduleTaskSource getSource() { return scheduleSource; } public void addSchedulerChangeListener(SchedulerChangeListener listener) { schedulerListeners.add(listener); } public void removeSchedulerChangeListener(SchedulerChangeListener listener) { schedulerListeners.remove(listener); } protected void fireSchedulerChangedEvent() { for (int i = 0; i < schedulerListeners.size(); i++) { ((SchedulerChangeListener)schedulerListeners.get(i)).schedulerStatusChanged(enabled); } } public boolean isRunning() { return running; } public boolean isEnabled() { return enabled; } public void start() { if( enabled ) return; enabled = true; - if( worker == null ) + if( worker == null || !worker.isAlive() ) { worker = new Thread( this, "Scheduler" ); worker.setDaemon( true ); worker.start(); } fireSchedulerChangedEvent(); } public void stop() { if( !enabled || worker == null ) return; enabled = false; if( running ) { worker.interrupt(); } try { worker.join(); } catch( InterruptedException e ) { } finally { worker = null; } fireSchedulerChangedEvent(); } public void refresh() { if( worker != null ) worker.interrupt(); } public void run() { running = true; while( enabled ) { long now = System.currentTimeMillis(); ScheduleTask task = scheduleSource.getNextScheduleTask(); if( task == null ) { // TODO log sth here ? enabled = false; break; } long nextTime = task.getExecutionTime(); try { if( nextTime >= now ) Thread.sleep( nextTime-now ); task.run(); } catch( InterruptedException ie ) { } } running = false; + enabled = false; + fireSchedulerChangedEvent(); } } diff --git a/source/net/sourceforge/fullsync/ui/ConnectionPage.java b/source/net/sourceforge/fullsync/ui/ConnectionPage.java index 58fc571..33472f8 100644 --- a/source/net/sourceforge/fullsync/ui/ConnectionPage.java +++ b/source/net/sourceforge/fullsync/ui/ConnectionPage.java @@ -1,79 +1,79 @@ /* * Created on Nov 19, 2004 */ package net.sourceforge.fullsync.ui; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; /** * @author Michele Aiello */ public class ConnectionPage implements WizardPage { private WizardDialog dialog; private ConnectionComposite composite; public ConnectionPage(WizardDialog dialog) { this.dialog = dialog; dialog.setPage( this ); } public String getTitle() { return "Connection..."; } public String getCaption() { return "Connect to a Remote Server"; } public String getDescription() { - return "You can connect to remote instance of FullSync."; + return "Choose the target host you want to connect to."; } public Image getIcon() { return GuiController.getInstance().getImage( "Remote_Connect.png" ); } public Image getImage() { return GuiController.getInstance().getImage( "Remote_Wizard.png" ); } public void createContent(Composite content) { composite = new ConnectionComposite(content, SWT.NULL); } public void createBottom(Composite bottom) { bottom.setLayout( new GridLayout( 2, false ) ); Button okButton = new Button( bottom, SWT.PUSH ); okButton.setText( "Ok" ); okButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) { composite.apply(); dialog.dispose(); } }); okButton.setLayoutData( new GridData( GridData.END, GridData.CENTER, true, true ) ); Button cancelButton = new Button( bottom, SWT.PUSH ); cancelButton.setText( "Cancel" ); cancelButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { dialog.dispose(); } } ); cancelButton.setLayoutData( new GridData( GridData.END, GridData.CENTER, false, true ) ); bottom.getShell().setDefaultButton(okButton); } } diff --git a/source/net/sourceforge/fullsync/ui/MainWindow.java b/source/net/sourceforge/fullsync/ui/MainWindow.java index 972a4ff..067fb8b 100644 --- a/source/net/sourceforge/fullsync/ui/MainWindow.java +++ b/source/net/sourceforge/fullsync/ui/MainWindow.java @@ -1,662 +1,662 @@ package net.sourceforge.fullsync.ui; import java.util.Date; import java.util.Timer; import java.util.TimerTask; import net.sourceforge.fullsync.ExceptionHandler; import net.sourceforge.fullsync.Profile; import net.sourceforge.fullsync.ProfileManager; import net.sourceforge.fullsync.ProfileSchedulerListener; import net.sourceforge.fullsync.Synchronizer; import net.sourceforge.fullsync.Task; import net.sourceforge.fullsync.TaskGenerationListener; import net.sourceforge.fullsync.TaskTree; import net.sourceforge.fullsync.fs.File; import net.sourceforge.fullsync.schedule.SchedulerChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.ShellAdapter; import org.eclipse.swt.events.ShellEvent; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.program.Program; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.CoolBar; import org.eclipse.swt.widgets.CoolItem; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; /** * This code was generated using CloudGarden's Jigloo * SWT/Swing GUI Builder, which is free for non-commercial * use. If Jigloo is being used commercially (ie, by a corporation, * company or business for any purpose whatever) then you * should purchase a license for each developer using Jigloo. * Please visit www.cloudgarden.com for details. * Use of Jigloo implies acceptance of these licensing terms. * ************************************* * A COMMERCIAL LICENSE HAS NOT BEEN PURCHASED * for this machine, so Jigloo or this code cannot be used legally * for any corporate or commercial purpose. * ************************************* */ public class MainWindow extends org.eclipse.swt.widgets.Composite implements ProfileSchedulerListener, ProfileListControlHandler, TaskGenerationListener, SchedulerChangeListener { private ToolItem toolItemNew; private Menu menuBarMainWindow; private StatusLine statusLine; private CoolBar coolBar; private CoolItem coolItem1; private ToolBar toolBar1; private ToolItem toolItemRun; private ToolItem toolItemDelete; private ToolItem toolItemEdit; private CoolItem coolItem2; private ToolBar toolBar2; private ToolItem toolItemScheduleIcon; private ToolItem toolItemScheduleStart; private ToolItem toolItemScheduleStop; private Composite profileListContainer; private Menu profilePopupMenu; private ProfileListComposite profileList; private GuiController guiController; private String statusDelayString; private Timer statusDelayTimer; public MainWindow(Composite parent, int style, GuiController initGuiController) { super(parent, style); this.guiController = initGuiController; initGUI(); getShell().addShellListener(new ShellAdapter() { public void shellClosed(ShellEvent event) { event.doit = false; if (guiController.getPreferences().closeMinimizesToSystemTray()) { minimizeToTray(); } else { guiController.closeGui(); } } public void shellIconified(ShellEvent event) { if (guiController.getPreferences().minimizeMinimizesToSystemTray()) { event.doit = false; minimizeToTray(); } else { event.doit = true; } } } ); ProfileManager pm = guiController.getProfileManager(); pm.addSchedulerListener( this ); pm.addSchedulerChangeListener( this ); guiController.getSynchronizer().getProcessor().addTaskGenerationListener(this); // REVISIT [Michele] Autogenerated event? I don't like it! schedulerStatusChanged(pm.isSchedulerEnabled()); } /** * Initializes the GUI. * Auto-generated code - any changes you make will disappear. */ protected void initGUI(){ try { this.setSize(600, 300); GridLayout thisLayout = new GridLayout(); thisLayout.horizontalSpacing = 0; thisLayout.marginHeight = 0; thisLayout.marginWidth = 0; thisLayout.verticalSpacing = 0; this.setLayout(thisLayout); { coolBar = new CoolBar(this, SWT.NONE); coolBar.setLocked(false); { coolItem1 = new CoolItem(coolBar, SWT.NONE); { toolBar1 = new ToolBar(coolBar, SWT.FLAT); { toolItemNew = new ToolItem(toolBar1, SWT.PUSH); toolItemNew.setImage( guiController.getImage( "Button_New.png" ) ); toolItemNew.setToolTipText("New Profile"); toolItemNew .addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { createNewProfile(); } }); } { toolItemEdit = new ToolItem(toolBar1, SWT.PUSH); toolItemEdit.setImage( guiController.getImage( "Button_Edit.png" ) ); toolItemEdit.setToolTipText("Edit Profile"); toolItemEdit .addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { editProfile( profileList.getSelectedProfile() ); } }); } { toolItemDelete = new ToolItem(toolBar1, SWT.PUSH); toolItemDelete.setImage( guiController.getImage( "Button_Delete.png" ) ); toolItemDelete.setToolTipText("Delete Profile"); toolItemDelete .addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { deleteProfile( profileList.getSelectedProfile() ); } }); } { toolItemRun = new ToolItem(toolBar1, SWT.PUSH); toolItemRun.setImage( guiController.getImage( "Button_Run.png" ) ); toolItemRun.setToolTipText("Run Profile"); toolItemRun .addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { runProfile( profileList.getSelectedProfile() ); } }); } toolBar1.pack(); } coolItem1.setControl(toolBar1); //coolItem1.setMinimumSize(new org.eclipse.swt.graphics.Point(128, 22)); coolItem1.setPreferredSize(new org.eclipse.swt.graphics.Point(128, 22)); } { coolItem2 = new CoolItem(coolBar, SWT.NONE); coolItem2.setSize(494, 22); coolItem2.setMinimumSize(new org.eclipse.swt.graphics.Point(24,22)); coolItem2.setPreferredSize(new org.eclipse.swt.graphics.Point(24,22)); { toolBar2 = new ToolBar(coolBar, SWT.FLAT); coolItem2.setControl(toolBar2); { toolItemScheduleIcon = new ToolItem(toolBar2, SWT.NULL); toolItemScheduleIcon.setImage( guiController.getImage( "Scheduler_Icon.png" ) ); toolItemScheduleIcon.setDisabledImage( guiController.getImage( "Scheduler_Icon.png" ) ); toolItemScheduleIcon.setEnabled( false ); } { toolItemScheduleStart = new ToolItem(toolBar2, SWT.NULL); toolItemScheduleStart.setToolTipText( "Start Scheduler" ); toolItemScheduleStart.setImage( guiController.getImage( "Scheduler_Start.png" ) ); toolItemScheduleStart .addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { guiController.getProfileManager().startScheduler(); } }); } { toolItemScheduleStop = new ToolItem(toolBar2, SWT.PUSH); toolItemScheduleStop.setToolTipText( "Stop Scheduler" ); toolItemScheduleStop.setImage( guiController.getImage( "Scheduler_Stop.png" ) ); toolItemScheduleStop .addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { guiController.getProfileManager().stopScheduler(); } }); } } } GridData coolBarLData = new GridData(); coolBarLData.grabExcessHorizontalSpace = true; coolBarLData.horizontalAlignment = GridData.FILL; coolBarLData.verticalAlignment = GridData.FILL; coolBar.setLayoutData(coolBarLData); coolBar.setLocked(true); } { menuBarMainWindow = new Menu(getShell(), SWT.BAR); getShell().setMenuBar(menuBarMainWindow); } { profileListContainer = new Composite( this, SWT.NULL ); GridData profileListLData = new GridData(); profileListLData.grabExcessHorizontalSpace = true; profileListLData.grabExcessVerticalSpace = true; profileListLData.horizontalAlignment = GridData.FILL; profileListLData.verticalAlignment = GridData.FILL; profileListContainer.setLayoutData( profileListLData ); profileListContainer.setLayout( new FillLayout() ); } { statusLine = new StatusLine(this, SWT.NONE); GridData statusLineLData = new GridData(); statusLineLData.grabExcessHorizontalSpace = true; statusLineLData.horizontalAlignment = GridData.FILL; statusLine.setLayoutData(statusLineLData); } createMenu(); createPopupMenu(); createProfileList(); this.layout(); } catch (Exception e) { ExceptionHandler.reportException( e ); } } protected void createMenu() { //toolBar1.layout(); // Menu Bar MenuItem menuItemFile = new MenuItem(menuBarMainWindow, SWT.CASCADE); menuItemFile.setText("&File"); Menu menuFile = new Menu(menuItemFile); menuItemFile.setMenu(menuFile); MenuItem menuItemNewProfile = new MenuItem(menuFile, SWT.PUSH); - menuItemNewProfile.setText("&New Profile..."); + menuItemNewProfile.setText("&New Profile"); menuItemNewProfile.setImage( guiController.getImage( "Button_New.png" ) ); menuItemNewProfile.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { createNewProfile(); } } ); MenuItem separatorItem3 = new MenuItem(menuFile, SWT.SEPARATOR); MenuItem menuItemEditProfile = new MenuItem(menuFile, SWT.PUSH); - menuItemEditProfile.setText("&Edit Profile..."); + menuItemEditProfile.setText("&Edit Profile"); menuItemEditProfile.setImage( guiController.getImage( "Button_Edit.png" ) ); menuItemEditProfile.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { editProfile( profileList.getSelectedProfile() ); } } ); MenuItem menuItemRunProfile = new MenuItem(menuFile, SWT.PUSH); - menuItemRunProfile.setText("&Run Profile..."); + menuItemRunProfile.setText("&Run Profile"); menuItemRunProfile.setImage( guiController.getImage( "Button_Run.png" ) ); menuItemRunProfile.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { runProfile( profileList.getSelectedProfile() ); } } ); MenuItem separatorItem4 = new MenuItem(menuFile, SWT.SEPARATOR); MenuItem menuItemDeleteProfile = new MenuItem(menuFile, SWT.PUSH); - menuItemDeleteProfile.setText("&Delete Profile..."); + menuItemDeleteProfile.setText("&Delete Profile"); menuItemDeleteProfile.setImage( guiController.getImage( "Button_Delete.png" ) ); menuItemDeleteProfile.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { deleteProfile( profileList.getSelectedProfile() ); } } ); MenuItem separatorItem5 = new MenuItem(menuFile, SWT.SEPARATOR); MenuItem menuItemExitProfile = new MenuItem(menuFile, SWT.PUSH); menuItemExitProfile.setText("Exit"); menuItemExitProfile.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { guiController.closeGui(); } } ); MenuItem menuItemEdit = new MenuItem(menuBarMainWindow, SWT.CASCADE); menuItemEdit.setText("&Edit"); Menu menuEdit = new Menu(menuItemEdit); menuItemEdit.setMenu(menuEdit); MenuItem logItem = new MenuItem(menuEdit, SWT.PUSH); - logItem .setText("&Show Logs...\tCtrl+Shift+L"); + logItem .setText("&Show Logs\tCtrl+Shift+L"); logItem .setAccelerator(SWT.CTRL|SWT.SHIFT+'L'); logItem .addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { // open main log file Program.launch( new java.io.File( "logs/fullsync.log" ).getAbsolutePath() ); } } ); MenuItem preferencesItem = new MenuItem(menuEdit, SWT.PUSH); - preferencesItem.setText("&Preferences...\tCtrl+Shift+P"); + preferencesItem.setText("&Preferences\tCtrl+Shift+P"); preferencesItem.setAccelerator(SWT.CTRL|SWT.SHIFT+'P'); preferencesItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { // show the Preferences Dialog. WizardDialog dialog = new WizardDialog( getShell(), SWT.APPLICATION_MODAL ); WizardPage page = new PreferencesPage( dialog, guiController.getPreferences() ); dialog.show(); } } ); MenuItem menuItemRemoteConnection = new MenuItem(menuBarMainWindow, SWT.CASCADE); menuItemRemoteConnection.setText("&Remote Connection"); Menu menuRemoteConnection = new Menu(menuItemRemoteConnection); menuItemRemoteConnection.setMenu(menuRemoteConnection); final MenuItem connectItem = new MenuItem(menuRemoteConnection, SWT.PUSH); - connectItem.setText("&Connect to a remote server...\tCtrl+Shift+C"); + connectItem.setText("&Connect to a remote server\tCtrl+Shift+C"); connectItem.setAccelerator(SWT.CTRL|SWT.SHIFT+'C'); connectItem.setEnabled(true); final MenuItem disconnectItem = new MenuItem(menuRemoteConnection, SWT.PUSH); disconnectItem.setText("&Disconnect\tCtrl+Shift+D"); disconnectItem.setAccelerator(SWT.CTRL|SWT.SHIFT+'D'); disconnectItem.setEnabled(false); connectItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { WizardDialog dialog = new WizardDialog( getShell(), SWT.APPLICATION_MODAL ); ConnectionPage page = new ConnectionPage(dialog); dialog.show(); if (GuiController.getInstance().getProfileManager().isConnected()) { connectItem.setEnabled(false); disconnectItem.setEnabled(true); GuiController.getInstance().getMainShell().setImage( GuiController.getInstance().getImage( "Remote_Connect.png" )); } } } ); disconnectItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING | SWT.YES | SWT.NO); mb.setText("Confirmation"); mb.setMessage("Do you really want to Disconnect the Remote Server? \n"); if (mb.open() == SWT.YES) { GuiController.getInstance().getProfileManager().disconnectRemote(); GuiController.getInstance().getSynchronizer().disconnectRemote(); connectItem.setEnabled(true); disconnectItem.setEnabled(false); GuiController.getInstance().getMainShell().setImage( GuiController.getInstance().getImage( "FullSync.png" )); } } } ); MenuItem menuItemHelp = new MenuItem(menuBarMainWindow, SWT.CASCADE); menuItemHelp.setText("&Help"); Menu menuHelp = new Menu(menuItemHelp); menuItemHelp.setMenu(menuHelp); MenuItem menuItemHelpContent = new MenuItem(menuHelp, SWT.PUSH); menuItemHelpContent.setText("Help\tF1"); menuItemHelpContent.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { //TODO help contents //The first version can be an HTML/TXT file to open //with the default browser. } } ); MenuItem separatorItem6 = new MenuItem(menuHelp, SWT.SEPARATOR); MenuItem menuItemAbout = new MenuItem(menuHelp, SWT.PUSH); menuItemAbout.setAccelerator(SWT.CTRL+'A'); menuItemAbout.setText("&About FullSync\tCtrl+A"); menuItemAbout.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { AboutDialog aboutDialog = new AboutDialog(getShell(), SWT.NULL); aboutDialog.open(); } } ); } protected void createPopupMenu() { // PopUp Menu for the Profile list. profilePopupMenu = new Menu(getShell(), SWT.POP_UP); MenuItem runItem = new MenuItem(profilePopupMenu, SWT.PUSH); runItem.setText("Run Profile"); runItem.setImage( guiController.getImage( "Button_Run.png" ) ); runItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { runProfile( profileList.getSelectedProfile() ); } } ); MenuItem editItem = new MenuItem(profilePopupMenu, SWT.PUSH); editItem.setText("Edit Profile"); editItem.setImage( guiController.getImage( "Button_Edit.png" ) ); editItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { editProfile( profileList.getSelectedProfile() ); } } ); MenuItem deleteItem = new MenuItem(profilePopupMenu, SWT.PUSH); deleteItem.setText("Delete Profile"); deleteItem.setImage( guiController.getImage( "Button_Delete.png" ) ); deleteItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { deleteProfile( profileList.getSelectedProfile() ); } } ); MenuItem separatorItem1 = new MenuItem(profilePopupMenu, SWT.SEPARATOR); MenuItem addItem = new MenuItem(profilePopupMenu, SWT.PUSH); addItem.setText("New Profile"); addItem.setImage( guiController.getImage( "Button_New.png" ) ); addItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { createNewProfile(); } } ); } public void createProfileList() { if( profileList != null ) { // take away our menu so it's not disposed profileList.setMenu( null ); profileList.dispose(); } if( guiController.getPreferences().getProfileListStyle().equals( "NiceListView" ) ) profileList = new NiceListViewProfileListComposite( profileListContainer, SWT.NULL ); else profileList = new ListViewProfileListComposite( profileListContainer, SWT.NULL ); profileList.setMenu( profilePopupMenu ); profileList.setHandler( this ); profileList.setProfileManager( guiController.getProfileManager() ); profileListContainer.layout(); } public StatusLine getStatusLine() { return statusLine; } public GuiController getGuiController() { return guiController; } protected void minimizeToTray() { // on OSX use this: // mainWindow.setMinimized(true); getShell().setMinimized(true); getShell().setVisible(false); // TODO make sure Tray is visible here } // TODO [Michele] Implement this listener also on the remote interface public void schedulerStatusChanged( final boolean enabled ) { - getDisplay().asyncExec(new Runnable() { + getDisplay().syncExec(new Runnable() { public void run() { toolItemScheduleStart.setEnabled( !enabled ); toolItemScheduleStop.setEnabled( enabled ); } }); } public void taskTreeStarted( TaskTree tree ) { } public void taskGenerationStarted( final File source, final File destination ) { //statusLine.setMessage( "checking "+source.getPath() ); statusDelayString = "checking "+source.getPath(); } public void taskGenerationFinished( Task task ) { } public void taskTreeFinished( TaskTree tree ) { statusLine.setMessage( "synchronization finished"); } public void profileExecutionScheduled( Profile profile ) { Synchronizer sync = guiController.getSynchronizer(); TaskTree tree = sync.executeProfile( profile ); if( tree == null ) { profile.setLastError( 1, "An error occured while comparing filesystems." ); } else { int errorLevel = sync.performActions( tree ); if( errorLevel > 0 ) { profile.setLastError( errorLevel, "An error occured while copying files." ); } else { profile.beginUpdate(); profile.setLastError( 0, null ); profile.setLastUpdate( new Date() ); profile.endUpdate(); } } } public void createNewProfile() { ProfileDetails.showProfile( getShell(), guiController.getProfileManager(), null ); } public void runProfile( final Profile p ) { if( p == null ) return; Thread worker = new Thread( new Runnable() { public void run() { _doRunProfile(p); } }); worker.start(); } private synchronized void _doRunProfile( Profile p ) { TaskTree t = null; try { guiController.showBusyCursor( true ); try { // REVISIT wow, a timer here is pretty much overhead / specific for // this generell problem statusDelayTimer = new Timer( true ); statusDelayTimer.schedule( new TimerTask() { public void run() { statusLine.setMessage( statusDelayString ); } }, 10, 100 ); statusDelayString = "Starting profile "+p.getName()+"..."; statusLine.setMessage( statusDelayString ); t = guiController.getSynchronizer().executeProfile( p ); if( t == null ) { p.setLastError( 1, "An error occured while comparing filesystems." ); statusLine.setMessage( "An error occured while processing profile "+p.getName()+". Please see the logs for more information." ); } else { statusLine.setMessage( "Finished profile "+p.getName() ); } } catch (Exception e) { ExceptionHandler.reportException( e ); } finally { statusDelayTimer.cancel(); guiController.showBusyCursor( false ); } if( t != null ) TaskDecisionList.show( guiController, p, t ); } catch( Exception e ) { ExceptionHandler.reportException( e ); } } public void editProfile( final Profile p ) { if( p == null ) return; ProfileDetails.showProfile( getShell(), guiController.getProfileManager(), p.getName() ); } public void deleteProfile( final Profile p ) { if( p == null ) return; ProfileManager profileManager = guiController.getProfileManager(); MessageBox mb = new MessageBox( getShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO ); mb.setText( "Confirmation" ); mb.setMessage( "Do you really want to delete profile "+p.getName()+" ?"); if( mb.open() == SWT.YES ) { profileManager.removeProfile( p ); profileManager.save(); } } protected void toolItemScheduleWidgedSelected(SelectionEvent evt) { ProfileManager profileManager = guiController.getProfileManager(); if( profileManager.isSchedulerEnabled() ) { profileManager.stopScheduler(); } else { profileManager.startScheduler(); } // updateTimerEnabled(); } }

diff --git a/src/main/java/edu/helsinki/sulka/models/Field.java b/src/main/java/edu/helsinki/sulka/models/Field.java index 5e9526a..3e7e8d1 100644 --- a/src/main/java/edu/helsinki/sulka/models/Field.java +++ b/src/main/java/edu/helsinki/sulka/models/Field.java @@ -1,150 +1,151 @@ package edu.helsinki.sulka.models; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; @JsonIgnoreProperties(ignoreUnknown=true) public class Field { @JsonProperty("field") private String fieldName; @JsonProperty("name") private String name; @JsonProperty("description") private String description; public static enum FieldType { VARCHAR, INTEGER, DECIMAL, DATE, ENUMERATION } @JsonProperty("type") private FieldType type; public static enum ViewMode { BROWSING, RINGINGS, RECOVERIES }; @JsonProperty("modes") private Set<ViewMode> viewModes; @JsonSetter("modes") public void setViewModes(String[] modes) { Set<ViewMode> viewModes = new HashSet<ViewMode>(); for (String mode : modes) { try { viewModes.add(ViewMode.valueOf(mode)); } catch (IllegalArgumentException e) { // Ignore } } this.viewModes = viewModes; } @JsonIgnoreProperties(ignoreUnknown=true) public static class EnumerationValue { @JsonProperty("description") private String description; @JsonProperty("value") private String value; /* * Accessors */ public String getDescription() { return description; } public String getValue() { return value; } } @JsonProperty("enumerationValues") private EnumerationValue[] enumerationValues; /* * Accessors */ public String getFieldName() { return this.fieldName; } public String getName() { return this.name; } public String getDescription() { return this.description; } public FieldType getType() { return type; } public EnumerationValue[] getEnumerationValues() { return enumerationValues; } public Set<ViewMode> getViewModes() { return viewModes; } + @JsonIgnore + private Map<String, String> enumerationDescriptionsMap = null; + /** * Get map of enumeration descriptions by enumeration values. * Assumes getType() == FieldType.ENUMERATION * @return Map of enumeration value descriptions by possible enumeration values. */ - @JsonIgnore - private Map<String, String> enumerationDescriptionsMap = null; public Map<String, String> getEnumerationDescriptionsMap() { if (this.enumerationDescriptionsMap != null) { return this.enumerationDescriptionsMap; } EnumerationValue[] evs = getEnumerationValues(); HashMap<String, String> enumerationMap = new HashMap<String, String>(evs.length); for (EnumerationValue ev : evs) { enumerationMap.put(ev.value, ev.description); } return enumerationDescriptionsMap = enumerationMap; } /** * Assumes getType() == FieldType.ENUMERATION * @param enumerationValue Valid enumeration value * @return Description for enumeration value enumerationValue */ public String getEnumerationDescription(final String enumerationValue) { return getEnumerationDescriptionsMap().get(enumerationValue); } /* * Hash implementation */ @Override public int hashCode() { return this.getFieldName().hashCode(); } @Override public boolean equals(Object other) { if (other instanceof Field) { return this.getFieldName().equals(((Field) other).getFieldName()); } return false; } }

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 73578c738..79a394800 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -1,936 +1,941 @@ /* * Copyright (C) 2007 The Android Open Source Project * * 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 com.android.settings; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.ContentQueryMap; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; import android.database.Cursor; import android.location.LocationManager; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceCategory; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; import android.provider.Settings; import android.security.Keystore; import android.text.Html; import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.TextView; import android.widget.Toast; import com.android.internal.widget.LockPatternUtils; import android.telephony.TelephonyManager; import java.util.ArrayList; import java.util.List; import java.util.Observable; import java.util.Observer; /** * Gesture lock pattern settings. */ public class SecuritySettings extends PreferenceActivity implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener { // Lock Settings private static final String KEY_LOCK_ENABLED = "lockenabled"; private static final String KEY_VISIBLE_PATTERN = "visiblepattern"; private static final String KEY_TACTILE_FEEDBACK_ENABLED = "tactilefeedback"; private static final int CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE = 55; private LockPatternUtils mLockPatternUtils; private CheckBoxPreference mLockEnabled; private CheckBoxPreference mVisiblePattern; private CheckBoxPreference mTactileFeedback; private Preference mChoosePattern; private CheckBoxPreference mShowPassword; // Location Settings private static final String LOCATION_CATEGORY = "location_category"; private static final String LOCATION_NETWORK = "location_network"; private static final String LOCATION_GPS = "location_gps"; // Credential storage public static final String ACTION_ADD_CREDENTIAL = "android.security.ADD_CREDENTIAL"; public static final String ACTION_UNLOCK_CREDENTIAL_STORAGE = "android.security.UNLOCK_CREDENTIAL_STORAGE"; private static final String KEY_CSTOR_TYPE_NAME = "typeName"; private static final String KEY_CSTOR_ITEM = "item"; private static final String KEY_CSTOR_NAMESPACE = "namespace"; private static final String KEY_CSTOR_DESCRIPTION = "description"; private static final int CSTOR_MIN_PASSWORD_LENGTH = 8; private static final int CSTOR_INIT_DIALOG = 1; private static final int CSTOR_CHANGE_PASSWORD_DIALOG = 2; private static final int CSTOR_UNLOCK_DIALOG = 3; private static final int CSTOR_RESET_DIALOG = 4; private static final int CSTOR_NAME_CREDENTIAL_DIALOG = 5; private CstorHelper mCstorHelper = new CstorHelper(); // Vendor specific private static final String GSETTINGS_PROVIDER = "com.google.android.providers.settings"; private static final String USE_LOCATION = "use_location"; private static final String KEY_DONE_USE_LOCATION = "doneLocation"; private CheckBoxPreference mUseLocation; private boolean mOkClicked; private Dialog mUseLocationDialog; private CheckBoxPreference mNetwork; private CheckBoxPreference mGps; // These provide support for receiving notification when Location Manager settings change. // This is necessary because the Network Location Provider can change settings // if the user does not confirm enabling the provider. private ContentQueryMap mContentQueryMap; private final class SettingsObserver implements Observer { public void update(Observable o, Object arg) { updateToggles(); } } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.security_settings); mLockPatternUtils = new LockPatternUtils(getContentResolver()); createPreferenceHierarchy(); mNetwork = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_NETWORK); mGps = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_GPS); mUseLocation = (CheckBoxPreference) getPreferenceScreen().findPreference(USE_LOCATION); // Vendor specific try { if (mUseLocation != null && getPackageManager().getPackageInfo(GSETTINGS_PROVIDER, 0) == null) { ((PreferenceGroup)findPreference(LOCATION_CATEGORY)) .removePreference(mUseLocation); } } catch (NameNotFoundException nnfe) { } updateToggles(); // listen for Location Manager settings changes Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null, "(" + Settings.System.NAME + "=?)", new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED}, null); mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null); mContentQueryMap.addObserver(new SettingsObserver()); boolean doneUseLocation = savedInstanceState != null && savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true); if (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false) && !doneUseLocation) { showUseLocationDialog(true); } mCstorHelper.handleCstorIntents(getIntent()); } private PreferenceScreen createPreferenceHierarchy() { // Root PreferenceScreen root = this.getPreferenceScreen(); // Inline preferences PreferenceCategory inlinePrefCat = new PreferenceCategory(this); inlinePrefCat.setTitle(R.string.lock_settings_title); root.addPreference(inlinePrefCat); // autolock toggle mLockEnabled = new LockEnabledPref(this); mLockEnabled.setTitle(R.string.lockpattern_settings_enable_title); mLockEnabled.setSummary(R.string.lockpattern_settings_enable_summary); mLockEnabled.setKey(KEY_LOCK_ENABLED); inlinePrefCat.addPreference(mLockEnabled); // visible pattern mVisiblePattern = new CheckBoxPreference(this); mVisiblePattern.setKey(KEY_VISIBLE_PATTERN); mVisiblePattern.setTitle(R.string.lockpattern_settings_enable_visible_pattern_title); inlinePrefCat.addPreference(mVisiblePattern); // tactile feedback mTactileFeedback = new CheckBoxPreference(this); mTactileFeedback.setKey(KEY_TACTILE_FEEDBACK_ENABLED); mTactileFeedback.setTitle(R.string.lockpattern_settings_enable_tactile_feedback_title); inlinePrefCat.addPreference(mTactileFeedback); // change pattern lock Intent intent = new Intent(); intent.setClassName("com.android.settings", "com.android.settings.ChooseLockPatternTutorial"); mChoosePattern = getPreferenceManager().createPreferenceScreen(this); mChoosePattern.setIntent(intent); inlinePrefCat.addPreference(mChoosePattern); int activePhoneType = TelephonyManager.getDefault().getPhoneType(); // do not display SIM lock for CDMA phone if (TelephonyManager.PHONE_TYPE_CDMA != activePhoneType) { PreferenceScreen simLockPreferences = getPreferenceManager() .createPreferenceScreen(this); simLockPreferences.setTitle(R.string.sim_lock_settings_category); // Intent to launch SIM lock settings intent = new Intent(); intent.setClassName("com.android.settings", "com.android.settings.IccLockSettings"); simLockPreferences.setIntent(intent); PreferenceCategory simLockCat = new PreferenceCategory(this); simLockCat.setTitle(R.string.sim_lock_settings_title); root.addPreference(simLockCat); simLockCat.addPreference(simLockPreferences); } // Passwords PreferenceCategory passwordsCat = new PreferenceCategory(this); passwordsCat.setTitle(R.string.security_passwords_title); root.addPreference(passwordsCat); CheckBoxPreference showPassword = mShowPassword = new CheckBoxPreference(this); showPassword.setKey("show_password"); showPassword.setTitle(R.string.show_password); showPassword.setSummary(R.string.show_password_summary); showPassword.setPersistent(false); passwordsCat.addPreference(showPassword); // Credential storage PreferenceCategory credStoreCat = new PreferenceCategory(this); credStoreCat.setTitle(R.string.cstor_settings_category); root.addPreference(credStoreCat); credStoreCat.addPreference(mCstorHelper.createAccessCheckBox()); credStoreCat.addPreference(mCstorHelper.createSetPasswordPreference()); credStoreCat.addPreference(mCstorHelper.createResetPreference()); return root; } @Override protected void onResume() { super.onResume(); boolean patternExists = mLockPatternUtils.savedPatternExists(); mLockEnabled.setEnabled(patternExists); mVisiblePattern.setEnabled(patternExists); mTactileFeedback.setEnabled(patternExists); mLockEnabled.setChecked(mLockPatternUtils.isLockPatternEnabled()); mVisiblePattern.setChecked(mLockPatternUtils.isVisiblePatternEnabled()); mTactileFeedback.setChecked(mLockPatternUtils.isTactileFeedbackEnabled()); int chooseStringRes = mLockPatternUtils.savedPatternExists() ? R.string.lockpattern_settings_change_lock_pattern : R.string.lockpattern_settings_choose_lock_pattern; mChoosePattern.setTitle(chooseStringRes); mShowPassword .setChecked(Settings.System.getInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, 1) != 0); } @Override public void onPause() { if (mUseLocationDialog != null && mUseLocationDialog.isShowing()) { mUseLocationDialog.dismiss(); } mUseLocationDialog = null; super.onPause(); } @Override public void onSaveInstanceState(Bundle icicle) { if (mUseLocationDialog != null && mUseLocationDialog.isShowing()) { icicle.putBoolean(KEY_DONE_USE_LOCATION, false); } super.onSaveInstanceState(icicle); } @Override public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { final String key = preference.getKey(); if (KEY_LOCK_ENABLED.equals(key)) { mLockPatternUtils.setLockPatternEnabled(isToggled(preference)); } else if (KEY_VISIBLE_PATTERN.equals(key)) { mLockPatternUtils.setVisiblePatternEnabled(isToggled(preference)); } else if (KEY_TACTILE_FEEDBACK_ENABLED.equals(key)) { mLockPatternUtils.setTactileFeedbackEnabled(isToggled(preference)); } else if (preference == mShowPassword) { Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, mShowPassword.isChecked() ? 1 : 0); } else if (preference == mNetwork) { Settings.Secure.setLocationProviderEnabled(getContentResolver(), LocationManager.NETWORK_PROVIDER, mNetwork.isChecked()); } else if (preference == mGps) { Settings.Secure.setLocationProviderEnabled(getContentResolver(), LocationManager.GPS_PROVIDER, mGps.isChecked()); } else if (preference == mUseLocation) { //normally called on the toggle click if (mUseLocation.isChecked()) { showUseLocationDialog(false); } else { updateUseLocation(); } } return false; } private void showPrivacyPolicy() { Intent intent = new Intent("android.settings.TERMS"); startActivity(intent); } private void showUseLocationDialog(boolean force) { // Show a warning to the user that location data will be shared mOkClicked = false; if (force) { mUseLocation.setChecked(true); } CharSequence msg = getResources().getText(R.string.use_location_warning_message); mUseLocationDialog = new AlertDialog.Builder(this).setMessage(msg) .setTitle(R.string.use_location_title) .setIcon(android.R.drawable.ic_dialog_alert) .setPositiveButton(R.string.agree, this) .setNegativeButton(R.string.disagree, this) .show(); ((TextView)mUseLocationDialog.findViewById(android.R.id.message)) .setMovementMethod(LinkMovementMethod.getInstance()); mUseLocationDialog.setOnDismissListener(this); } /* * Creates toggles for each available location provider */ private void updateToggles() { ContentResolver res = getContentResolver(); mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled( res, LocationManager.NETWORK_PROVIDER)); mGps.setChecked(Settings.Secure.isLocationProviderEnabled( res, LocationManager.GPS_PROVIDER)); mUseLocation.setChecked(Settings.Secure.getInt(res, Settings.Secure.USE_LOCATION_FOR_SERVICES, 2) == 1); } private boolean isToggled(Preference pref) { return ((CheckBoxPreference) pref).isChecked(); } private void updateUseLocation() { boolean use = mUseLocation.isChecked(); Settings.Secure.putInt(getContentResolver(), Settings.Secure.USE_LOCATION_FOR_SERVICES, use ? 1 : 0); } /** * For the user to disable keyguard, we first make them verify their * existing pattern. */ private class LockEnabledPref extends CheckBoxPreference { public LockEnabledPref(Context context) { super(context); } @Override protected void onClick() { if (mLockPatternUtils.savedPatternExists() && isChecked()) { confirmPatternThenDisableAndClear(); } else { super.onClick(); } } } /** * Launch screen to confirm the existing lock pattern. * @see #onActivityResult(int, int, android.content.Intent) */ private void confirmPatternThenDisableAndClear() { final Intent intent = new Intent(); intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern"); startActivityForResult(intent, CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE); } /** * @see #confirmPatternThenDisableAndClear */ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); final boolean resultOk = resultCode == Activity.RESULT_OK; if ((requestCode == CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE) && resultOk) { mLockPatternUtils.setLockPatternEnabled(false); mLockPatternUtils.saveLockPattern(null); } } public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_POSITIVE) { //updateProviders(); mOkClicked = true; } else { // Reset the toggle mUseLocation.setChecked(false); } updateUseLocation(); } public void onDismiss(DialogInterface dialog) { // Assuming that onClick gets called first if (!mOkClicked) { mUseLocation.setChecked(false); } } @Override protected Dialog onCreateDialog (int id) { switch (id) { case CSTOR_INIT_DIALOG: case CSTOR_CHANGE_PASSWORD_DIALOG: return mCstorHelper.createSetPasswordDialog(id); case CSTOR_UNLOCK_DIALOG: return mCstorHelper.createUnlockDialog(); case CSTOR_RESET_DIALOG: return mCstorHelper.createResetDialog(); case CSTOR_NAME_CREDENTIAL_DIALOG: return mCstorHelper.createNameCredentialDialog(); default: return null; } } private class CstorHelper implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { private Keystore mKeystore = Keystore.getInstance(); private View mView; private int mDialogId; private boolean mConfirm = true; private CheckBoxPreference mAccessCheckBox; private Preference mResetButton; private Intent mSpecialIntent; private CstorAddCredentialHelper mCstorAddCredentialHelper; void handleCstorIntents(Intent intent) { if (intent == null) return; String action = intent.getAction(); if (ACTION_ADD_CREDENTIAL.equals(action)) { mCstorAddCredentialHelper = new CstorAddCredentialHelper(intent); showDialog(CSTOR_NAME_CREDENTIAL_DIALOG); } else if (ACTION_UNLOCK_CREDENTIAL_STORAGE.equals(action)) { mSpecialIntent = intent; showDialog(mCstorHelper.isCstorInitialized() ? CSTOR_UNLOCK_DIALOG : CSTOR_INIT_DIALOG); } } private boolean isCstorUnlocked() { return (mKeystore.getState() == Keystore.UNLOCKED); } private boolean isCstorInitialized() { return (mKeystore.getState() != Keystore.UNINITIALIZED); } private void lockCstor() { mKeystore.lock(); mAccessCheckBox.setChecked(false); } private int unlockCstor(String passwd) { int ret = mKeystore.unlock(passwd); if (ret == -1) resetCstor(); if (ret == 0) { Toast.makeText(SecuritySettings.this, R.string.cstor_is_enabled, Toast.LENGTH_SHORT).show(); } return ret; } private int changeCstorPassword(String oldPasswd, String newPasswd) { int ret = mKeystore.changePassword(oldPasswd, newPasswd); if (ret == -1) resetCstor(); return ret; } private void initCstor(String passwd) { mKeystore.setPassword(passwd); enablePreferences(true); mAccessCheckBox.setChecked(true); Toast.makeText(SecuritySettings.this, R.string.cstor_is_enabled, Toast.LENGTH_SHORT).show(); } private void resetCstor() { mKeystore.reset(); enablePreferences(false); mAccessCheckBox.setChecked(false); } private void addCredential() { String formatString = mCstorAddCredentialHelper.saveToStorage() < 0 ? getString(R.string.cstor_add_error) : getString(R.string.cstor_is_added); String message = String.format(formatString, mCstorAddCredentialHelper.getName()); Toast.makeText(SecuritySettings.this, message, Toast.LENGTH_SHORT) .show(); } public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_NEGATIVE) { - if (mCstorAddCredentialHelper != null) finish(); + if (mCstorAddCredentialHelper != null) { + // release the object here so that it doesn't get triggerred in + // onDismiss() + mCstorAddCredentialHelper = null; + finish(); + } return; } switch (mDialogId) { case CSTOR_INIT_DIALOG: case CSTOR_CHANGE_PASSWORD_DIALOG: mConfirm = checkPasswords((Dialog) dialog); break; case CSTOR_UNLOCK_DIALOG: mConfirm = checkUnlockPassword((Dialog) dialog); break; case CSTOR_RESET_DIALOG: resetCstor(); break; case CSTOR_NAME_CREDENTIAL_DIALOG: mConfirm = checkAddCredential(); break; } } public void onDismiss(DialogInterface dialog) { if (!mConfirm) { mConfirm = true; showDialog(mDialogId); } else { removeDialog(mDialogId); if (mCstorAddCredentialHelper != null) { if (!isCstorInitialized()) { showDialog(CSTOR_INIT_DIALOG); } else if (!isCstorUnlocked()) { showDialog(CSTOR_UNLOCK_DIALOG); } else { addCredential(); finish(); } } else if (mSpecialIntent != null) { finish(); } } } private void showResetWarning(int count) { TextView v = showError(count <= 3 ? R.string.cstor_password_error_reset_warning : R.string.cstor_password_error); if (count <= 3) { if (count == 1) { v.setText(R.string.cstor_password_error_reset_warning); } else { String format = getString( R.string.cstor_password_error_reset_warning_plural); v.setText(String.format(format, count)); } } } private boolean checkAddCredential() { hideError(); String name = getText(R.id.cstor_credential_name); if (TextUtils.isEmpty(name)) { showError(R.string.cstor_name_empty_error); return false; } for (int i = 0, len = name.length(); i < len; i++) { if (!Character.isLetterOrDigit(name.charAt(i))) { showError(R.string.cstor_name_char_error); return false; } } mCstorAddCredentialHelper.setName(name); return true; } // returns true if the password is long enough and does not contain // characters that we don't like private boolean verifyPassword(String passwd) { if (passwd == null) { showError(R.string.cstor_passwords_empty_error); return false; } else if ((passwd.length() < CSTOR_MIN_PASSWORD_LENGTH) || passwd.contains(" ")) { showError(R.string.cstor_password_verification_error); return false; } else { return true; } } // returns true if the password is ok private boolean checkUnlockPassword(Dialog d) { hideError(); String passwd = getText(R.id.cstor_password); if (TextUtils.isEmpty(passwd)) { showError(R.string.cstor_password_empty_error); return false; } int count = unlockCstor(passwd); if (count > 0) { showResetWarning(count); return false; } else { // done or reset return true; } } // returns true if the passwords are ok private boolean checkPasswords(Dialog d) { hideError(); String oldPasswd = getText(R.id.cstor_old_password); String newPasswd = getText(R.id.cstor_new_password); String confirmPasswd = getText(R.id.cstor_confirm_password); if ((mDialogId == CSTOR_CHANGE_PASSWORD_DIALOG) && TextUtils.isEmpty(oldPasswd)) { showError(R.string.cstor_password_empty_error); return false; } if (TextUtils.isEmpty(newPasswd) && TextUtils.isEmpty(confirmPasswd)) { showError(R.string.cstor_passwords_empty_error); return false; } if (!verifyPassword(newPasswd)) { return false; } else if (!newPasswd.equals(confirmPasswd)) { showError(R.string.cstor_passwords_error); return false; } if (mDialogId == CSTOR_CHANGE_PASSWORD_DIALOG) { int count = changeCstorPassword(oldPasswd, newPasswd); if (count > 0) { showResetWarning(count); return false; } else { // done or reset return true; } } else { initCstor(newPasswd); return true; } } private TextView showError(int messageId) { TextView v = (TextView) mView.findViewById(R.id.cstor_error); v.setText(messageId); if (v != null) v.setVisibility(View.VISIBLE); return v; } private void hide(int viewId) { View v = mView.findViewById(viewId); if (v != null) v.setVisibility(View.GONE); } private void hideError() { hide(R.id.cstor_error); } private String getText(int viewId) { return ((TextView) mView.findViewById(viewId)).getText().toString(); } private void setText(int viewId, String text) { TextView v = (TextView) mView.findViewById(viewId); if (v != null) v.setText(text); } private void setText(int viewId, int textId) { TextView v = (TextView) mView.findViewById(viewId); if (v != null) v.setText(textId); } private void enablePreferences(boolean enabled) { mAccessCheckBox.setEnabled(enabled); mResetButton.setEnabled(enabled); } private Preference createAccessCheckBox() { CheckBoxPreference pref = new CheckBoxPreference( SecuritySettings.this); pref.setTitle(R.string.cstor_access_title); pref.setSummary(R.string.cstor_access_summary); pref.setChecked(isCstorUnlocked()); pref.setOnPreferenceChangeListener( new Preference.OnPreferenceChangeListener() { public boolean onPreferenceChange( Preference pref, Object value) { if (((Boolean) value)) { showDialog(isCstorInitialized() ? CSTOR_UNLOCK_DIALOG : CSTOR_INIT_DIALOG); } else { lockCstor(); } return true; } }); pref.setEnabled(isCstorInitialized()); mAccessCheckBox = pref; return pref; } private Preference createSetPasswordPreference() { Preference pref = new Preference(SecuritySettings.this); pref.setTitle(R.string.cstor_set_passwd_title); pref.setSummary(R.string.cstor_set_passwd_summary); pref.setOnPreferenceClickListener( new Preference.OnPreferenceClickListener() { public boolean onPreferenceClick(Preference pref) { showDialog(isCstorInitialized() ? CSTOR_CHANGE_PASSWORD_DIALOG : CSTOR_INIT_DIALOG); return true; } }); return pref; } private Preference createResetPreference() { Preference pref = new Preference(SecuritySettings.this); pref.setTitle(R.string.cstor_reset_title); pref.setSummary(R.string.cstor_reset_summary); pref.setOnPreferenceClickListener( new Preference.OnPreferenceClickListener() { public boolean onPreferenceClick(Preference pref) { showDialog(CSTOR_RESET_DIALOG); return true; } }); pref.setEnabled(isCstorInitialized()); mResetButton = pref; return pref; } private Dialog createUnlockDialog() { mDialogId = CSTOR_UNLOCK_DIALOG; mView = View.inflate(SecuritySettings.this, R.layout.cstor_unlock_dialog_view, null); hideError(); // show extra hint only when the action comes from outside if ((mSpecialIntent == null) && (mCstorAddCredentialHelper == null)) { hide(R.id.cstor_access_dialog_hint_from_action); } Dialog d = new AlertDialog.Builder(SecuritySettings.this) .setView(mView) .setTitle(R.string.cstor_access_dialog_title) .setPositiveButton(android.R.string.ok, this) .setNegativeButton(android.R.string.cancel, this) .setCancelable(false) .create(); d.setOnDismissListener(this); return d; } private Dialog createSetPasswordDialog(int id) { mDialogId = id; mView = View.inflate(SecuritySettings.this, R.layout.cstor_set_password_dialog_view, null); hideError(); // show extra hint only when the action comes from outside if ((mSpecialIntent != null) || (mCstorAddCredentialHelper != null)) { setText(R.id.cstor_first_time_hint, R.string.cstor_first_time_hint_from_action); } switch (id) { case CSTOR_INIT_DIALOG: mView.findViewById(R.id.cstor_old_password_block) .setVisibility(View.GONE); break; case CSTOR_CHANGE_PASSWORD_DIALOG: mView.findViewById(R.id.cstor_first_time_hint) .setVisibility(View.GONE); break; default: throw new RuntimeException( "Unknown dialog id: " + mDialogId); } Dialog d = new AlertDialog.Builder(SecuritySettings.this) .setView(mView) .setTitle(R.string.cstor_set_passwd_dialog_title) .setPositiveButton(android.R.string.ok, this) .setNegativeButton(android.R.string.cancel, this) .setCancelable(false) .create(); d.setOnDismissListener(this); return d; } private Dialog createResetDialog() { mDialogId = CSTOR_RESET_DIALOG; return new AlertDialog.Builder(SecuritySettings.this) .setTitle(android.R.string.dialog_alert_title) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.cstor_reset_hint) .setPositiveButton(getString(android.R.string.ok), this) .setNegativeButton(getString(android.R.string.cancel), this) .create(); } private Dialog createNameCredentialDialog() { mDialogId = CSTOR_NAME_CREDENTIAL_DIALOG; mView = View.inflate(SecuritySettings.this, R.layout.cstor_name_credential_dialog_view, null); hideError(); setText(R.id.cstor_credential_name_title, R.string.cstor_credential_name); setText(R.id.cstor_credential_info_title, R.string.cstor_credential_info); setText(R.id.cstor_credential_info, mCstorAddCredentialHelper.getDescription().toString()); Dialog d = new AlertDialog.Builder(SecuritySettings.this) .setView(mView) .setTitle(R.string.cstor_name_credential_dialog_title) .setPositiveButton(android.R.string.ok, this) .setNegativeButton(android.R.string.cancel, this) .setCancelable(false) .create(); d.setOnDismissListener(this); return d; } } private class CstorAddCredentialHelper { private String mTypeName; private List<byte[]> mItemList; private List<String> mNamespaceList; private String mDescription; private String mName; CstorAddCredentialHelper(Intent intent) { parse(intent); } String getTypeName() { return mTypeName; } CharSequence getDescription() { return Html.fromHtml(mDescription); } void setName(String name) { mName = name; } String getName() { return mName; } int saveToStorage() { Keystore ks = Keystore.getInstance(); for (int i = 0, count = mItemList.size(); i < count; i++) { byte[] blob = mItemList.get(i); int ret = ks.put(mNamespaceList.get(i), mName, new String(blob)); if (ret < 0) return ret; } return 0; } private void parse(Intent intent) { mTypeName = intent.getStringExtra(KEY_CSTOR_TYPE_NAME); mItemList = new ArrayList<byte[]>(); mNamespaceList = new ArrayList<String>(); for (int i = 0; ; i++) { byte[] blob = intent.getByteArrayExtra(KEY_CSTOR_ITEM + i); if (blob == null) break; mItemList.add(blob); mNamespaceList.add(intent.getStringExtra( KEY_CSTOR_NAMESPACE + i)); } // build description string StringBuilder sb = new StringBuilder(); for (int i = 0; ; i++) { String s = intent.getStringExtra(KEY_CSTOR_DESCRIPTION + i); if (s == null) break; sb.append(s).append("<br>"); } mDescription = sb.toString(); } } }

diff --git a/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/outline/GroovyOutlinePage.java b/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/outline/GroovyOutlinePage.java index dccaa3d17..f1f0170da 100644 --- a/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/outline/GroovyOutlinePage.java +++ b/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/outline/GroovyOutlinePage.java @@ -1,133 +1,135 @@ /* * Copyright 2003-2010 the original author or authors. * * 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 org.codehaus.groovy.eclipse.editor.outline; import org.codehaus.groovy.eclipse.editor.GroovyEditor; import org.eclipse.jdt.core.ISourceReference; import org.eclipse.jdt.internal.ui.IJavaHelpContextIds; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.JavaPluginImages; import org.eclipse.jdt.internal.ui.javaeditor.JavaOutlinePage; import org.eclipse.jdt.internal.ui.viewsupport.SourcePositionComparator; import org.eclipse.jdt.ui.JavaElementComparator; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.IActionBars; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.IPageSite; /** * @author Maxime Hamm * @created 7 avr. 2011 */ public class GroovyOutlinePage extends JavaOutlinePage { private OCompilationUnit outlineUnit = null; public GroovyOutlinePage(String contextMenuID, GroovyEditor editor, OCompilationUnit unit) { super(contextMenuID, editor); outlineUnit = unit; } public void refresh() { initializeViewer(); outlineUnit.refresh(); getOutlineViewer().refresh(); } public OCompilationUnit getOutlineCompilationUnit() { return outlineUnit; } @Override protected void contextMenuAboutToShow(IMenuManager menu) { // none } private boolean isInitialized = false; private void initializeViewer() { if (isInitialized) { return; } // remove actions - IActionBars actionBars = getSite().getActionBars(); - IToolBarManager toolBarManager = actionBars.getToolBarManager(); - toolBarManager.removeAll(); - toolBarManager.add(new GroovyLexicalSortingAction()); - toolBarManager.update(true); - - // remove all filters (they are related to above actions) - for (ViewerFilter vf : getOutlineViewer().getFilters()) { - // getOutlineViewer().removeFilter(vf); + IPageSite site = getSite(); + if (site != null) { + IActionBars actionBars = site.getActionBars(); + if (actionBars != null) { + IToolBarManager toolBarManager = actionBars.getToolBarManager(); + if (toolBarManager != null) { + toolBarManager.removeAll(); + toolBarManager.add(new GroovyLexicalSortingAction()); + toolBarManager.update(true); + } + } } isInitialized = true; } /** * @param caretOffset * @return */ public ISourceReference getOutlineElmenetAt(int caretOffset) { return getOutlineCompilationUnit().getOutlineElementAt(caretOffset); } /**************************************************************** * @author Maxime HAMM * @created 7 avr. 2011 */ public class GroovyLexicalSortingAction extends Action { private JavaElementComparator fComparator = new JavaElementComparator(); private SourcePositionComparator fSourcePositonComparator = new SourcePositionComparator(); public GroovyLexicalSortingAction() { super(); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IJavaHelpContextIds.LEXICAL_SORTING_OUTLINE_ACTION); setText("Link with Editor"); JavaPluginImages.setLocalImageDescriptors(this, "alphab_sort_co.gif"); //$NON-NLS-1$ boolean checked = JavaPlugin.getDefault().getPreferenceStore().getBoolean("LexicalSortingAction.isChecked"); //$NON-NLS-1$ valueChanged(checked, false); } @Override public void run() { valueChanged(isChecked(), true); } private void valueChanged(final boolean on, boolean store) { setChecked(on); BusyIndicator.showWhile(getOutlineViewer().getControl().getDisplay(), new Runnable() { public void run() { if (on) { getOutlineViewer().setComparator(fComparator); } else { getOutlineViewer().setComparator(fSourcePositonComparator); } } }); if (store) JavaPlugin.getDefault().getPreferenceStore().setValue("LexicalSortingAction.isChecked", on); //$NON-NLS-1$ } } }

diff --git a/scoutmaster/src/main/java/au/org/scoutmaster/views/ContactView.java b/scoutmaster/src/main/java/au/org/scoutmaster/views/ContactView.java index d2ef719..b6334e6 100644 --- a/scoutmaster/src/main/java/au/org/scoutmaster/views/ContactView.java +++ b/scoutmaster/src/main/java/au/org/scoutmaster/views/ContactView.java @@ -1,365 +1,366 @@ package au.org.scoutmaster.views; import org.apache.log4j.Logger; import au.com.vaadinutils.crud.BaseCrudView; import au.com.vaadinutils.crud.HeadingPropertySet; import au.com.vaadinutils.crud.HeadingPropertySet.Builder; import au.com.vaadinutils.crud.ValidatingFieldGroup; import au.com.vaadinutils.menu.Menu; import au.org.scoutmaster.dao.ContactDao; import au.org.scoutmaster.dao.DaoFactory; import au.org.scoutmaster.domain.Contact; import au.org.scoutmaster.domain.Contact_; import au.org.scoutmaster.domain.Gender; import au.org.scoutmaster.domain.GroupRole; import au.org.scoutmaster.domain.PhoneType; import au.org.scoutmaster.domain.PreferredCommunications; import au.org.scoutmaster.domain.SectionType; import au.org.scoutmaster.domain.Tag; import au.org.scoutmaster.fields.GoogleField; import au.org.scoutmaster.util.SMMultiColumnFormLayout; import com.vaadin.addon.jpacontainer.JPAContainer; import com.vaadin.data.Container.Filter; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; +import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; import com.vaadin.ui.DateField; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.VerticalLayout; @Menu(display = "Contact") public class ContactView extends BaseCrudView<Contact> implements View, Selected<Contact> { private static final long serialVersionUID = 1L; @SuppressWarnings("unused") private static Logger logger = Logger.getLogger(ContactView.class); public static final String NAME = "Contact"; private CheckBox primaryPhone1; private CheckBox primaryPhone2; private CheckBox primaryPhone3; private Tab youthTab; TabSheet tabs = new TabSheet(); @Override protected AbstractLayout buildEditor(ValidatingFieldGroup<Contact> fieldGroup2) { VerticalLayout layout = new VerticalLayout(); // Overview tab SMMultiColumnFormLayout<Contact> overviewForm = new SMMultiColumnFormLayout<Contact>(2, this.fieldGroup); overviewForm.setSizeFull(); tabs.addTab(overviewForm, "Overview"); overviewForm.setMargin(true); overviewForm.bindBooleanField("Active", "active"); overviewForm.newLine(); overviewForm.colspan(2); final ComboBox role = overviewForm.bindEnumField("Role", "role", GroupRole.class); overviewForm.newLine(); overviewForm.colspan(2); overviewForm.bindTokenField(this, "Tags", "tags", Tag.class); overviewForm.colspan(2); overviewForm.bindTextField("Firstname", Contact.FIRSTNAME); overviewForm.newLine(); overviewForm.colspan(2); overviewForm.bindTextField("Middle name", "middlename"); overviewForm.newLine(); overviewForm.colspan(2); overviewForm.bindTextField("Lastname", Contact.LASTNAME); overviewForm.newLine(); - DateField birthDate = overviewForm.bindDateField("Birth Date", Contact.BIRTH_DATE); + DateField birthDate = overviewForm.bindDateField("Birth Date", Contact.BIRTH_DATE,"yyyy-MM-dd", Resolution.DAY); final Label labelAge = overviewForm.bindLabel("Age"); overviewForm.bindEnumField("Gender", "gender", Gender.class); overviewForm.newLine(); role.addValueChangeListener(new ChangeListener(role, labelAge)); contactTab(); final Label labelSectionEligibity = youthTab(); memberTab(); medicalTab(); backgroundTab(); googleTab(); tabs.setSizeFull(); layout.addComponent(tabs); // When a persons birth date changes recalculate their age. birthDate.addValueChangeListener(new Property.ValueChangeListener() { private static final long serialVersionUID = 1L; public void valueChange(ValueChangeEvent event) { DateField birthDate = (DateField) event.getProperty(); ContactDao daoContact = new DaoFactory().getContactDao(); labelAge.setValue(daoContact.getAge(birthDate.getValue()).toString()); labelSectionEligibity.setValue(daoContact.getSectionEligibilty(birthDate.getValue()).toString()); } }); return layout; } private void googleTab() { // Medical Tab GoogleField googleField = new GoogleField(); tabs.addTab(googleField, "Map"); } private void backgroundTab() { // Background tab SMMultiColumnFormLayout<Contact> background = new SMMultiColumnFormLayout<Contact>(4, this.fieldGroup); tabs.addTab(background, "Background"); background.setMargin(true); background.setSizeFull(); background.colspan(4); background.bindTextAreaField("Hobbies", "hobbies", 4); background.newLine(); background.colspan(2); - background.bindDateField("Affiliated Since", "affiliatedSince"); + background.bindDateField("Affiliated Since", "affiliatedSince","yyyy-MM-dd", Resolution.DAY); background.newLine(); background.colspan(4); background.bindTextField("Current Employer", "currentEmployer"); background.newLine(); background.colspan(4); background.bindTextField("Job Title", "jobTitle"); background.newLine(); // background.bindTextField("Assets", "assets"); background.colspan(1); background.bindBooleanField("Has WWC", "hasWWC"); background.colspan(3); - background.bindDateField("WWC Expiry", "wwcExpiry"); + background.bindDateField("WWC Expiry", "wwcExpiry","yyyy-MM-dd", Resolution.DAY); background.colspan(4); background.bindTextField("WWC No.", "wwcNo"); background.newLine(); background.colspan(1); background.bindBooleanField("Has Police Check", "hasPoliceCheck"); background.colspan(3); - background.bindDateField("Police Check Expiry", "policeCheckExpiry"); + background.bindDateField("Police Check Expiry", "policeCheckExpiry","yyyy-MM-dd", Resolution.DAY); background.newLine(); background.colspan(2); background.bindBooleanField("Has Food Handling", "hasFoodHandlingCertificate"); background.colspan(2); background.bindBooleanField("Has First Aid Certificate", "hasFirstAidCertificate"); } private void medicalTab() { // Medical Tab SMMultiColumnFormLayout<Contact> medicalForm = new SMMultiColumnFormLayout<Contact>(2, this.fieldGroup); tabs.addTab(medicalForm, "Medical"); medicalForm.setMargin(true); medicalForm.setSizeFull(); medicalForm.colspan(2); medicalForm.bindTextAreaField("Allergies", "allergies", 4); medicalForm.bindBooleanField("Ambulance Subscriber", "ambulanceSubscriber"); medicalForm.newLine(); medicalForm.bindBooleanField("Private Medical Ins.", "privateMedicalInsurance"); medicalForm.newLine(); medicalForm.colspan(2); medicalForm.bindTextField("Private Medical Fund", "privateMedicalFundName"); } private void memberTab() { // Member tab SMMultiColumnFormLayout<Contact> memberForm = new SMMultiColumnFormLayout<Contact>(2, this.fieldGroup); tabs.addTab(memberForm, "Member"); memberForm.setMargin(true); memberForm.setSizeFull(); memberForm.bindBooleanField("Member", "isMember"); memberForm.newLine(); memberForm.colspan(2); memberForm.bindEntityField("Section ", "section", SectionType.class, "name"); memberForm.newLine(); memberForm.colspan(2); memberForm.bindTextField("Member No", "memberNo"); memberForm.newLine(); memberForm.colspan(2); - memberForm.bindDateField("Member Since", "memberSince"); + memberForm.bindDateField("Member Since", "memberSince","yyyy-MM-dd", Resolution.DAY); } private Label youthTab() { // Youth tab SMMultiColumnFormLayout<Contact> youthForm = new SMMultiColumnFormLayout<Contact>(2, this.fieldGroup); youthTab = tabs.addTab(youthForm, "Youth"); youthForm.setSizeFull(); youthForm.setMargin(true); final Label labelSectionEligibity = youthForm.bindLabel("Section Eligibility"); youthForm.newLine(); youthForm.bindBooleanField("Custody Order", "custodyOrder"); youthForm.newLine(); youthForm.colspan(2); youthForm.bindTextAreaField("Custody Order Details", "custodyOrderDetails", 4); youthForm.colspan(2); youthForm.bindTextField("School", "school"); return labelSectionEligibity; } private void contactTab() { // Contact tab SMMultiColumnFormLayout<Contact> contactForm = new SMMultiColumnFormLayout<Contact>(4, this.fieldGroup); contactForm.setSizeFull(); tabs.addTab(contactForm, "Contact"); contactForm.setMargin(true); contactForm.colspan(3); contactForm.bindEnumField("Preferred Communications", "preferredCommunications", PreferredCommunications.class); contactForm.newLine(); contactForm.colspan(4); contactForm.bindTextField("Home Email", "homeEmail"); contactForm.newLine(); contactForm.colspan(4); contactForm.bindTextField("Work Email", "workEmail"); contactForm.newLine(); contactForm.colspan(2); contactForm.bindTextField("Phone 1", "phone1.phoneNo"); contactForm.bindEnumField(null, "phone1.phoneType", PhoneType.class); primaryPhone1 = contactForm.bindBooleanField("Primary", "phone1.primaryPhone"); primaryPhone1.addValueChangeListener(new PhoneChangeListener()); contactForm.colspan(2); contactForm.bindTextField("Phone 2", "phone2.phoneNo"); contactForm.bindEnumField(null, "phone2.phoneType", PhoneType.class); primaryPhone2 = contactForm.bindBooleanField("Primary", "phone2.primaryPhone"); primaryPhone2.addValueChangeListener(new PhoneChangeListener()); contactForm.colspan(2); contactForm.bindTextField("Phone 3", "phone3.phoneNo"); contactForm.bindEnumField(null, "phone3.phoneType", PhoneType.class); primaryPhone3 = contactForm.bindBooleanField("Primary", "phone3.primaryPhone"); primaryPhone3.addValueChangeListener(new PhoneChangeListener()); contactForm.newLine(); contactForm.colspan(4); contactForm.bindTextField("Street", "address.street"); contactForm.newLine(); contactForm.colspan(4); contactForm.bindTextField("City", "address.city"); contactForm.newLine(); contactForm.colspan(2); contactForm.bindTextField("State", "address.state"); contactForm.colspan(2); contactForm.bindTextField("Postcode", "address.postcode"); contactForm.newLine(); } private final class ChangeListener implements Property.ValueChangeListener { private final Label labelAge; private final ComboBox role; private static final long serialVersionUID = 1L; private ChangeListener(ComboBox role, Label labelAge) { this.labelAge = labelAge; this.role = role; } public void valueChange(ValueChangeEvent event) { switch ((GroupRole) this.role.getValue()) { case YouthMember: showYouth(true); break; default: showYouth(false); break; } ContactDao daoContact = new DaoFactory().getContactDao(); labelAge.setValue(daoContact.getAge(ContactView.super.getCurrent()).toString()); } private void showYouth(boolean visible) { youthTab.setVisible(visible); } } public class PhoneChangeListener implements ValueChangeListener { private static final long serialVersionUID = 1L; @Override public void valueChange(ValueChangeEvent event) { CheckBox property = (CheckBox) event.getProperty(); Boolean value = property.getValue(); if (property == primaryPhone1 && value == true) { primaryPhone2.setValue(false); primaryPhone3.setValue(false); } else if (property == primaryPhone2 && value == true) { primaryPhone1.setValue(false); primaryPhone3.setValue(false); } else if (property == primaryPhone3 && value == true) { primaryPhone2.setValue(false); primaryPhone1.setValue(false); } } } @Override protected void interceptSaveValues(Contact entity) { // TODO Auto-generated method stub } @Override - protected Filter getContainerFilter() - { - // TODO Auto-generated method stub - return null; - } - - @Override public void enter(ViewChangeEvent event) { JPAContainer<Contact> container = new DaoFactory().getContactDao().makeJPAContainer(); Builder<Contact> builder = new HeadingPropertySet.Builder<Contact>(); builder.addColumn("Firstname", Contact_.firstname).addColumn("Lastname", Contact_.lastname) .addColumn("Section", Contact_.section).addColumn("Phone", Contact.PRIMARY_PHONE) .addColumn("Member", Contact_.isMember).addColumn("Role", Contact_.role); super.init(Contact.class, container, builder.build()); } + @Override + protected Filter getContainerFilter(String string) + { + // TODO Auto-generated method stub + return null; + } + }

diff --git a/src/com/codeminders/inotes/imap/HeaderUtils.java b/src/com/codeminders/inotes/imap/HeaderUtils.java index 6da57af..8e35126 100644 --- a/src/com/codeminders/inotes/imap/HeaderUtils.java +++ b/src/com/codeminders/inotes/imap/HeaderUtils.java @@ -1,74 +1,80 @@ package com.codeminders.inotes.imap; import android.util.Log; import com.codeminders.inotes.Constants; import com.codeminders.inotes.model.Note; import org.json.JSONObject; import javax.mail.Message; import java.util.HashMap; import java.util.Iterator; import java.util.Map; public class HeaderUtils { public static String INOTES_ID_HEADER = "X-Inotes-Unique-Identifier"; enum AppleHeaders { IDENTIFIER("X-Universally-Unique-Identifier"), NOTE_TYPE("X-Uniform-Type-Identifier"), CREATED_DATE("X-Mail-Created-Date"), - DEFAULT_NOTE_TYPE("com.apple.mail-note"); + DEFAULT_NOTE_TYPE("com.apple.mail-note"), + CONTENT_TYPE("Content-Type"); private String name; private AppleHeaders(String name) { this.name = name; } public String toString() { return name; } } public static HashMap<String, String> getHeaders(Message message) throws Exception { HashMap<String, String> headers = new HashMap<String, String>(); String[] identifier = message.getHeader(AppleHeaders.IDENTIFIER.toString()); if (identifier != null) { headers.put(AppleHeaders.IDENTIFIER.toString(), identifier[0]); } String[] createdDate = message.getHeader(AppleHeaders.CREATED_DATE.toString()); if (createdDate != null) { headers.put(AppleHeaders.CREATED_DATE.toString(), createdDate[0]); } headers.put(AppleHeaders.NOTE_TYPE.toString(), AppleHeaders.DEFAULT_NOTE_TYPE.toString()); String[] inoteId = message.getHeader(INOTES_ID_HEADER); if (inoteId != null) { headers.put(INOTES_ID_HEADER, inoteId[0]); } + String[] contentType = message.getHeader(AppleHeaders.CONTENT_TYPE.toString()); + if (contentType != null) { + headers.put(AppleHeaders.CONTENT_TYPE.toString(), contentType[0]); + } + return headers; } public static void addDefaultHeader(Note note) { note.getHeaders().put(AppleHeaders.NOTE_TYPE.toString(), AppleHeaders.DEFAULT_NOTE_TYPE.toString()); } public static Map<String, String> getHeaders(String string) { Map<String, String> headers = new HashMap<String, String>(); try { JSONObject jsonObject = new JSONObject(string); Iterator iterator = jsonObject.keys(); while (iterator.hasNext()) { String key = (String) iterator.next(); headers.put(key, jsonObject.getString(key)); } } catch (Exception e) { Log.e(Constants.TAG, e.getMessage()); } return headers; } }

diff --git a/src/com/dmdirc/ui/swing/components/InputFrame.java b/src/com/dmdirc/ui/swing/components/InputFrame.java index a2e26f62b..42265ab2b 100644 --- a/src/com/dmdirc/ui/swing/components/InputFrame.java +++ b/src/com/dmdirc/ui/swing/components/InputFrame.java @@ -1,475 +1,471 @@ /* * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ package com.dmdirc.ui.swing.components; import com.dmdirc.Config; import com.dmdirc.WritableFrameContainer; import com.dmdirc.config.ConfigManager; import com.dmdirc.logger.ErrorLevel; import com.dmdirc.logger.Logger; import com.dmdirc.ui.input.InputHandler; import com.dmdirc.ui.interfaces.InputWindow; import com.dmdirc.ui.swing.UIUtilities; import com.dmdirc.ui.swing.actions.CopyAction; import com.dmdirc.ui.swing.actions.CutAction; import com.dmdirc.ui.swing.actions.InputFramePasteAction; import com.dmdirc.ui.swing.dialogs.paste.PasteDialog; import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER; import java.awt.AWTException; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Point; import java.awt.Robot; import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.io.IOException; import java.io.Serializable; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.InternalFrameEvent; import javax.swing.event.InternalFrameListener; /** * Frame with an input field. */ public abstract class InputFrame extends Frame implements InputWindow, InternalFrameListener, MouseListener, ActionListener, KeyListener, Serializable { /** * A version number for this class. It should be changed whenever the class * structure is changed (or anything else that would prevent serialized * objects being unserialized with the new class). */ private static final long serialVersionUID = 2; /** Input field panel. */ protected JPanel inputPanel; /** Away label. */ protected JLabel awayLabel; /** The container that owns this frame. */ private final WritableFrameContainer parent; /** The InputHandler for our input field. */ private InputHandler inputHandler; /** Frame input field. */ private JTextField inputField; /** Popupmenu for this frame. */ private JPopupMenu inputFieldPopup; /** Robot for the frame. */ private Robot robot; /** * Creates a new instance of InputFrame. * * @param owner WritableFrameContainer owning this frame. */ public InputFrame(final WritableFrameContainer owner) { super(owner); parent = owner; try { robot = new Robot(); } catch (AWTException ex) { Logger.userError(ErrorLevel.LOW, "Error creating robot"); } initComponents(); final ConfigManager config = owner.getConfigManager(); getInputField().setBackground(config.getOptionColour("ui", "inputbackgroundcolour", config.getOptionColour("ui", "backgroundcolour", Color.WHITE))); getInputField().setForeground(config.getOptionColour("ui", "inputforegroundcolour", config.getOptionColour("ui", "foregroundcolour", Color.BLACK))); getInputField().setCaretColor(config.getOptionColour("ui", "inputforegroundcolour", config.getOptionColour("ui", "foregroundcolour", Color.BLACK))); config.addChangeListener("ui", "inputforegroundcolour", this); config.addChangeListener("ui", "inputbackgroundcolour", this); } /** {@inheritDoc} */ public void open() { if (Config.getOptionBool("ui", "awayindicator") && getContainer().getServer() != null) { awayLabel.setVisible(getContainer().getServer().isAway()); } super.open(); } /** * Initialises the components for this frame. */ private void initComponents() { setInputField(new JTextField()); getInputField().setBorder( BorderFactory.createCompoundBorder( getInputField().getBorder(), BorderFactory.createEmptyBorder(2, 2, 2, 2))); getInputField().addKeyListener(this); getInputField().addMouseListener(this); initPopupMenu(); awayLabel = new JLabel(); awayLabel.setText("(away)"); awayLabel.setVisible(false); awayLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, SMALL_BORDER)); inputPanel = new JPanel(new BorderLayout()); inputPanel.add(awayLabel, BorderLayout.LINE_START); inputPanel.add(inputField, BorderLayout.CENTER); initInputField(); } /** Initialises the popupmenu. */ private void initPopupMenu() { inputFieldPopup = new JPopupMenu(); inputFieldPopup.add(new CutAction(getInputField())); inputFieldPopup.add(new CopyAction(getInputField())); inputFieldPopup.add(new InputFramePasteAction(this)); inputFieldPopup.setOpaque(true); inputFieldPopup.setLightWeightPopupEnabled(true); } /** * Initialises the input field. */ private void initInputField() { UIUtilities.addUndoManager(getInputField()); getInputField().getActionMap().put("PasteAction", new InputFramePasteAction(this)); getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke("shift INSERT"), "PasteAction"); getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ctrl V"), "PasteAction"); } /** * Returns the container associated with this frame. * * @return This frame's container. */ @Override public WritableFrameContainer getContainer() { return parent; } /** * Returns the input handler associated with this frame. * * @return Input handlers for this frame */ public final InputHandler getInputHandler() { return inputHandler; } /** * Sets the input handler for this frame. * * @param newInputHandler input handler to set for this frame */ public final void setInputHandler(final InputHandler newInputHandler) { this.inputHandler = newInputHandler; } /** * Returns the input field for this frame. * * @return JTextField input field for the frame. */ public final JTextField getInputField() { return inputField; } /** * Sets the frames input field. * * @param newInputField new input field to use */ protected final void setInputField(final JTextField newInputField) { this.inputField = newInputField; } /** * Returns the away label for this server connection. * * @return JLabel away label */ public JLabel getAwayLabel() { return awayLabel; } /** * Sets the away indicator on or off. * * @param awayState away state */ public void setAwayIndicator(final boolean awayState) { if (awayState) { inputPanel.add(awayLabel, BorderLayout.LINE_START); awayLabel.setVisible(true); } else { awayLabel.setVisible(false); } } /** * Not needed for this class. {@inheritDoc} */ public void internalFrameOpened(final InternalFrameEvent event) { super.internalFrameOpened(event); } /** * Not needed for this class. {@inheritDoc} */ public void internalFrameClosing(final InternalFrameEvent event) { super.internalFrameClosing(event); } /** * Not needed for this class. {@inheritDoc} */ public void internalFrameClosed(final InternalFrameEvent event) { super.internalFrameClosed(event); } /** * Makes the internal frame invisible. {@inheritDoc} */ public void internalFrameIconified(final InternalFrameEvent event) { super.internalFrameIconified(event); } /** * Not needed for this class. {@inheritDoc} */ public void internalFrameDeiconified(final InternalFrameEvent event) { super.internalFrameDeiconified(event); } /** * Activates the input field on frame focus. {@inheritDoc} */ public void internalFrameActivated(final InternalFrameEvent event) { getInputField().requestFocus(); super.internalFrameActivated(event); } /** * Not needed for this class. {@inheritDoc} */ public void internalFrameDeactivated(final InternalFrameEvent event) { super.internalFrameDeactivated(event); } /** {@inheritDoc} */ public void keyTyped(final KeyEvent event) { //Ignore. } /** {@inheritDoc} */ public void keyPressed(final KeyEvent event) { if (event.getSource() == getTextPane() && (Config.getOptionBool("ui", "quickCopy") || (event.getModifiers() & KeyEvent.CTRL_MASK) == 0)) { event.setSource(getInputField()); getInputField().requestFocus(); if (robot != null && event.getKeyCode() != KeyEvent.VK_UNDEFINED) { robot.keyPress(event.getKeyCode()); if (event.getKeyCode() == KeyEvent.VK_SHIFT) { robot.keyRelease(event.getKeyCode()); } } } super.keyPressed(event); } /** {@inheritDoc} */ public void keyReleased(final KeyEvent event) { //Ignore. } /** * Checks for url's, channels and nicknames. {@inheritDoc} */ public void mouseClicked(final MouseEvent mouseEvent) { if (mouseEvent.getSource() == getTextPane()) { processMouseEvent(mouseEvent); } super.mouseClicked(mouseEvent); } /** * Not needed for this class. {@inheritDoc} */ public void mousePressed(final MouseEvent mouseEvent) { processMouseEvent(mouseEvent); super.mousePressed(mouseEvent); } /** * Not needed for this class. {@inheritDoc} */ public void mouseReleased(final MouseEvent mouseEvent) { processMouseEvent(mouseEvent); super.mouseReleased(mouseEvent); } /** * Not needed for this class. {@inheritDoc} */ public void mouseEntered(final MouseEvent mouseEvent) { //Ignore. } /** * Not needed for this class. {@inheritDoc} */ public void mouseExited(final MouseEvent mouseEvent) { //Ignore. } /** * Processes every mouse button event to check for a popup trigger. * * @param e mouse event */ @Override public void processMouseEvent(final MouseEvent e) { if (e.isPopupTrigger() && e.getSource() == getInputField()) { final Point point = getInputField().getMousePosition(); if (point != null) { initPopupMenu(); inputFieldPopup.show(this, (int) point.getX(), (int) point.getY() + getTextPane().getHeight() + SMALL_BORDER); } } super.processMouseEvent(e); } /** Checks and pastes text. */ public void doPaste() { String clipboard = null; String[] clipboardLines = new String[]{"", }; if (!Toolkit.getDefaultToolkit().getSystemClipboard(). isDataFlavorAvailable(DataFlavor.stringFlavor)) { return; } try { //get the contents of the input field and combine it with the clipboard clipboard = (String) Toolkit.getDefaultToolkit(). getSystemClipboard().getData(DataFlavor.stringFlavor); //split the text clipboardLines = getSplitLine(clipboard); } catch (IOException ex) { Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " + ex.getMessage()); } catch (UnsupportedFlavorException ex) { Logger.appError(ErrorLevel.LOW, "Unable to get clipboard contents", ex); } //check theres something to paste if (clipboard != null && clipboardLines.length > 1) { clipboard = getInputField().getText() + clipboard; //check the limit final int pasteTrigger = Config.getOptionInt("ui", "pasteProtectionLimit", 1); //check whether the number of lines is over the limit if (parent.getNumLines(clipboard) > pasteTrigger) { //show the multi line paste dialog new PasteDialog(this, clipboard).setVisible(true); inputField.setText(""); } else { //send the lines for (String clipboardLine : clipboardLines) { parent.sendLine(clipboardLine); } } } else { inputField.replaceSelection(clipboard); } } /** * Splits the line on all line endings. * * @param line Line that will be split * * @return Split line array */ private String[] getSplitLine(final String line) { - String newLine; - newLine = line.replace("\r\n", "\n"); - newLine = newLine.replace('\r', '\n'); - - return newLine.split("\n"); + return line.replace("\r\n", "\n").replace('\r', '\n').split("\n"); } /** {@inheritDoc} */ @Override public void configChanged(final String domain, final String key, final String oldValue, final String newValue) { super.configChanged(domain, key, oldValue, newValue); - if ("ui".equals(domain)) { + if ("ui".equals(domain) && getInputField() != null && getConfigManager() != null) { if ("inputbackgroundcolour".equals(key) || "backgroundcolour".equals(key)) { getInputField().setBackground(getConfigManager().getOptionColour("ui", "inputbackgroundcolour", getConfigManager().getOptionColour("ui", "backgroundcolour", Color.WHITE))); } else if ("inputforegroundcolour".equals(key) || "foregroundcolour".equals(key)) { getInputField().setForeground(getConfigManager().getOptionColour("ui", "inputforegroundcolour", getConfigManager().getOptionColour("ui", "foregroundcolour", Color.BLACK))); getInputField().setCaretColor(getConfigManager().getOptionColour("ui", "inputforegroundcolour", getConfigManager().getOptionColour("ui", "foregroundcolour", Color.BLACK))); } } } }

diff --git a/org.emftext.sdk.concretesyntax.resource.cs.post_processing/src/org/emftext/sdk/syntax_analysis/TokenConflictsAnalyser.java b/org.emftext.sdk.concretesyntax.resource.cs.post_processing/src/org/emftext/sdk/syntax_analysis/TokenConflictsAnalyser.java index 39a02932c..aeca52a4d 100644 --- a/org.emftext.sdk.concretesyntax.resource.cs.post_processing/src/org/emftext/sdk/syntax_analysis/TokenConflictsAnalyser.java +++ b/org.emftext.sdk.concretesyntax.resource.cs.post_processing/src/org/emftext/sdk/syntax_analysis/TokenConflictsAnalyser.java @@ -1,105 +1,129 @@ /******************************************************************************* * Copyright (c) 2006-2010 * Software Technology Group, Dresden University of Technology * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Software Technology Group - TU Dresden, Germany * - initial API and implementation ******************************************************************************/ package org.emftext.sdk.syntax_analysis; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; import org.antlr.runtime3_2_0.RecognitionException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.emftext.sdk.AbstractPostProcessor; import org.emftext.sdk.concretesyntax.CompleteTokenDefinition; import org.emftext.sdk.concretesyntax.ConcreteSyntax; +import org.emftext.sdk.concretesyntax.QuotedTokenDefinition; import org.emftext.sdk.concretesyntax.resource.cs.mopp.CsResource; import org.emftext.sdk.concretesyntax.resource.cs.mopp.ECsProblemType; import org.emftext.sdk.regex.RegexpTranslationHelper; import org.emftext.sdk.regex.SorterException; import org.emftext.sdk.regex.TokenSorter; import org.emftext.sdk.util.StringUtil; import org.emftext.sdk.util.ToStringConverter; public class TokenConflictsAnalyser extends AbstractPostProcessor { @Override public void analyse(CsResource resource, ConcreteSyntax syntax) { TokenSorter ts = new TokenSorter(); Map<CompleteTokenDefinition, Set<CompleteTokenDefinition>> conflicting = Collections.emptyMap(); EList<CompleteTokenDefinition> allTokenDefinitions = syntax.getActiveTokens(); Map<CompleteTokenDefinition, Collection<CompleteTokenDefinition>> unreachable = Collections.emptyMap(); try { conflicting = ts.getConflicting(allTokenDefinitions); List<CompleteTokenDefinition> directivesMatchingEmptyString = getDirectivesMatchingEmptyString(allTokenDefinitions); for (CompleteTokenDefinition tokenDirective : directivesMatchingEmptyString) { - addProblem(resource, ECsProblemType.TOKEN_MATCHES_EMPTY_STRING, + addTokenProblem(resource, ECsProblemType.TOKEN_MATCHES_EMPTY_STRING, "The token definition '" + tokenDirective.getRegex() + "' matches the empty string.", tokenDirective); } unreachable = ts.getNonReachables(allTokenDefinitions); } catch (Exception e) { addProblem(resource, ECsProblemType.TOKEN_UNREACHABLE, "Error during token conflict analysis. " + e.getMessage(), syntax); } for (CompleteTokenDefinition tokenDirective : unreachable.keySet()) { conflicting.remove(tokenDirective); String conflictingTokens = StringUtil.explode(unreachable.get(tokenDirective), ", ", new ToStringConverter<CompleteTokenDefinition>() { public String toString(CompleteTokenDefinition definition) { return definition.getName(); } }); - addProblem(resource, ECsProblemType.TOKEN_UNREACHABLE, + addTokenProblem(resource, ECsProblemType.TOKEN_UNREACHABLE, "The token definition '" + tokenDirective.getRegex() + "' is not reachable because of previous tokens " + conflictingTokens, tokenDirective); } for (CompleteTokenDefinition tokenDirective : conflicting.keySet()) { Set<CompleteTokenDefinition> previousDefinitions = conflicting.get(tokenDirective); Set<String> nameSet = new HashSet<String>(); for (CompleteTokenDefinition nextDefinition : previousDefinitions) { nameSet.add(nextDefinition.getName()); } String names = StringUtil.explode(nameSet, ", "); - addProblem(resource, ECsProblemType.TOKEN_OVERLAPPING, + addTokenProblem(resource, ECsProblemType.TOKEN_OVERLAPPING, "The token definition " + tokenDirective.getName() + " overlaps with previous token definition(s) (" + names + ").", tokenDirective); } } + private void addTokenProblem( + CsResource resource, + ECsProblemType type, + String message, + CompleteTokenDefinition definition) { + Set<EObject> causes = new LinkedHashSet<EObject>(); + // problems that refer to quoted definition must be added to the placeholders, + // because the tokens were created automatically and do thus not exist in the + // syntax physically + if (definition instanceof QuotedTokenDefinition) { + QuotedTokenDefinition quotedDefinition = (QuotedTokenDefinition) definition; + causes.addAll(quotedDefinition.getAttributeReferences()); + } else { + causes.add(definition); + } + + for (EObject cause : causes) { + addProblem(resource, type, message, cause); + } + } + private List<CompleteTokenDefinition> getDirectivesMatchingEmptyString( EList<CompleteTokenDefinition> allTokenDirectives) throws SorterException, IOException, RecognitionException { List<CompleteTokenDefinition> emptyMatchers = new ArrayList<CompleteTokenDefinition>(); for (CompleteTokenDefinition def : allTokenDirectives) { String regex = RegexpTranslationHelper .translateAntLRToJavaStyle(def.getRegex()); if ("".matches(regex)) { emptyMatchers.add(def); } } return emptyMatchers; } }

diff --git a/nexus/nexus-utils/src/main/java/org/sonatype/nexus/util/ClasspathUtils.java b/nexus/nexus-utils/src/main/java/org/sonatype/nexus/util/ClasspathUtils.java index c803224ed..3d7afb280 100644 --- a/nexus/nexus-utils/src/main/java/org/sonatype/nexus/util/ClasspathUtils.java +++ b/nexus/nexus-utils/src/main/java/org/sonatype/nexus/util/ClasspathUtils.java @@ -1,41 +1,43 @@ package org.sonatype.nexus.util; /** * Some classpath related utility methods. * * @author cstamas */ public class ClasspathUtils { /** * Converts a supplied "binary name" into "canonical name" if possible. If not possible, returns null. * * @param binaryName to convert * @return canonical name (in case of classes), null if conversion is not possible. */ public static String convertClassBinaryNameToCanonicalName( String binaryName ) { // sanity check if ( binaryName == null || binaryName.trim().length() == 0 ) { return null; } if ( binaryName.endsWith( ".class" ) ) { int startIdx = 0; if ( binaryName.startsWith( "/" ) ) { startIdx = 1; } // class name without ".class" - return binaryName.substring( startIdx, binaryName.length() - 6 ).replace( "/", "." ); //.replace( "$", "." ); + return binaryName.substring( startIdx, binaryName.length() - 6 ). + // replacing backslash to make windows happy + replace( '\\', '.' ).replace( "/", "." ); // .replace( "$", "." ); } else { return null; } } }

public static String convertClassBinaryNameToCanonicalName( String binaryName ) { // sanity check if ( binaryName == null || binaryName.trim().length() == 0 ) { return null; } if ( binaryName.endsWith( ".class" ) ) { int startIdx = 0; if ( binaryName.startsWith( "/" ) ) { startIdx = 1; } // class name without ".class" return binaryName.substring( startIdx, binaryName.length() - 6 ).replace( "/", "." ); //.replace( "$", "." ); } else { return null; } }

public static String convertClassBinaryNameToCanonicalName( String binaryName ) { // sanity check if ( binaryName == null || binaryName.trim().length() == 0 ) { return null; } if ( binaryName.endsWith( ".class" ) ) { int startIdx = 0; if ( binaryName.startsWith( "/" ) ) { startIdx = 1; } // class name without ".class" return binaryName.substring( startIdx, binaryName.length() - 6 ). // replacing backslash to make windows happy replace( '\\', '.' ).replace( "/", "." ); // .replace( "$", "." ); } else { return null; } }

diff --git a/HyPeerWeb/src/chat/ListTab.java b/HyPeerWeb/src/chat/ListTab.java index 0426fdb..1865300 100644 --- a/HyPeerWeb/src/chat/ListTab.java +++ b/HyPeerWeb/src/chat/ListTab.java @@ -1,247 +1,247 @@ package chat; import hypeerweb.NodeCache.Node; import java.awt.BorderLayout; import java.awt.Dimension; import javax.swing.ComboBoxModel; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; /** * List all nodes in HyPeerWeb, categorized by * their InceptionSegment * @author isaac */ public class ListTab extends JPanel{ private static ChatClient container; private static JTable table; private static MyTableModel tabModel = new MyTableModel(); private static JComboBox segmentBox; private static segmentModel segModel = new segmentModel(); public ListTab(ChatClient container) { super(new BorderLayout()); JPanel segmentPanel = new JPanel(); JLabel label = new JLabel("Segment:"); segmentBox = new JComboBox(segModel); segmentBox.setPreferredSize(new Dimension(150, 30)); segmentBox.setBorder(new EmptyBorder(4, 8, 4, 4)); segmentPanel.add(label); segmentPanel.add(segmentBox); this.add(segmentPanel, BorderLayout.NORTH); ListTab.container = container; table = new JTable(tabModel); table.setFillsViewportHeight(true); TableColumnModel model = table.getColumnModel(); ListSelectionModel lsm = table.getSelectionModel(); lsm.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); lsm.addListSelectionListener(new selectionHandler()); TableColumn col; DefaultTableCellRenderer dtcr = new DefaultTableCellRenderer(); dtcr.setHorizontalAlignment(SwingConstants.CENTER); for(int i = 0; i < tabModel.getColumnCount(); i++){ col = model.getColumn(i); col.setCellRenderer(dtcr); } model.getColumn(0).setPreferredWidth(58); model.getColumn(1).setPreferredWidth(44); model.getColumn(2).setPreferredWidth(45); model.getColumn(3).setPreferredWidth(85); model.getColumn(4).setPreferredWidth(50); model.getColumn(5).setPreferredWidth(50); model.getColumn(6).setPreferredWidth(25); model.getColumn(7).setPreferredWidth(25); model.getColumn(8).setPreferredWidth(25); JScrollPane scrollPane = new JScrollPane(table); add(scrollPane, BorderLayout.CENTER); } public void draw(){ table.repaint(); segmentBox.repaint(); } private static class MyTableModel implements TableModel { private final String[] columnNames = {"Segment", "WebID", "Height", "Ns", "SNs", "ISNs", "F", "SF", "ISF"}; public MyTableModel() {} @Override public int getRowCount() { return container.nodeCache.nodes.size(); } @Override public int getColumnCount() { return columnNames.length; } @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @Override public Class getColumnClass(int columnIndex) { return String.class; } @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @Override public Object getValueAt(int rowIndex, int columnIndex) { String result = ""; Node node = (Node) container.nodeCache.nodes.values().toArray()[rowIndex]; int selection = segModel.getSelection(); if(selection == -1 || selection == node.getNetworkId()){ switch(columnIndex){ case 0: result = "1"; break; case 1: result += node.getWebId(); break; case 2: result += node.getHeight(); break; case 3: for(Node n : node.getNeighbors()) result += n.getWebId() + " "; break; case 4: for(Node n : node.getSNeighbors()) result += n.getWebId() + " "; break; case 5: for(Node n : node.getISNeighbors()) result += n.getWebId() + " "; break; case 6: if(node.getFold() != null) result += node.getFold().getWebId(); break; case 7: if(node.getSFold() != null) result += node.getSFold().getWebId(); break; case 8: if(node.getISFold() != null) result += node.getISFold().getWebId(); break; } } return result; } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @Override public void addTableModelListener(TableModelListener l) { } @Override public void removeTableModelListener(TableModelListener l) { } } private static class segmentModel implements ComboBoxModel{ //temporary int selection = -1;//-1 for all segments private String[] getSegments(){ - int size; + int size = container.nodeCache.segments.size(); int index = 1; - Integer[] segments = (Integer[]) container.nodeCache.segments.toArray(); - size = segments.length + 1;//All goes first + Integer[] segments = container.nodeCache.segments.toArray(new Integer[size]); + size++;//All goes first String[] toReturn = new String[size]; toReturn[0] = "All"; for(Integer i : segments){ toReturn[index++] = i.toString(); } return toReturn; } @Override public void setSelectedItem(Object anItem) { if(anItem == "All") selection = -1; else selection = Integer.parseInt((String) anItem); } @Override public Object getSelectedItem() { if(selection == -1) return "All"; else return selection; } public int getSelection(){ return selection; } @Override public int getSize() { //get number of segments return getSegments().length; } @Override public Object getElementAt(int index) { return getSegments()[index]; } @Override public void addListDataListener(ListDataListener l) { } @Override public void removeListDataListener(ListDataListener l) { } } private static class selectionHandler implements ListSelectionListener{ @Override public void valueChanged(ListSelectionEvent e) { ListSelectionModel lsm = (ListSelectionModel)e.getSource(); int index = lsm.getMinSelectionIndex(); Node n = (Node) container.nodeCache.nodes.values().toArray()[index]; container.setSelectedNode(n); } } } diff --git a/HyPeerWeb/src/hypeerweb/NodeCache.java b/HyPeerWeb/src/hypeerweb/NodeCache.java index 2297b0d..9812779 100644 --- a/HyPeerWeb/src/hypeerweb/NodeCache.java +++ b/HyPeerWeb/src/hypeerweb/NodeCache.java @@ -1,222 +1,222 @@ package hypeerweb; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.TreeMap; /** * Lightweight cache of a HyPeerWeb's nodes * Node objects may not reflect what the actual values are * @author inygaard */ public class NodeCache implements Serializable{ public enum SyncType {ADD, REMOVE, REPLACE} public TreeMap<Integer, Node> nodes; - public HashSet<Integer> segments; + public HashSet<Integer> segments = new HashSet(); public void merge(NodeCache cache){ nodes.putAll(cache.nodes); } public int[] addNode(hypeerweb.Node real, boolean sync){ Node n = new Node(real); return addNode(n, sync); } public int[] addNode(Node faux, boolean sync){ int[] syncNodes = null; if (sync) syncNodes = sync(faux, SyncType.ADD); nodes.put(faux.webID, faux); return syncNodes; } public int[] removeNode(hypeerweb.Node real, boolean sync){ return removeNode(nodes.get(real.webID), sync); } public int[] removeNode(Node faux, boolean sync){ int[] syncNodes = null; if (sync) syncNodes = sync(faux, SyncType.REMOVE); nodes.remove(faux.webID); return syncNodes; } private int[] sync(Node faux, SyncType type){ Node cache = nodes.get(faux.webID); //Compare the cached version and the faux/proxy/real version HashSet<Integer> dirty = new HashSet(); //Compare folds int[] cacheF = new int[]{cache.f, cache.sf, cache.isf}; int[] fauxF = new int[]{faux.f, faux.sf, faux.isf}; for (int i=0; i<3; i++){ if (cacheF[i] != fauxF[i]){ dirty.add(cacheF[i]); dirty.add(fauxF[i]); } } //Compare neighbors dirty.addAll(syncNeighbors(cache.n, faux.n)); dirty.addAll(syncNeighbors(cache.sn, faux.sn)); dirty.addAll(syncNeighbors(cache.isn, faux.isn)); //Don't fetch "faux.webID" or "-1" dirty.remove(faux.webID); dirty.remove(-1); //TODO: account for different SyncType's //i.e., replace sync type? Integer[] obj = dirty.toArray(new Integer[dirty.size()]); int[] ret = new int[obj.length]; for (int i=0; i<obj.length; i++) ret[i] = obj[i].intValue(); return ret; } private ArrayList<Integer> syncNeighbors(int[] cacheN, int[] fauxN){ //Assuming the two arrays are sorted, //get the symmetric difference of the two ArrayList<Integer> dirty = new ArrayList(); int ci = 0, fi = 0; while (ci < cacheN.length || fi < fauxN.length){ //We've come to the end of an array; add the rest of the elements if (ci == cacheN.length) dirty.add(fauxN[fi++]); else if (fi == fauxN.length) dirty.add(cacheN[ci++]); else{ //Otherwise, compare the id's at our pointer locations if (cacheN[ci] == fauxN[fi]){ ci++; fi++; } else if (cacheN[ci] < fauxN[fi]) dirty.add(cacheN[ci++]); else dirty.add(fauxN[fi++]); } } return dirty; } public class Node implements Serializable{ //Network id private int networkID; //Node attributes private int webID, height; //Node links private int f=-1, sf=-1, isf=-1; private int[] n, sn, isn; public Node(hypeerweb.Node real){ webID = real.getWebId(); height = real.getHeight(); //Folds hypeerweb.Node temp; if ((temp = real.getFold()) != null) f = temp.getWebId(); if ((temp = real.getSurrogateFold()) != null) sf = temp.getWebId(); if ((temp = real.getInverseSurrogateFold()) != null) sf = temp.getWebId(); //Neighbors n = convertToCached(real.getNeighbors()); sn = convertToCached(real.getSurrogateNeighbors()); isn = convertToCached(real.getInverseSurrogateNeighbors()); } //BASIC GETTERS public int getNetworkId(){ return networkID; } public int getWebId(){ return webID; } public int getHeight(){ return height; } public Node getFold(){ return nodes.get(f); } public Node getSFold(){ return nodes.get(sf); } public Node getISFold(){ return nodes.get(isf); } public Node[] getNeighbors(){ return mapToCached(n); } public Node[] getSNeighbors(){ return mapToCached(sn); } public Node[] getISNeighbors(){ return mapToCached(isn); } //SPECIALIZED GETTERS public Node getParent(){ //See comments in hypeerweb.Node class for documentation if (webID == 0) return null; int parID = webID & ~Integer.highestOneBit(webID); int idx = Arrays.binarySearch(n, parID); if (idx < 0) return null; return nodes.get(n[idx]); } public Node[] getTreeChildren(){ //See comments in hypeerweb.Node class for documentation HashSet<Integer> generatedNeighbors = new HashSet(), generatedInverseSurrogates = new HashSet(); ArrayList<Node> found = new ArrayList(); int id_surr = webID | ((1 << (height - 1)) << 1), trailingZeros = Integer.numberOfTrailingZeros(webID); int bitShifter = 1; for(int i = 0; i < trailingZeros; i++){ generatedNeighbors.add(webID | bitShifter); generatedInverseSurrogates.add(id_surr | bitShifter); bitShifter <<= 1; } for (int id: n){ if (generatedNeighbors.contains(id)) found.add(nodes.get(id)); } for (int id: isn){ if (generatedInverseSurrogates.contains(id)) found.add(nodes.get(id)); } return found.toArray(new Node[found.size()]); } public Node getTreeParent(){ //See comments in hypeerweb.Node class for documentation if (webID == 0) return null; int neighborID = webID & ~Integer.lowestOneBit(webID); int idx = Arrays.binarySearch(n, neighborID); if (idx < 0){ Node temp; for (int snID: sn){ temp = nodes.get(snID); if (temp != null && temp.webID == (neighborID & ~((1 << (temp.height - 1)) << 1))) return temp; } } else return nodes.get(n[idx]); return null; } private Node[] mapToCached(int[] idList){ Node[] cached = new Node[idList.length]; for (int i=0; i<idList.length; i++) cached[i] = nodes.get(idList[i]); return cached; } private int[] convertToCached(hypeerweb.Node[] realList){ int[] temp = new int[realList.length]; for (int i=0; i<realList.length; i++) isn[i] = realList[i].getWebId(); return temp; } } }

diff --git a/gwycraft_common/gwydion0917/gwycraft/DyedBookcase.java b/gwycraft_common/gwydion0917/gwycraft/DyedBookcase.java index 6c8d0e5..6ed78fd 100644 --- a/gwycraft_common/gwydion0917/gwycraft/DyedBookcase.java +++ b/gwycraft_common/gwydion0917/gwycraft/DyedBookcase.java @@ -1,72 +1,65 @@ package gwydion0917.gwycraft; import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockBookshelf; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gwydion0917.gwycraft.DyedPlank; public class DyedBookcase extends BlockBookshelf { @SideOnly(Side.CLIENT) -// private Icon[][] iconBuffer; - private Icon[] iconArray; + private Icon[] iconArray; + private Icon[] iconArray1; public DyedBookcase(int id) { super(id); setUnlocalizedName("dyedBookcase"); setCreativeTab(CreativeTabs.tabBlock); setHardness(1.5F); setStepSound(Block.wood.stepSound); } @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { - // return this.iconArray[par2 % this.iconArray.length]; - return par1 != 1 && par1 != 0 ? super.getBlockTextureFromSideAndMetadata(par1, par2) : Block.planks.getBlockTextureFromSide(par1); - } + int l = par2 & 15; + return (par1 == 1 || par1 == 0) ? this.iconArray1[l] : this.iconArray[l]; + + } @Override public int damageDropped(int metadata) { return metadata; } @SideOnly(Side.CLIENT) public void getSubBlocks(int par1, CreativeTabs tab, List subItems) { for (int i = 0; i < 16; i++) { subItems.add(new ItemStack(this, 1, i)); } } @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { this.iconArray = new Icon[16]; + this.iconArray1 = new Icon[16]; for (int i = 0; i < this.iconArray.length; ++i) { - this.iconArray[i] = par1IconRegister.registerIcon("Gwycraft:bookcase_" + i); - - // this.iconBuffer = new Icon[16][6]; - -// for (int i = 0; i < this.iconBuffer.length; ++i) { -// this.iconBuffer[i][0] = par1IconRegister.registerIcon("Gwycraft:plank_" + i); -// this.iconBuffer[i][1] = par1IconRegister.registerIcon("Gwycraft:plank_" + i); -// this.iconBuffer[i][2] = par1IconRegister.registerIcon("Gwycraft:bookcase_" + i); -// this.iconBuffer[i][3] = par1IconRegister.registerIcon("Gwycraft:bookcase_" + i); -// this.iconBuffer[i][4] = par1IconRegister.registerIcon("Gwycraft:bookcase_" + i); -// this.iconBuffer[i][5] = par1IconRegister.registerIcon("Gwycraft:bookcase_" + i); + this.iconArray[i] = par1IconRegister.registerIcon("Gwycraft:bookcase_" + i); + this.iconArray1[i] = par1IconRegister.registerIcon("Gwycraft:plank_" + i); } } }

diff --git a/test/models/ModelTest.java b/test/models/ModelTest.java index acdf99c..748b304 100644 --- a/test/models/ModelTest.java +++ b/test/models/ModelTest.java @@ -1,47 +1,47 @@ package models; import java.util.Date; import models.Detail.COLOR; import models.Detail.SIZE; import org.junit.Test; import play.test.UnitTest; public class ModelTest extends UnitTest { @Test public void testClients(){ Client cl = new Client("Diego", "Ramirez"); assertNotNull(cl); cl.save(); assertNotNull(Client.find("firstname", "Diego").first()); } @Test public void testOrderwithclient(){ Client cl = Client.find("firstname", "Diego").first(); assertNotNull(cl); Order order = new Order( new Date(System.currentTimeMillis()) , cl); assertNotNull(order); order.save(); - Detail det = new Detail(COLOR.BLACK,SIZE.MEDIUM,2); - Detail det2 = new Detail(COLOR.BLACK,SIZE.SMALL,3); + Detail det = new Detail(1,2,2); + Detail det2 = new Detail(1,2,3); order.addDetail(det); order.addDetail(det2); order.save(); Payment pay = new Payment(new Date(System.currentTimeMillis()), 58.84F); order.addPayment(pay); assertTrue(order.payments.size()>0); order.save(); } }

public void testOrderwithclient(){ Client cl = Client.find("firstname", "Diego").first(); assertNotNull(cl); Order order = new Order( new Date(System.currentTimeMillis()) , cl); assertNotNull(order); order.save(); Detail det = new Detail(COLOR.BLACK,SIZE.MEDIUM,2); Detail det2 = new Detail(COLOR.BLACK,SIZE.SMALL,3); order.addDetail(det); order.addDetail(det2); order.save(); Payment pay = new Payment(new Date(System.currentTimeMillis()), 58.84F); order.addPayment(pay); assertTrue(order.payments.size()>0); order.save(); }

public void testOrderwithclient(){ Client cl = Client.find("firstname", "Diego").first(); assertNotNull(cl); Order order = new Order( new Date(System.currentTimeMillis()) , cl); assertNotNull(order); order.save(); Detail det = new Detail(1,2,2); Detail det2 = new Detail(1,2,3); order.addDetail(det); order.addDetail(det2); order.save(); Payment pay = new Payment(new Date(System.currentTimeMillis()), 58.84F); order.addPayment(pay); assertTrue(order.payments.size()>0); order.save(); }

diff --git a/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java b/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java index 451da167..fd217a7b 100644 --- a/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java +++ b/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java @@ -1,1425 +1,1437 @@ /******************************************************************************* * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.jst.jsp.jspeditor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Properties; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextListener; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.ITextViewerExtension5; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.contentassist.ContentAssistant; import org.eclipse.jface.text.contentassist.IContentAssistant; import org.eclipse.jface.text.formatter.IContentFormatter; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IOverviewRuler; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP; import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSource; import org.eclipse.swt.dnd.DropTarget; import org.eclipse.swt.dnd.DropTargetAdapter; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.DropTargetListener; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.HTMLTransfer; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.PropertySheetPage; import org.eclipse.ui.views.properties.PropertySheetSorter; import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.sse.ui.internal.contentoutline.ConfigurableContentOutlinePage; import org.eclipse.wst.sse.ui.internal.properties.ConfigurablePropertySheetPage; import org.eclipse.wst.sse.ui.internal.provisional.extensions.ConfigurationPointCalculator; import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration; import org.eclipse.wst.xml.core.internal.document.AttrImpl; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.jboss.tools.common.core.resources.XModelObjectEditorInput; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.model.XModelBuffer; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.XModelTransferBuffer; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory; import org.jboss.tools.common.model.ui.editors.dnd.DropData; import org.jboss.tools.common.model.ui.editors.dnd.DropUtils.AttributeDescriptorValueProvider; import org.jboss.tools.common.model.ui.editors.dnd.IDropCommand; import org.jboss.tools.common.model.ui.editors.dnd.ITagProposal; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributesComposite; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributesComposite.AttributeDescriptorValue; import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; import org.jboss.tools.common.model.ui.texteditors.TextMerge; import org.jboss.tools.common.model.ui.texteditors.dnd.TextEditorDrop; import org.jboss.tools.common.model.ui.texteditors.dnd.TextEditorDropProvider; import org.jboss.tools.common.model.ui.views.palette.IIgnoreSelection; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.common.text.xml.IOccurrencePreferenceProvider; import org.jboss.tools.common.text.xml.XmlEditorPlugin; import org.jboss.tools.common.text.xml.ui.FreeCaretStyledText; import org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration; import org.jboss.tools.jst.jsp.JSPTextViewerConfiguration; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.jst.jsp.editor.IVisualContext; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.jspeditor.dnd.FileTagProposalLoader; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory; import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; import org.jboss.tools.jst.jsp.outline.JSPContentOutlineConfiguration; import org.jboss.tools.jst.jsp.outline.JSPPropertySheetConfiguration; import org.jboss.tools.jst.jsp.outline.ValueHelper; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.text.xpl.IStructuredTextOccurrenceStructureProvider; import org.jboss.tools.jst.jsp.text.xpl.StructuredTextOccurrenceStructureProviderRegistry; import org.jboss.tools.jst.jsp.ui.action.ExtendedFormatAction; import org.jboss.tools.jst.jsp.ui.action.IExtendedAction; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; import org.jboss.tools.jst.web.kb.KbQuery.Type; import org.jboss.tools.jst.web.kb.PageProcessor; import org.jboss.tools.jst.web.kb.internal.JspContextImpl; import org.jboss.tools.jst.web.kb.internal.taglib.NameSpace; import org.jboss.tools.jst.web.kb.internal.taglib.TLDTag; import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.jboss.tools.jst.web.kb.taglib.IComponent; import org.jboss.tools.jst.web.kb.taglib.INameSpace; import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; import org.jboss.tools.jst.web.kb.taglib.TagLibraryManager; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; import org.w3c.dom.DocumentType; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.Text; /** * @author Jeremy * */ public class JSPTextEditor extends StructuredTextEditor implements ITextListener, IJSPTextEditor, ITextFormatter, IOccurrencePreferenceProvider { private IStructuredTextOccurrenceStructureProvider fOccurrenceModelUpdater; TextEditorDrop dnd = new TextEditorDrop(); JSPMultiPageEditor parentEditor; long timeStamp = -1; long savedTimeStamp = -1; IVisualController vpeController; // Added By Max Areshkau // Fix for JBIDE-788 protected SourceEditorPageContext pageContext = null; private TextEditorDropProviderImpl textEditorDropProvider; public JSPTextEditor(JSPMultiPageEditor parentEditor) { JspEditorPlugin.getDefault().initDefaultPluginPreferences(); textEditorDropProvider = new TextEditorDropProviderImpl(); dnd.setTextEditorDropProvider(textEditorDropProvider); this.parentEditor = parentEditor; super.setSourceViewerConfiguration(new JSPTextViewerConfiguration()); } @Override protected void setSourceViewerConfiguration(SourceViewerConfiguration config) { if (config instanceof StructuredTextViewerConfigurationJSP) { if (!(config instanceof JSPTextViewerConfiguration)) { config = new JSPTextViewerConfiguration(); } } else if (config instanceof StructuredTextViewerConfigurationHTML) { if (!(config instanceof HTMLTextViewerConfiguration)) { config = new HTMLTextViewerConfiguration(); } } else { config = new JSPTextViewerConfiguration(); } super.setSourceViewerConfiguration(config); } /** * This is *only* for allowing unit tests to access the source * configuration. */ public SourceViewerConfiguration getSourceViewerConfigurationForTest() { return getSourceViewerConfiguration(); } // Added By Max Areshkau // Fix for JBIDE-788 public IVisualContext getPageContext() { if (pageContext == null) { pageContext = new SourceEditorPageContext(parentEditor); } // JBIDE-2046 Runnable runnable = new Runnable() { public void run() { IDocument document = getTextViewer().getDocument(); int offset = JSPTextEditor.this.getTextViewer().getTextWidget() .getCaretOffset(); IndexedRegion treeNode = ContentAssistUtils.getNodeAt( JSPTextEditor.this.getTextViewer(), offset); Node node = (Node) treeNode; pageContext.setDocument(document, node); } }; Display display = Display.getCurrent(); if (display != null && (Thread.currentThread() == display.getThread())) { // we are in the UI thread runnable.run(); } else { Display.getDefault().syncExec(runnable); } return pageContext; } protected void initializeDrop(ITextViewer textViewer) { Composite c = textViewer.getTextWidget(); Label l = new Label(c, SWT.NONE); l.dispose(); } private ConfigurableContentOutlinePage fOutlinePage = null; private OutlinePageListener fOutlinePageListener = null; private IPropertySheetPage fPropertySheetPage; public Object getAdapter(Class adapter) { if (ISourceViewer.class.equals(adapter)) { return JSPTextEditor.this.getSourceViewer(); } else if (IContentOutlinePage.class.equals(adapter)) { if (fOutlinePage == null || fOutlinePage.getControl() == null || fOutlinePage.getControl().isDisposed()) { IStructuredModel internalModel = getModel(); ContentOutlineConfiguration cfg = new JSPContentOutlineConfiguration( this); if (cfg != null) { ConfigurableContentOutlinePage outlinePage = new ConfigurableContentOutlinePage(); outlinePage.setConfiguration(cfg); if (internalModel != null) { outlinePage.setInputContentTypeIdentifier(internalModel .getContentTypeIdentifier()); outlinePage.setInput(internalModel); } if (fOutlinePageListener == null) { fOutlinePageListener = new OutlinePageListener(); } outlinePage .addSelectionChangedListener(fOutlinePageListener); outlinePage.addDoubleClickListener(fOutlinePageListener); fOutlinePage = outlinePage; } } return fOutlinePage; } else if (IPropertySheetPage.class == adapter) { if (fPropertySheetPage == null || fPropertySheetPage.getControl() == null || fPropertySheetPage.getControl().isDisposed()) { JSPPropertySheetConfiguration cfg = new JSPPropertySheetConfiguration(); if (cfg != null) { ConfigurablePropertySheetPage propertySheetPage = new ConfigurablePropertySheetPage() { @Override public void setActionBars(IActionBars actionBars) { super.setActionBars(actionBars); // yradtsevich: fix of JBIDE-3442: VPE - properties view - Ctrl-Z - Ctrl-Y // - undo/redo combinations doesn't work for property change actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), JSPTextEditor.this.getAction(ITextEditorActionConstants.UNDO)); actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), JSPTextEditor.this.getAction(ITextEditorActionConstants.REDO)); } }; propertySheetPage.setConfiguration(cfg); fPropertySheetPage = propertySheetPage; setSorter(cfg.getSorter(), propertySheetPage); } } return fPropertySheetPage; } return super.getAdapter(adapter); } private void setSorter(PropertySheetSorter sorter, ConfigurablePropertySheetPage sheet) { try { Method method = PropertySheetPage.class.getDeclaredMethod( "setSorter", new Class[] { PropertySheetSorter.class }); //$NON-NLS-1$ method.setAccessible(true); method.invoke(sheet, new Object[] { sorter }); } catch (InvocationTargetException e) { JspEditorPlugin.getPluginLog().logError(e); } catch (SecurityException e) { JspEditorPlugin.getPluginLog().logError(e); } catch (NoSuchMethodException e) { JspEditorPlugin.getPluginLog().logError(e); } catch (IllegalArgumentException e) { JspEditorPlugin.getPluginLog().logError(e); } catch (IllegalAccessException e) { JspEditorPlugin.getPluginLog().logError(e); } } public String getEditorId() { return JSPUIPlugin.ID; } public IStructuredTextOccurrenceStructureProvider getOccurrencePreferenceProvider() { return fOccurrenceModelUpdater; } public void createPartControl(Composite parent) { super.createPartControl(parent); StructuredTextOccurrenceStructureProviderRegistry registry = XmlEditorPlugin .getDefault().getOccurrenceStructureProviderRegistry( JspEditorPlugin.PLUGIN_ID); fOccurrenceModelUpdater = registry .getCurrentOccurrenceProvider(JspEditorPlugin.PLUGIN_ID); if (fOccurrenceModelUpdater != null) fOccurrenceModelUpdater.install(this, getTextViewer()); createDrop(); setModified(false); getSourceViewer().removeTextListener(this); getSourceViewer().addTextListener(this); Object dtid = getSourceViewer().getTextWidget().getData("DropTarget"); //$NON-NLS-1$ if (dtid != null) { if (dtid instanceof DropTarget) { DropTarget dropTarget = (DropTarget) dtid; dropTarget.addDropListener(new DropTargetAdapter() { private FreeCaretStyledText getFreeCaretControl( Object sourceOrTarget) { if (sourceOrTarget == null) return null; Object control = null; if (sourceOrTarget instanceof DropTarget) { control = ((DropTarget) sourceOrTarget) .getControl(); } else if (sourceOrTarget instanceof DragSource) { control = ((DragSource) sourceOrTarget) .getControl(); } else return null; if (control instanceof FreeCaretStyledText) return (FreeCaretStyledText) control; return null; } public void dragEnter(DropTargetEvent event) { getFreeCaretControl(event.widget).enableFreeCaret(true); } public void dragLeave(DropTargetEvent event) { getFreeCaretControl(event.widget) .enableFreeCaret(false); } public void dragOperationChanged(DropTargetEvent event) { getFreeCaretControl(event.widget) .enableFreeCaret(false); } public void dragOver(DropTargetEvent event) { FreeCaretStyledText fcst = getFreeCaretControl(event.widget); int pos = getPosition(fcst, event.x, event.y); Point p = fcst.getLocationAtOffset(pos); fcst.myRedraw(p.x, p.y); } public void drop(DropTargetEvent event) { getFreeCaretControl(event.widget) .enableFreeCaret(false); } }); } } } protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { ISourceViewer sv = super.createSourceViewer(parent, ruler, styles); sv.getTextWidget().addFocusListener(new TextFocusListener()); IContentAssistant ca = getSourceViewerConfiguration().getContentAssistant(sv); if (ca instanceof ContentAssistant) { ((ContentAssistant)ca).enableColoredLabels(true); } return sv; } protected StructuredTextViewer createStructedTextViewer(Composite parent, IVerticalRuler verticalRuler, int styles) { return new JSPStructuredTextViewer(parent, verticalRuler, getOverviewRuler(), isOverviewRulerVisible(), styles, parentEditor, this); } class TextFocusListener extends FocusAdapter { public void focusLost(FocusEvent e) { if (JSPTextEditor.super.isDirty()) { Display.getDefault().syncExec(new Runnable() { public void run() { try { Thread.sleep(200); } catch (InterruptedException exc) { JspEditorPlugin.getPluginLog().logError(exc); } save(); } }); } } } public void save() { if (!lock && isModified()) { lock = true; try { FileAnyImpl f = (FileAnyImpl) getModelObject(); if (f != null) f.edit(getSourceViewer().getDocument().get()); } catch (XModelException e) { JspEditorPlugin.getPluginLog().logError(e); } finally { setModified(false); lock = false; } } } boolean modified = false; public void setModified(boolean set) { if (this.modified != set) { this.modified = set; if (set) { XModelObject o = getModelObject(); if (o != null) o.setModified(true); } super.firePropertyChange(IEditorPart.PROP_DIRTY); } } public void updateModification() { // added by Max Areshkau // Fix for JBIDE-788 getPageContext().refreshBundleValues(); XModelObject object = getModelObject(); if (object != null && !object.isModified() && isModified()) { setModified(false); } else { firePropertyChange(ITextEditor.PROP_DIRTY); } } public boolean isModified() { return modified; } protected void doSetInput(IEditorInput input) throws CoreException { super.doSetInput(XModelObjectEditorInput.checkInput(input)); if (getSourceViewer() != null && getSourceViewer().getDocument() != null) { getSourceViewer().removeTextListener(this); getSourceViewer().addTextListener(this); } if (listener != null) listener.dispose(); listener = null; XModelObject o = getModelObject(); if (o instanceof FileAnyImpl) { listener = new BodyListenerImpl((FileAnyImpl) o); } } boolean lock = false; public boolean isDirty() { if (getEditorInput() instanceof IModelObjectEditorInput) { XModelObject o = getModelObject(); if (o != null && o.isModified()) return true; else { return isModified(); } } else { return super.isDirty(); } } public void doSave(IProgressMonitor monitor) { XModelObject o = getModelObject(); super.doSave(monitor); if (o != null && (monitor == null || !monitor.isCanceled())) { if (o != null) save(); if (getEditorInput() instanceof ILocationProvider) { XModelObject p = o.getParent(); if (p instanceof FolderImpl) { try { ((FolderImpl) p).saveChild(o); } catch (XModelException e) { ModelPlugin.getPluginLog().logError(e); } } } else { o.setModified(false); XModelObjectLoaderUtil.updateModifiedOnSave(o); } super.firePropertyChange(IEditorPart.PROP_DIRTY); } } public void firePropertyChangeDirty() { super.firePropertyChange(IEditorPart.PROP_DIRTY); } public XModelObject getModelObject() { if (getEditorInput() instanceof IModelObjectEditorInput) { return ((IModelObjectEditorInput) getEditorInput()) .getXModelObject(); } return null; } class TextEditorDropProviderImpl implements TextEditorDropProvider { public ISourceViewer getSourceViewer() { return JSPTextEditor.this.getSourceViewer(); } public XModelObject getModelObject() { return JSPTextEditor.this.getModelObject(); } public void insert(Properties p) { JSPPaletteInsertHelper.getInstance().insertIntoEditor(getSourceViewer(), p); } } public void textChanged(TextEvent event) { if (event.getDocumentEvent() != null) { setModified(true); } } public void doRevertToSaved() { save(); XModelObject o = getModelObject(); if (o == null) { super.doRevertToSaved(); return; } Properties p = new Properties(); XActionInvoker.invoke("DiscardActions.Discard", o, p); //$NON-NLS-1$ if (!"true".equals(p.getProperty("done"))) //$NON-NLS-1$ //$NON-NLS-2$ return; super.doRevertToSaved(); if (o.isModified()) o.setModified(false); modified = false; firePropertyChange(IEditorPart.PROP_DIRTY); updatePartControl(getEditorInput()); } public IAnnotationModel getAnnotationModel() { return getSourceViewer().getAnnotationModel(); } private String getContentType() { String type = null; try { type = getModel().getContentTypeIdentifier(); } finally { if (type == null) type = ""; //$NON-NLS-1$ } return type; } public static class JSPStructuredTextViewer extends StructuredTextViewer implements VpeTaglibManagerProvider, IIgnoreSelection { boolean insertFromPallete = false; private VpeTaglibManagerProvider provider; private JSPTextEditor editor; private boolean ignore = false; public JSPStructuredTextViewer(Composite parent, IVerticalRuler verticalRuler, int styles) { super(parent, verticalRuler, null, false, styles); } public JSPStructuredTextViewer(Composite parent, IVerticalRuler verticalRuler, IOverviewRuler overviewRuler, boolean showAnnotationsOverview, int styles, VpeTaglibManagerProvider provider, JSPTextEditor editor) { super(parent, verticalRuler, overviewRuler, showAnnotationsOverview, styles); this.provider = provider; this.editor = editor; } protected StyledText createTextWidget(Composite parent, int styles) { return new FreeCaretStyledText(parent, styles); } public VpeTaglibManager getTaglibManager() { // added by Max Areshkau // Fix for JBIDE-788 if (getEditor() != null) { if (getEditor().getPageContext() instanceof VpeTaglibManager) return (VpeTaglibManager) getEditor().getPageContext(); } return null; } public boolean doesIgnore() { return ignore; } public void setIgnore(boolean ignore) { this.ignore = ignore; } public void doOperation(int operation) { if (operation == UNDO || operation == REDO || operation == FORMAT_DOCUMENT || operation == FORMAT_ACTIVE_ELEMENTS) { if (editor.getVPEController() != null) { editor.getVPEController().preLongOperation(); } } try { super.doOperation(operation); } finally { if (operation == UNDO || operation == REDO || operation == FORMAT_DOCUMENT || operation == FORMAT_ACTIVE_ELEMENTS) { if (editor.getVPEController() != null) { editor.getVPEController().postLongOperation(); } } } } protected void handleDispose() { if (editor != null && editor.getSourceViewer() != null && editor.getSourceViewer().getTextWidget() != null && editor.getVPEController() != null) { StyledText widget = editor.getSourceViewer().getTextWidget(); widget.removeSelectionListener(editor.getVPEController()); } super.handleDispose(); editor = null; provider = null; } /** * @return the editor */ // Added By Max Areshkau // Fix for JBIDE-788 public JSPTextEditor getEditor() { return editor; } /** * @param editor * the editor to set */ // Added By Max Areshkau // Fix for JBIDE-788 public void setEditor(JSPTextEditor editor) { this.editor = editor; } } public JSPMultiPageEditor getParentEditor() { return parentEditor; } public void setVPEController(IVisualController c) { vpeController = c; } public IVisualController getVPEController() { return vpeController; } public void runDropCommand(final String flavor, final String data) { XModelBuffer b = XModelTransferBuffer.getInstance().getBuffer(); final XModelObject o = b == null ? null : b.source(); Runnable runnable = new Runnable() { public void run() { if (o != null && !XModelTransferBuffer.getInstance().isEnabled()) { XModelTransferBuffer.getInstance().enable(); XModelTransferBuffer.getInstance().getBuffer().addSource(o); } try { DropData dropData = new DropData(flavor, data, getEditorInput(), getSourceViewer(), getSelectionProvider()); dropData.setValueProvider(createAttributeDescriptorValueProvider()); dropData.setAttributeName(dropContext.getAttributeName()); IDropCommand dropCommand = DropCommandFactory.getInstance() .getDropCommand(flavor, JSPTagProposalFactory.getInstance()); boolean promptAttributes = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT); dropCommand .getDefaultModel() .setPromptForTagAttributesRequired(promptAttributes); dropCommand.execute(dropData); } finally { XModelTransferBuffer.getInstance().disable(); } } }; // if(Display.getCurrent() != null) { // runnable.run(); // } else { /* * Fixes https://jira.jboss.org/jira/browse/JBIDE-5874 * Display.getDefault() should always be replaced by * PlatformUI.getWorkbench().getDisplay(). * syncExec() can hang the JBDS thus asyncExec is used. */ PlatformUI.getWorkbench().getDisplay().asyncExec(runnable); // } } public AttributeDescriptorValueProvider createAttributeDescriptorValueProvider() { return new AttributeDescriptorValueProviderImpl(); } class AttributeDescriptorValueProviderImpl implements AttributeDescriptorValueProvider { TagProposal proposal; KbQuery query; JspContentAssistProcessor processor; IPageContext pageContext; public void setProposal(ITagProposal proposal) { if(this.proposal == proposal) return; this.proposal = (TagProposal)proposal; String prefix = proposal.getPrefix(); int offset = JSPTextEditor.this.getTextViewer().getTextWidget().getCaretOffset(); ValueHelper valueHelper = new ValueHelper(); processor = valueHelper.createContentAssistProcessor(); pageContext = valueHelper.createPageContext(processor, offset); Map<String, List<INameSpace>> ns = pageContext.getNameSpaces(offset); List<INameSpace> n = ns.get(this.proposal.getUri()); if(n != null && !n.isEmpty()) { prefix = n.get(0).getPrefix(); } query = createQuery(this.proposal, prefix); if(n == null && pageContext instanceof JspContextImpl) { IRegion r = new Region(query.getOffset(), 0); ((JspContextImpl)pageContext).addNameSpace(r, new NameSpace(query.getUri(), query.getPrefix(), pageContext.getResource() == null ? new ITagLibrary[0] : TagLibraryManager.getLibraries( pageContext.getResource().getProject(), query.getUri()))); // ((JspContextImpl)pageContext).setLibraries(processor.getTagLibraries(pageContext)); } } public void initContext(Properties context) { if(context != null && processor != null) { context.put("processor", processor); //$NON-NLS-1$ context.put("pageContext", pageContext); //$NON-NLS-1$ } } public IPageContext getPageContext() { return pageContext; } public String getTag() { IComponent c = findComponent(query); if(c == null) return null; String prefix = getPrefix(query); if(prefix == null || prefix.length() == 0) return c.getName(); return prefix + ":" + c.getName(); //$NON-NLS-1$ } public boolean canHaveBody() { IComponent c = findComponent(query); return c != null && c.canHaveBody(); } public AttributeDescriptorValue[] getValues() { return createDescriptors(query); } KbQuery createQuery(TagProposal proposal, String prefix) { KbQuery kbQuery = new KbQuery(); String name = (prefix == null | prefix.length() == 0) ? proposal.getName() : prefix + ":" + proposal.getName(); //$NON-NLS-1$ kbQuery.setPrefix(prefix); kbQuery.setUri(proposal.getUri()); kbQuery.setParentTags(new String[]{name}); kbQuery.setParent(name); kbQuery.setMask(false); kbQuery.setType(Type.ATTRIBUTE_NAME); kbQuery.setOffset(JSPTextEditor.this.getTextViewer().getTextWidget().getCaretOffset()); kbQuery.setValue(""); //$NON-NLS-1$ kbQuery.setStringQuery(""); //$NON-NLS-1$ return kbQuery; } public IComponent findComponent(KbQuery query) { IComponent[] cs = PageProcessor.getInstance().getComponents(query, pageContext, true); if(cs == null || cs.length == 0) return null; if(cs.length == 1) return cs[0]; IComponent s = null; for (IComponent c: cs) { if(c instanceof TLDTag /*ICustomTagLibComponent*/) { s = c; break; } } if(s == null) s = cs[0]; return s; } public String getPrefix(KbQuery query) { Map<String,List<INameSpace>> ns = pageContext.getNameSpaces(query.getOffset()); List<INameSpace> n = ns.get(query.getUri()); return n == null || n.isEmpty() ? null : n.get(0).getPrefix(); } public TagAttributesComposite.AttributeDescriptorValue[] createDescriptors(KbQuery query) { IComponent s = findComponent(query); if(s == null) return new TagAttributesComposite.AttributeDescriptorValue[0]; boolean excludeJSFC = false; if(FileTagProposalLoader.FACELETS_URI.equals(query.getUri())) { if(getModelObject() != null && "jsp".equalsIgnoreCase(getModelObject().getAttributeValue(XModelObjectConstants.ATTR_NAME_EXTENSION))) { //$NON-NLS-1$ excludeJSFC = true; } } List<AttributeDescriptorValue> attributesValues = new ArrayList<AttributeDescriptorValue>(); IAttribute[] as = s.getAttributes(); for (IAttribute a: as) { if(excludeJSFC && "jsfc".equals(a.getName())) continue; //$NON-NLS-1$ AttributeDescriptorValue value = new AttributeDescriptorValue(a.getName(), a.isRequired(), a.isPreferable()); attributesValues.add(value); } return attributesValues.toArray(new AttributeDescriptorValue[attributesValues.size()]); } } private void createDrop() { DropTarget target = new DropTarget(getSourceViewer().getTextWidget(), DND.DROP_MOVE | DND.DROP_COPY); Transfer[] types = new Transfer[] { ModelTransfer.getInstance(), HTMLTransfer.getInstance(), TextTransfer.getInstance(), FileTransfer.getInstance() }; target.setTransfer(types); target.addDropListener(new DTL()); } DropContext dropContext = new DropContext(); class DTL implements DropTargetListener { int lastpos = -1; int lastdetail = -1; public void dragEnter(DropTargetEvent event) { lastpos = -1; } public void dragLeave(DropTargetEvent event) { lastpos = -1; } public void dragOperationChanged(DropTargetEvent event) { } public void dragOver(DropTargetEvent event) { if (!isEditable() || (getModelObject() != null && !getModelObject() .isObjectEditable())) { event.detail = DND.DROP_NONE; return; } JSPTagProposalFactory.getInstance(); dropContext.setDropTargetEvent(event); if (dropContext.getFlavor() == null) { event.detail = DND.DROP_NONE; return; } // commented by yradtsevich, see JBIDE-6439 (InnerDragBuffer is removed, // nodes are transfered through vpe/xpath flavor now) // // Drop from VPE to Source is forbidden // if (dropContext.getFlavor().equals("text/html")) { //$NON-NLS-1$ // if (InnerDragBuffer.getInnerDragObject() != null) { // event.detail = DND.DROP_NONE; // } // return; // } int pos = getPosition(event.x, event.y); if (lastpos == pos && pos >= 0) { pos = lastpos; event.detail = lastdetail; return; } lastpos = pos; dropContext.clean(); getSourceViewer().getDocument(); IndexedRegion region = getModel().getIndexedRegion(pos); if (region instanceof ElementImpl) { ElementImpl jspElement = (ElementImpl) region; NamedNodeMap attributes = jspElement.getAttributes(); if (pos == jspElement.getStartOffset() || pos == jspElement.getEndStartOffset()) { event.detail = lastdetail = DND.DROP_MOVE; return; } for (int i = 0; i < attributes.getLength(); i++) { Node attribute = attributes.item(i); if (attribute instanceof AttrImpl) { AttrImpl jspAttr = (AttrImpl) attribute; ITextRegion valueRegion = jspAttr.getValueRegion(); if (valueRegion == null) { event.detail = lastdetail = DND.DROP_NONE; return; } int startPos = jspElement.getStartOffset() + valueRegion.getStart(); int endPos = jspElement.getStartOffset() + valueRegion.getTextEnd(); if (pos > startPos && pos < endPos) { dropContext.setOverAttributeValue(true); dropContext.setAttributeName(jspAttr.getNodeName()); event.detail = lastdetail = DND.DROP_MOVE; return; } } } event.detail = lastdetail = DND.DROP_NONE; } else if (region instanceof Text && isInsideResponseRedirect((Text) region, pos - region.getStartOffset())) { dropContext.setOverAttributeValue(true); event.detail = lastdetail = DND.DROP_MOVE; } else if (region instanceof Text) { event.detail = lastdetail = DND.DROP_MOVE; } else if (region instanceof DocumentType) { event.detail = lastdetail = DND.DROP_NONE; } else if (region == null) { // new place event.detail = lastdetail = DND.DROP_MOVE; } } public void drop(DropTargetEvent event) { int offset = getPosition(event.x, event.y); selectAndReveal(offset, 0); dropContext.runDropCommand(JSPTextEditor.this, event); } public void dropAccept(DropTargetEvent event) { } } private int getPosition(int x, int y) { ISourceViewer v = getSourceViewer(); - return v == null ? 0 : getPosition(v.getTextWidget(), x, y); + int result = 0; + if(v != null) { + result = getPosition(v.getTextWidget(), x, y); + if (v instanceof ITextViewerExtension5) { + ITextViewerExtension5 ext = (ITextViewerExtension5) v; + int off = ext.widgetOffset2ModelOffset(result); + if (off >= 0) { + result = off; + } + } + } + return result; } private int getPosition(StyledText t, int x, int y) { if (t == null || t.isDisposed()) return 0; Point pp = t.toControl(x, y); x = pp.x; y = pp.y; int lineIndex = (t.getTopPixel() + y) / t.getLineHeight(); if (lineIndex >= t.getLineCount()) { return t.getCharCount(); } else { int c = 0; try { c = t.getOffsetAtLocation(new Point(x, y)); if (c < 0) c = 0; } catch (IllegalArgumentException ex) { // do not log, catching that exception is // the way to know that we are out of line. if (lineIndex + 1 >= t.getLineCount()) { return t.getCharCount(); } c = t.getOffsetAtLine(lineIndex + 1) - (t.getLineDelimiter() == null ? 0 : t .getLineDelimiter().length()); } return c; } } public String[] getConfigurationPoints() { String contentTypeIdentifierID = null; if (getModel() != null) contentTypeIdentifierID = getModel().getContentTypeIdentifier(); return ConfigurationPointCalculator.getConfigurationPoints(this, contentTypeIdentifierID, ConfigurationPointCalculator.SOURCE, StructuredTextEditor.class); } public void formatTextRegion(IDocument document, IRegion region) { SourceViewerConfiguration conf = getSourceViewerConfiguration(); if (conf instanceof StructuredTextViewerConfiguration) { StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) conf; IContentFormatter f = stvc.getContentFormatter(getSourceViewer()); f.format(document, region); } } Point storedSelection = new Point(0, 0); protected void handleCursorPositionChanged() { super.handleCursorPositionChanged(); ISelection selection = getSelectionProvider().getSelection(); Point p = getTextViewer().getTextWidget().getSelection(); if (storedSelection == null || !storedSelection.equals(p)) { storedSelection = p; if (selection instanceof ITextSelection) { ITextSelection ts = (ITextSelection) selection; // getSelectionProvider().setSelection(ts); if (ts.getLength() == 0) { getSelectionProvider().setSelection(ts); // if (vpeController != null) { // vpeController // .selectionChanged(new SelectionChangedEvent( // getSelectionProvider(), // getSelectionProvider().getSelection())); // } } } } } static int firingSelectionFailedCount = 0; private class OutlinePageListener implements IDoubleClickListener, ISelectionChangedListener { public void doubleClick(DoubleClickEvent event) { if (event.getSelection().isEmpty()) return; int start = -1; int length = 0; if (event.getSelection() instanceof IStructuredSelection) { ISelection currentSelection = getSelectionProvider() .getSelection(); if (currentSelection instanceof IStructuredSelection) { Object current = ((IStructuredSelection) currentSelection) .toArray(); Object newSelection = ((IStructuredSelection) event .getSelection()).toArray(); if (!current.equals(newSelection)) { IStructuredSelection selection = (IStructuredSelection) event .getSelection(); Object o = selection.getFirstElement(); if (o instanceof IndexedRegion) { start = ((IndexedRegion) o).getStartOffset(); length = ((IndexedRegion) o).getEndOffset() - start; } else if (o instanceof ITextRegion) { start = ((ITextRegion) o).getStart(); length = ((ITextRegion) o).getEnd() - start; } else if (o instanceof IRegion) { start = ((ITextRegion) o).getStart(); length = ((ITextRegion) o).getLength(); } } } } else if (event.getSelection() instanceof ITextSelection) { start = ((ITextSelection) event.getSelection()).getOffset(); length = ((ITextSelection) event.getSelection()).getLength(); } if (start > -1) { getSourceViewer().setRangeIndication(start, length, false); selectAndReveal(start, length); } } public void selectionChanged(SelectionChangedEvent event) { if (event.getSelection().isEmpty() || isFiringSelection()) return; boolean ignoreSelection = false; if (getSourceViewer() != null && getSourceViewer() instanceof IIgnoreSelection) { IIgnoreSelection is = ((IIgnoreSelection) getSourceViewer()); ignoreSelection = is.doesIgnore(); } if (getSourceViewer() != null && getSourceViewer().getTextWidget() != null && !getSourceViewer().getTextWidget().isDisposed() && !getSourceViewer().getTextWidget().isFocusControl() && !ignoreSelection) { int start = -1; int length = 0; if (event.getSelection() instanceof IStructuredSelection) { ISelection current = getSelectionProvider().getSelection(); if (current instanceof IStructuredSelection) { Object[] currentSelection = ((IStructuredSelection) current) .toArray(); Object[] newSelection = ((IStructuredSelection) event .getSelection()).toArray(); if (!Arrays.equals(currentSelection, newSelection)) { if (newSelection.length > 0) { /* * No ordering is guaranteed for multiple * selection */ Object o = newSelection[0]; if (o instanceof IndexedRegion) { start = ((IndexedRegion) o) .getStartOffset(); int end = ((IndexedRegion) o) .getEndOffset(); if (newSelection.length > 1) { for (int i = 1; i < newSelection.length; i++) { start = Math .min( start, ((IndexedRegion) newSelection[i]) .getStartOffset()); end = Math .max( end, ((IndexedRegion) newSelection[i]) .getEndOffset()); } length = end - start; } } else if (o instanceof ITextRegion) { start = ((ITextRegion) o).getStart(); int end = ((ITextRegion) o).getEnd(); if (newSelection.length > 1) { for (int i = 1; i < newSelection.length; i++) { start = Math .min( start, ((ITextRegion) newSelection[i]) .getStart()); end = Math .max( end, ((ITextRegion) newSelection[i]) .getEnd()); } length = end - start; } } else if (o instanceof IRegion) { start = ((IRegion) o).getOffset(); int end = start + ((IRegion) o).getLength(); if (newSelection.length > 1) { for (int i = 1; i < newSelection.length; i++) { start = Math.min(start, ((IRegion) newSelection[i]) .getOffset()); end = Math .max( end, ((IRegion) newSelection[i]) .getOffset() + ((IRegion) newSelection[i]) .getLength()); } length = end - start; } } } } } } else if (event.getSelection() instanceof ITextSelection) { start = ((ITextSelection) event.getSelection()).getOffset(); } if (start > -1) { updateRangeIndication0(event.getSelection()); selectAndReveal(start, length); } } } Method m = null; private boolean isFiringSelection() { if (getSelectionProvider() == null) return false; if (firingSelectionFailedCount > 0) return false; try { if (m == null) { Class c = getSelectionProvider().getClass(); m = c.getDeclaredMethod("isFiringSelection", new Class[0]); //$NON-NLS-1$ m.setAccessible(true); } Boolean b = (Boolean) m.invoke(getSelectionProvider(), new Object[0]); return b.booleanValue(); } catch (NoSuchMethodException e) { firingSelectionFailedCount++; JspEditorPlugin.getPluginLog().logError(e); } catch (IllegalArgumentException e) { firingSelectionFailedCount++; JspEditorPlugin.getPluginLog().logError(e); } catch (IllegalAccessException e) { firingSelectionFailedCount++; JspEditorPlugin.getPluginLog().logError(e); } catch (InvocationTargetException e) { firingSelectionFailedCount++; JspEditorPlugin.getPluginLog().logError(e); } return false; } } private void updateRangeIndication0(ISelection selection) { if (selection instanceof IStructuredSelection && !((IStructuredSelection) selection).isEmpty()) { Object[] objects = ((IStructuredSelection) selection).toArray(); if (objects.length > 0) { int start = ((IndexedRegion) objects[0]).getStartOffset(); int end = ((IndexedRegion) objects[objects.length - 1]) .getEndOffset(); getSourceViewer().setRangeIndication(start, end - start, false); } else { getSourceViewer().removeRangeIndication(); } } else { if (selection instanceof ITextSelection) { getSourceViewer().setRangeIndication( ((ITextSelection) selection).getOffset(), ((ITextSelection) selection).getLength(), false); } else { getSourceViewer().removeRangeIndication(); } } } protected IExtendedAction createExtendedAction(String actionID) { if (StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT .equals(actionID) || ITextEditorActionConstants.UNDO.equals(actionID) || ITextEditorActionConstants.REDO.equals(actionID)) { return new ExtendedFormatAction(this, actionID); } return null; } protected void initializeEditor() { super.initializeEditor(); getPreferenceStore(); } public void dispose() { // some things in the configuration need to clean // up after themselves if (dnd != null) { dnd.setTextEditorDropProvider(null); dnd = null; } textEditorDropProvider = null; if (getSourceViewer() != null) { getSourceViewer().removeTextListener(this); } if (fOutlinePage != null) { if (fOutlinePage instanceof ConfigurableContentOutlinePage && fOutlinePageListener != null) { ((ConfigurableContentOutlinePage) fOutlinePage) .removeDoubleClickListener(fOutlinePageListener); } if (fOutlinePageListener != null) { fOutlinePage .removeSelectionChangedListener(fOutlinePageListener); } } fOutlinePage = null; fOutlinePageListener = null; if (fOccurrenceModelUpdater != null) { fOccurrenceModelUpdater.uninstall(); fOccurrenceModelUpdater = null; } fPropertySheetPage = null; if (pageContext != null) { pageContext.dispose(); pageContext = null; } super.dispose(); if (listener != null) listener.dispose(); listener = null; ISelectionProvider provider = getSelectionProvider(); if (provider != null) { provider .removeSelectionChangedListener(getSelectionChangedListener()); } } BodyListenerImpl listener = null; class BodyListenerImpl implements FileAnyImpl.BodyListener { FileAnyImpl file; BodyListenerImpl(FileAnyImpl file) { this.file = file; file.addListener(this); } public void bodyChanged(String body) { setText(body); } public void dispose() { file.removeListener(this); } } public void setText(String text) { if (getSourceViewer() == null || getSourceViewer().getDocument() == null) return; String txt = getSourceViewer().getDocument().get(); if (txt != null && txt.length() > 0) { if (!TextMerge.replace(getSourceViewer().getDocument(), text)) { getSourceViewer().getDocument().set(text); } } else { getSourceViewer().getDocument().set(text); } } boolean isInsideResponseRedirect(Text textNode, int off) { if (off < 0) return false; String START = "response.sendRedirect(\""; //$NON-NLS-1$ String END = "\")"; //$NON-NLS-1$ String text = textNode.getNodeValue(); int i = 0; while (i < text.length() && i < off) { int i1 = text.indexOf(START, i); if (i1 < 0 || i1 + START.length() > off) return false; int i2 = text.indexOf(END, i1 + START.length()); if (i2 < 0 || i2 >= off) return true; i = i2 + END.length(); } return false; } /** * * @return HyperLinkDetectors for sourceRegion */ public IHyperlinkDetector[] getHyperlinkDetectors() { return getSourceViewerConfiguration().getHyperlinkDetectors(getSourceViewer()); } }

diff --git a/src/org/eclipse/jface/util/SafeRunnable.java b/src/org/eclipse/jface/util/SafeRunnable.java index 7409e7d8..40235d5c 100644 --- a/src/org/eclipse/jface/util/SafeRunnable.java +++ b/src/org/eclipse/jface/util/SafeRunnable.java @@ -1,65 +1,67 @@ /******************************************************************************* * Copyright (c) 2000, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.jface.util; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.JFaceResources; /** * Implements a default implementation of ISafeRunnable. * The default implementation of <code>handleException</code> * opens a message dialog. + * <p><b>Note:<b> This class can open an error dialog and should not + * be used outside of the UI Thread.</p> */ public abstract class SafeRunnable implements ISafeRunnable { private String message; private static boolean ignoreErrors = false; /** * Creates a new instance of SafeRunnable with a default error message. */ public SafeRunnable() {} /** * Creates a new instance of SafeRunnable with the given error message. * * @param message the error message to use */ public SafeRunnable(String message) { this.message = message; } /* (non-Javadoc) * Method declared on ISafeRunnable. */ public void handleException(Throwable e) { // Workaround to avoid interactive error dialogs during automated testing if (!ignoreErrors) { if(message == null) message = JFaceResources.getString("SafeRunnable.errorMessage"); //$NON-NLS-1$ MessageDialog.openError(null, JFaceResources.getString("Error"), message); //$NON-NLS-1$ } } /** * Flag to avoid interactive error dialogs during automated testing. */ public static boolean getIgnoreErrors(boolean flag) { return ignoreErrors; } /** * Flag to avoid interactive error dialogs during automated testing. */ public static void setIgnoreErrors(boolean flag) { ignoreErrors = flag; } }

diff --git a/src/main/java/ru/shutoff/caralarm/EventsActivity.java b/src/main/java/ru/shutoff/caralarm/EventsActivity.java index bdb2169..9630de0 100644 --- a/src/main/java/ru/shutoff/caralarm/EventsActivity.java +++ b/src/main/java/ru/shutoff/caralarm/EventsActivity.java @@ -1,421 +1,421 @@ package ru.shutoff.caralarm; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v7.app.ActionBarActivity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.util.Date; import java.util.Vector; public class EventsActivity extends ActionBarActivity { final static String EVENTS = "http://api.car-online.ru/v2?get=events&skey=$1&begin=$2&end=$3&content=json"; CaldroidFragment dialogCaldroidFragment; LocalDate current; ListView lvEvents; TextView tvNoEvents; View progress; SharedPreferences preferences; String api_key; Vector<Event> events; Vector<Event> filtered; int filter; boolean error; static final String FILTER = "filter"; static class EventType { EventType(int type_, int string_, int icon_) { type = type_; string = string_; icon = icon_; filter = 4; } EventType(int type_, int string_, int icon_, int filter_) { type = type_; string = string_; icon = icon_; filter = filter_; } int type; int string; int icon; int filter; } ; static EventType[] event_types = { new EventType(24, R.string.guard_on, R.drawable.guard_on, 1), new EventType(25, R.string.guard_off, R.drawable.guard_off, 1), new EventType(91, R.string.end_move, R.drawable.system), new EventType(111, R.string.lock_off1, R.drawable.lockclose01, 1), new EventType(112, R.string.lock_off2, R.drawable.lockclose02, 1), new EventType(113, R.string.lock_off3, R.drawable.lockclose03, 1), new EventType(114, R.string.lock_off4, R.drawable.lockclose04, 1), new EventType(115, R.string.lock_off5, R.drawable.lockclose05, 1), new EventType(121, R.string.lock_on1, R.drawable.lockcopen01, 1), new EventType(122, R.string.lock_on2, R.drawable.lockcopen02, 1), new EventType(123, R.string.lock_on3, R.drawable.lockcopen03, 1), new EventType(124, R.string.lock_on4, R.drawable.lockcopen04, 1), new EventType(125, R.string.lock_on5, R.drawable.lockcopen05, 1), new EventType(42, R.string.user_call, R.drawable.user_call, 1), new EventType(46, R.string.motor_start, R.drawable.motor_start, 1), new EventType(89, R.string.request_photo, R.drawable.request_photo, 1), new EventType(110, R.string.valet_on, R.drawable.valet_on, 1), new EventType(120, R.string.valet_off, R.drawable.valet_off, 1), new EventType(5, R.string.trunk_open, R.drawable.boot_open, 2), new EventType(6, R.string.hood_open, R.drawable.e_hood_open, 2), new EventType(7, R.string.door_open, R.drawable.door_open, 2), new EventType(9, R.string.ignition_on, R.drawable.ignition_on, 2), new EventType(10, R.string.access_on, R.drawable.access_on, 2), new EventType(11, R.string.input1_on, R.drawable.input1_on, 2), new EventType(12, R.string.input2_on, R.drawable.input2_on, 2), new EventType(13, R.string.input3_on, R.drawable.input3_on, 2), new EventType(14, R.string.input4_on, R.drawable.input4_on, 2), new EventType(15, R.string.trunk_close, R.drawable.boot_close, 2), new EventType(16, R.string.hood_close, R.drawable.e_hood_close, 2), new EventType(17, R.string.door_close, R.drawable.door_close, 2), new EventType(18, R.string.ignition_off, R.drawable.ignition_off, 2), new EventType(19, R.string.access_off, R.drawable.access_off, 2), new EventType(20, R.string.input1_off, R.drawable.input1_off, 2), new EventType(21, R.string.input2_off, R.drawable.input2_off, 2), new EventType(22, R.string.input3_off, R.drawable.input3_off, 2), new EventType(23, R.string.input4_off, R.drawable.input4_off, 2), new EventType(59, R.string.reset_modem, R.drawable.reset_modem), new EventType(60, R.string.gprs_on, R.drawable.gprs_on), new EventType(61, R.string.gprs_off, R.drawable.gprs_off), new EventType(65, R.string.reset, R.drawable.reset), new EventType(37, R.string.trace_start, R.drawable.trace_start), new EventType(38, R.string.trace_stop, R.drawable.trace_stop), new EventType(31, R.string.gsm_fail, R.drawable.gsm_fail), new EventType(32, R.string.gsm_recover, R.drawable.gsm_recover), new EventType(34, R.string.gps_fail, R.drawable.gps_fail), new EventType(35, R.string.gps_recover, R.drawable.gps_recover), new EventType(90, R.string.till_start, R.drawable.till_start), new EventType(105, R.string.reset_modem, R.drawable.reset_modem), new EventType(106, R.string.reset_modem, R.drawable.reset_modem), new EventType(107, R.string.reset_modem, R.drawable.reset_modem), new EventType(108, R.string.reset_modem, R.drawable.reset_modem), new EventType(26, R.string.reset, R.drawable.reset), new EventType(100, R.string.reset, R.drawable.reset), new EventType(101, R.string.reset, R.drawable.reset), new EventType(72, R.string.net_error, R.drawable.system), new EventType(68, R.string.net_error, R.drawable.system), new EventType(75, R.string.net_error, R.drawable.system), new EventType(76, R.string.reset_modem, R.drawable.reset_modem), new EventType(77, R.string.reset_modem, R.drawable.reset_modem), new EventType(78, R.string.reset_modem, R.drawable.reset_modem), new EventType(79, R.string.reset_modem, R.drawable.reset_modem), new EventType(1, R.string.light_shock, R.drawable.light_shock, 0), new EventType(2, R.string.ext_zone, R.drawable.ext_zone, 0), new EventType(3, R.string.heavy_shock, R.drawable.heavy_shock, 0), new EventType(4, R.string.inner_zone, R.drawable.inner_zone, 0), new EventType(8, R.string.tilt, R.drawable.tilt, 0), new EventType(27, R.string.main_power_on, R.drawable.main_power_off, 0), new EventType(28, R.string.main_power_off, R.drawable.main_power_off, 0), new EventType(29, R.string.reserve_power_on, R.drawable.reserve_power_off, 0), new EventType(30, R.string.reserve_power_off, R.drawable.reserve_power_off, 0), new EventType(43, R.string.rogue, R.drawable.rogue, 0), new EventType(44, R.string.rogue_off, R.drawable.rogue, 0), new EventType(49, R.string.alarm_boot, R.drawable.alarm_boot, 0), new EventType(50, R.string.alarm_hood, R.drawable.alarm_hood, 0), new EventType(51, R.string.alarm_door, R.drawable.alarm_door, 0), new EventType(52, R.string.ignition_lock, R.drawable.ignition_lock, 0), new EventType(53, R.string.alarm_accessories, R.drawable.alarm_accessories, 0), new EventType(54, R.string.alarm_input1, R.drawable.alarm_input1, 0), new EventType(55, R.string.alarm_input2, R.drawable.alarm_input2, 0), new EventType(56, R.string.alarm_input3, R.drawable.alarm_input3, 0), new EventType(57, R.string.alarm_input4, R.drawable.alarm_input4, 0), new EventType(85, R.string.sos, R.drawable.sos, 0), new EventType(293, R.string.sos, R.drawable.sos, 0), new EventType(88, R.string.incomming_sms, R.drawable.user_sms, 1), }; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.events); lvEvents = (ListView) findViewById(R.id.events); tvNoEvents = (TextView) findViewById(R.id.no_events); progress = findViewById(R.id.progress); preferences = PreferenceManager.getDefaultSharedPreferences(this); api_key = preferences.getString(Names.KEY, ""); events = new Vector<Event>(); filtered = new Vector<Event>(); filter = preferences.getInt(FILTER, 3); setupButton(R.id.actions, 1); setupButton(R.id.contacts, 2); setupButton(R.id.system, 4); current = new LocalDate(); if (savedInstanceState != null) current = new LocalDate(savedInstanceState.getLong(Names.TRACK_DATE)); DataFetcher fetcher = new DataFetcher(); fetcher.update(current); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); if (current != null) outState.putLong(Names.TRACK_DATE, current.toDate().getTime()); } @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.tracks, menu); return super.onCreateOptionsMenu(menu); } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.day: { dialogCaldroidFragment = new CaldroidFragment() { @Override public void onAttach(Activity activity) { super.onAttach(activity); CaldroidListener listener = new CaldroidListener() { @Override public void onSelectDate(Date date, View view) { changeDate(date); } }; dialogCaldroidFragment = this; setCaldroidListener(listener); } }; Bundle args = new Bundle(); args.putString(CaldroidFragment.DIALOG_TITLE, getString(R.string.day)); args.putInt(CaldroidFragment.MONTH, current.getMonthOfYear()); args.putInt(CaldroidFragment.YEAR, current.getYear()); args.putInt(CaldroidFragment.START_DAY_OF_WEEK, 1); dialogCaldroidFragment.setArguments(args); LocalDateTime now = new LocalDateTime(); dialogCaldroidFragment.setMaxDate(now.toDate()); dialogCaldroidFragment.show(getSupportFragmentManager(), "TAG"); break; } } return false; } void changeDate(Date date) { LocalDate d = new LocalDate(date); - setTitle(d.toString("d MMMM")); dialogCaldroidFragment.dismiss(); dialogCaldroidFragment = null; progress.setVisibility(View.VISIBLE); lvEvents.setVisibility(View.GONE); tvNoEvents.setVisibility(View.GONE); DataFetcher fetcher = new DataFetcher(); fetcher.update(d); } void showError() { this.runOnUiThread(new Runnable() { @Override public void run() { tvNoEvents.setText(getString(R.string.error_load)); tvNoEvents.setVisibility(View.VISIBLE); progress.setVisibility(View.GONE); error = true; } }); } class DataFetcher extends HttpTask { LocalDate date; @Override void result(JSONObject data) throws JSONException { if (!current.equals(date)) return; JSONArray res = data.getJSONArray("events"); for (int i = 0; i < res.length(); i++) { JSONObject event = res.getJSONObject(i); int type = event.getInt("eventType"); if ((type == 94) || (type == 98) || (type == 41) || (type == 33) || (type == 39)) continue; long time = event.getLong("eventTime"); long id = event.getLong("eventId"); Event e = new Event(); e.type = type; e.time = time; e.id = id; events.add(e); } filterEvents(); progress.setVisibility(View.GONE); } @Override void error() { showError(); } void update(LocalDate d) { + setTitle(d.toString("d MMMM")); date = d; current = d; DateTime start = date.toDateTime(new LocalTime(0, 0)); LocalDate next = date.plusDays(1); DateTime finish = next.toDateTime(new LocalTime(0, 0)); events.clear(); error = false; execute(EVENTS, api_key, start.toDate().getTime() + "", finish.toDate().getTime() + ""); } } class EventsAdapter extends BaseAdapter { @Override public int getCount() { return filtered.size(); } @Override public Object getItem(int position) { return filtered.get(position); } @Override public long getItemId(int position) { return position; } @Override public View getView(int position, View convertView, ViewGroup parent) { View v = convertView; if (v == null) { LayoutInflater inflater = (LayoutInflater) getBaseContext() .getSystemService(Context.LAYOUT_INFLATER_SERVICE); v = inflater.inflate(R.layout.event_item, null); } Event e = filtered.get(position); TextView tvName = (TextView) v.findViewById(R.id.name); TextView tvTime = (TextView) v.findViewById(R.id.time); ImageView icon = (ImageView) v.findViewById(R.id.icon); LocalTime time = new LocalTime(e.time); tvTime.setText(time.toString("H:mm:ss")); boolean found = false; for (EventType et : event_types) { if (et.type == e.type) { found = true; tvName.setText(getString(et.string)); icon.setVisibility(View.VISIBLE); icon.setImageResource(et.icon); } } if (!found) { tvName.setText(getString(R.string.event) + " #" + e.type); icon.setVisibility(View.GONE); } return v; } } ; void setupButton(int id, int mask) { Button btn = (Button) findViewById(id); if ((mask & filter) != 0) btn.setBackgroundResource(R.drawable.pressed); btn.setTag(mask); btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { toggleButton(v); } }); } void toggleButton(View v) { Button btn = (Button) v; int mask = (Integer) btn.getTag(); if ((filter & mask) == 0) { filter |= mask; btn.setBackgroundResource(R.drawable.pressed); } else { filter &= ~mask; btn.setBackgroundResource(R.drawable.button); } SharedPreferences.Editor ed = preferences.edit(); ed.putInt(FILTER, filter); ed.commit(); if (!error) filterEvents(); } void filterEvents() { filtered.clear(); for (Event e : events) { if (isShow(e.type)) filtered.add(e); } if (filtered.size() > 0) { lvEvents.setAdapter(new EventsAdapter()); lvEvents.setVisibility(View.VISIBLE); tvNoEvents.setVisibility(View.GONE); } else { tvNoEvents.setText(getString(R.string.no_events)); tvNoEvents.setVisibility(View.VISIBLE); lvEvents.setVisibility(View.GONE); } } boolean isShow(int type) { for (EventType et : event_types) { if (et.type == type) { if (et.filter == 0) return true; return (et.filter & filter) != 0; } } return (filter & 4) != 0; } static class Event { int type; long time; long id; } ; }

diff --git a/applications/petascope/src/main/java/petascope/wcs/server/core/executeGetCapabilities.java b/applications/petascope/src/main/java/petascope/wcs/server/core/executeGetCapabilities.java index c1ae2512..6352b1c2 100644 --- a/applications/petascope/src/main/java/petascope/wcs/server/core/executeGetCapabilities.java +++ b/applications/petascope/src/main/java/petascope/wcs/server/core/executeGetCapabilities.java @@ -1,288 +1,288 @@ /* * This file is part of rasdaman community. * * Rasdaman community is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Rasdaman community is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with rasdaman community. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2003 - 2010 Peter Baumann / rasdaman GmbH. * * For more information please see <http://www.rasdaman.org> * or contact Peter Baumann via <[email protected]>. */ package petascope.wcs.server.core; import petascope.exceptions.PetascopeException; import petascope.exceptions.WCSException; import petascope.exceptions.ExceptionCode; import java.sql.SQLException; import java.util.Iterator; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import net.opengis.ows.v_1_0_0.CodeType; import net.opengis.ows.v_1_0_0.ContactType; import net.opengis.ows.v_1_0_0.OnlineResourceType; import net.opengis.ows.v_1_0_0.ResponsiblePartySubsetType; import net.opengis.ows.v_1_0_0.ServiceProvider; import net.opengis.wcs.ows.v_1_1_0.AllowedValues; import net.opengis.wcs.ows.v_1_1_0.DCP; import net.opengis.wcs.ows.v_1_1_0.DomainType; import net.opengis.wcs.ows.v_1_1_0.HTTP; import net.opengis.wcs.ows.v_1_1_0.Operation; import net.opengis.wcs.ows.v_1_1_0.OperationsMetadata; import net.opengis.wcs.ows.v_1_1_0.ServiceIdentification; import net.opengis.wcs.ows.v_1_1_0.ValueType; import net.opengis.wcs.v_1_1_0.Capabilities; import net.opengis.wcs.v_1_1_0.Contents; import net.opengis.wcs.v_1_1_0.CoverageSummaryType; import net.opengis.wcs.v_1_1_0.GetCapabilities; import petascope.core.DbMetadataSource; import petascope.core.Metadata; import javax.xml.XMLConstants; import net.opengis.ows.v_1_0_0.AddressType; import net.opengis.wcs.ows.v_1_1_0.RequestMethodType; import petascope.ConfigManager; /** * This class takes a WCS GetCapabilities XML request and executes request, * building the corresponding XML respose. * * @author Andrei Aiordachioaie */ public class executeGetCapabilities { private GetCapabilities input; private Capabilities output; private boolean finished; private DbMetadataSource meta; /** * Default constructor * @param cap GetCapabilities object, a WCS (or WCPS) request * @param metadataDbPath Path to the "dbparams.properties" file */ public executeGetCapabilities(GetCapabilities cap, DbMetadataSource source) throws WCSException { input = cap; output = new Capabilities(); meta = source; finished = false; } /** * Main method of this class. Retrieves the response to the GetCapabilities * request given to the constructor. If needed, it also calls <b>process()</b> * @return a Capabilities object. * @throws wcs_web_service.WCSException */ public Capabilities get() throws WCSException, PetascopeException { if (finished == false) { process(); } if (finished == false) { throw new WCSException(ExceptionCode.NoApplicableCode, "Could not execute the GetCapabilities request! " + "Please see the other errors..."); } return output; } /** * Computes the response to the GetCapabilities request given to the constructor. * @throws wcs_web_service.WCSException */ public void process() throws WCSException, PetascopeException { if (!input.SERVICE.equalsIgnoreCase("WCS")) { throw new WCSException(ExceptionCode.InvalidParameterValue, "Service"); } try { buildField1(); // Service Identification buildField2(); // Service Provider buildField3(); // Operations Metadata buildField4(); // Contents finishBuild(); // Add the remaining required attributes finished = true; } catch (SQLException se) { finished = false; throw new WCSException(ExceptionCode.InternalSqlError, se.getMessage(), se); } } /** * Builds the output node "Service Identification" */ private void buildField1() { ServiceIdentification ident = new ServiceIdentification(); ident.setTitle("PetaScope"); ident.setAbstract("PetaScope is a suite of OGC web-services comprising of " + "WCS, WCS-T and WCPS. It has been developed at Jacobs University, and " + "is mentained by the Jacobs University. Copyright Peter Baumann"); CodeType code = new CodeType(); code.setValue("WCS"); ident.setServiceType(code); ident.getServiceTypeVersion().add("1.1.0"); ident.setFees("NONE"); output.setServiceIdentification(ident); } /** * Builds the output node "Service Provider" */ private void buildField2() { ServiceProvider prov = new ServiceProvider(); prov.setProviderName("Jacobs University Bremen"); OnlineResourceType site = new OnlineResourceType(); - site.setHref("http://www.petascope.org/"); + site.setHref("http://rasdaman.org/"); prov.setProviderSite(site); ResponsiblePartySubsetType resp = new ResponsiblePartySubsetType(); resp.setIndividualName("Prof. Dr. Peter Baumann"); CodeType role = new CodeType(); role.setValue("Project Leader"); resp.setRole(role); ContactType contact = new ContactType(); AddressType addr = new AddressType(); addr.getElectronicMailAddress().add("[email protected]"); addr.setCountry("Germany"); addr.setCity("Bremen"); addr.setPostalCode("28717"); contact.setAddress(addr); resp.setContactInfo(contact); prov.setServiceContact(resp); output.setServiceProvider(prov); } /** * Builds the output node "Operations Metadata" * @throws java.sql.SQLException */ private void buildField3() throws SQLException { OperationsMetadata opmeta = new OperationsMetadata(); Operation op1 = new Operation(); op1.setName("GetCapabilities"); DomainType postE = new DomainType(); postE.setName("PostEncoding"); AllowedValues val1 = new AllowedValues(); ValueType valX = new ValueType(); valX.setValue("XML"); val1.getValueOrRange().add(valX); postE.setAllowedValues(val1); op1.getConstraint().add(postE); DomainType store = new DomainType(); store.setName("store"); AllowedValues val2 = new AllowedValues(); ValueType v = new ValueType(); v.setValue("false"); val2.getValueOrRange().add(v); store.setAllowedValues(val2); op1.getParameter().add(store); DCP dcp = new DCP(); HTTP http = new HTTP(); RequestMethodType post = new RequestMethodType(); post.setType("simple"); http.getGetOrPost().add(new JAXBElement<RequestMethodType>( new QName("http://www.opengis.net/wcs/1.1/ows", "Post", XMLConstants.DEFAULT_NS_PREFIX), RequestMethodType.class, post)); dcp.setHTTP(http); op1.getDCP().add(dcp); DomainType paramOnlyXml = new DomainType(); paramOnlyXml.setName("Format"); AllowedValues vals = new AllowedValues(); ValueType val = new ValueType(); val.setValue("text/xml"); vals.getValueOrRange().add(val); paramOnlyXml.setAllowedValues(vals); op1.getParameter().add(paramOnlyXml); opmeta.getOperation().add(op1); Operation op2 = new Operation(); op2.setName("GetCoverage"); op2.getConstraint().add(postE); // POST Encoding accepts only XML op2.getParameter().add(store); // Store parameter: not implemented op2.getDCP().add(dcp); // HTTP request URL op2.getConstraint().add(paramOnlyXml); opmeta.getOperation().add(op2); Operation op3 = new Operation(); op3.setName("DescribeCoverage"); op3.getConstraint().add(postE); // POST Encoding accepts only XML op3.getParameter().add(store); // Store parameter: not implemented op3.getDCP().add(dcp); // HTTP request URL op3.getConstraint().add(paramOnlyXml); opmeta.getOperation().add(op3); Operation op4 = new Operation(); op4.setName("ProcessCoverages"); op4.getConstraint().add(postE); // POST Encoding accepts only XML op4.getParameter().add(store); // Store parameter: not implemented op4.getDCP().add(dcp); // HTTP request URL op4.getConstraint().add(paramOnlyXml); opmeta.getOperation().add(op4); Operation op5 = new Operation(); op5.setName("Transaction"); op5.getConstraint().add(postE); // POST Encoding accepts only XML op5.getParameter().add(store); // Store parameter: not implemented op5.getDCP().add(dcp); // HTTP request URL op5.getConstraint().add(paramOnlyXml); opmeta.getOperation().add(op5); output.setOperationsMetadata(opmeta); } /** * Builds the output node "Contents" * @throws java.sql.SQLException */ private void buildField4() throws PetascopeException { Contents cont = new Contents(); Iterator<String> coverages = null; coverages = meta.coverages().iterator(); while (coverages.hasNext()) { Metadata metadata = null; try { metadata = meta.read(coverages.next()); } catch (Exception e) { } String covName = metadata.getCoverageName(); CoverageSummaryType sum = new CoverageSummaryType(); sum.setAbstract(metadata.getAbstract()); sum.setTitle(metadata.getTitle()); // code holds the coverage value CodeType code = new CodeType(); code.setValue(covName); // code is encapsulated in JAXBElement "jelem" JAXBElement<String> jelem = new JAXBElement<String>( new QName("http://www.opengis.net/wcs/1.1", "Identifier", XMLConstants.DEFAULT_NS_PREFIX), String.class, covName); // Insert "jelem" into this coveragesummary sum.getRest().add(jelem); // Add this CoverageSummary to the list of coverage summaries, to make up the Contents cont.getCoverageSummary().add(sum); } output.setContents(cont); } private void finishBuild() { /* WCS Standard Version ! */ output.setVersion("1.1.0"); } }

diff --git a/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetConnectionFactory.java b/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetConnectionFactory.java index d790ec9..398ec28 100644 --- a/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetConnectionFactory.java +++ b/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetConnectionFactory.java @@ -1,13 +1,13 @@ -package org.springframework.social.appdotnet.connect.temp; +package org.springframework.social.appdotnet.connect; -import org.springframework.social.appdotnet.api.impl.temp.Appdotnet; +import org.springframework.social.appdotnet.api.Appdotnet; import org.springframework.social.connect.support.OAuth2ConnectionFactory; /** * @author Arik Galansky */ public class AppdotnetConnectionFactory extends OAuth2ConnectionFactory<Appdotnet> { public AppdotnetConnectionFactory(String clientId, String clientSecret) { super("appdotnet", new AppdotnetServiceProvider(clientId, clientSecret), new AppdotnetAdapter()); } } diff --git a/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetServiceProvider.java b/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetServiceProvider.java index 37e46a7..012527c 100644 --- a/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetServiceProvider.java +++ b/src/main/java/org/springframework/social/appdotnet/connect/AppdotnetServiceProvider.java @@ -1,22 +1,22 @@ -package org.springframework.social.appdotnet.connect.temp; +package org.springframework.social.appdotnet.connect; -import org.springframework.social.appdotnet.api.impl.temp.Appdotnet; -import org.springframework.social.appdotnet.api.impl.temp.AppdotnetTemplate; +import org.springframework.social.appdotnet.api.Appdotnet; +import org.springframework.social.appdotnet.api.impl.AppdotnetTemplate; import org.springframework.social.oauth2.AbstractOAuth2ServiceProvider; import org.springframework.social.oauth2.OAuth2Template; /** * @author Arik Galansky */ public class AppdotnetServiceProvider extends AbstractOAuth2ServiceProvider<Appdotnet> { public AppdotnetServiceProvider(String clientId, String clientSecret) { super(new OAuth2Template(clientId, clientSecret, "https://alpha.app.net/oauth/authenticate", "https://alpha.app.net/oauth/access_token")); } @Override public Appdotnet getApi(String accessToken) { return new AppdotnetTemplate(accessToken); } }

diff --git a/LaTeXDraw/src/main/net/sf/latexdraw/actions/Export.java b/LaTeXDraw/src/main/net/sf/latexdraw/actions/Export.java index c286fbf9..3bcb9f55 100644 --- a/LaTeXDraw/src/main/net/sf/latexdraw/actions/Export.java +++ b/LaTeXDraw/src/main/net/sf/latexdraw/actions/Export.java @@ -1,485 +1,485 @@ package net.sf.latexdraw.actions; import java.awt.Color; import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; import java.util.Locale; import javax.imageio.IIOImage; import javax.imageio.ImageIO; import javax.imageio.ImageWriteParam; import javax.imageio.ImageWriter; import javax.imageio.plugins.bmp.BMPImageWriteParam; import javax.imageio.plugins.jpeg.JPEGImageWriteParam; import javax.imageio.stream.ImageOutputStream; import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.filechooser.FileFilter; import net.sf.latexdraw.badaboom.BadaboomCollector; import net.sf.latexdraw.filters.BMPFilter; import net.sf.latexdraw.filters.JPGFilter; import net.sf.latexdraw.filters.PDFFilter; import net.sf.latexdraw.filters.PNGFilter; import net.sf.latexdraw.filters.PSFilter; import net.sf.latexdraw.filters.TeXFilter; import net.sf.latexdraw.glib.models.interfaces.IPoint; import net.sf.latexdraw.glib.ui.ICanvas; import net.sf.latexdraw.glib.views.Java2D.interfaces.IViewShape; import net.sf.latexdraw.glib.views.latex.LaTeXGenerator; import net.sf.latexdraw.instruments.Exporter; import net.sf.latexdraw.lang.LangTool; import net.sf.latexdraw.ui.dialog.ExportDialog; import org.malai.action.Action; /** * This action allows to export a drawing in different formats. * <br> * This file is part of LaTeXDraw<br> * Copyright (c) 2005-2012 Arnaud BLOUIN<br> * <br> * LaTeXDraw is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * any later version.<br> * <br> * LaTeXDraw is distributed without any warranty; without even the * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details.<br> * <br> * @author Arnaud Blouin * @since 3.0 */ public class Export extends Action { /** * The enumeration defines the different formats managed to export drawing. * @author Arnaud Blouin */ public static enum ExportFormat { /** * The latex format. */ TEX { @Override public FileFilter getFilter() { return new TeXFilter(); } @Override public String getFileExtension() { return TeXFilter.TEX_EXTENSION; } }, /** * The PDF format. */ PDF { @Override public FileFilter getFilter() { return new PDFFilter(); } @Override public String getFileExtension() { return PDFFilter.PDF_EXTENSION; } }, /** * The latex format (using latex). */ EPS_LATEX { @Override public FileFilter getFilter() { return new PSFilter(); } @Override public String getFileExtension() { return PSFilter.PS_EXTENSION; } }, /** * The PDF format (using pdfcrop). */ PDF_CROP { @Override public FileFilter getFilter() { return new PDFFilter(); } @Override public String getFileExtension() { return PDFFilter.PDF_EXTENSION; } }, /** * The BMP format. */ BMP { @Override public FileFilter getFilter() { return new BMPFilter(); } @Override public String getFileExtension() { return BMPFilter.BMP_EXTENSION; } }, /** * The PNG format. */ PNG { @Override public FileFilter getFilter() { return new PNGFilter(); } @Override public String getFileExtension() { return PNGFilter.PNG_EXTENSION; } }, /** * The JPG format. */ JPG { @Override public FileFilter getFilter() { return new JPGFilter(); } @Override public String getFileExtension() { return JPGFilter.JPG_EXTENSION; } }; /** * @return The file filter corresponding to the format. * @since 3.0 */ public abstract FileFilter getFilter(); /** * @return The extension corresponding to the format. * @since 3.0 */ public abstract String getFileExtension(); } /** The format with which the drawing must be exported. */ protected ExportFormat format; /** The canvas that contains views. */ protected ICanvas canvas; /** Defines if the shapes have been successfully exported. */ protected boolean exported; /** The dialogue chooser used to select the targeted file. */ protected ExportDialog dialogueBox; /** * Creates the action. * @since 3.0 */ public Export() { super(); exported = false; } @Override public void flush() { super.flush(); canvas = null; format = null; dialogueBox = null; } @Override public boolean isRegisterable() { return false; } @Override protected void doActionBody() { // Showing the dialog. final int response = dialogueBox.showSaveDialog(null); File f = dialogueBox.getSelectedFile(); exported = true; // Analysing the result of the dialog. if(response != JFileChooser.APPROVE_OPTION || f==null) exported = false; else { if(f.getName().toLowerCase().indexOf(format.getFileExtension().toLowerCase()) == -1) f = new File(f.getPath() + format.getFileExtension()); if(f.exists()) { int replace = JOptionPane.showConfirmDialog(null, LangTool.INSTANCE.getStringLaTeXDrawFrame("LaTeXDrawFrame.173"), //$NON-NLS-1$ Exporter.TITLE_DIALOG_EXPORT, JOptionPane.YES_NO_OPTION); if(replace == JOptionPane.NO_OPTION) exported = false; // The user doesn't want to replace the file } } if(exported) exported = export(f); } protected boolean export(final File file) { switch(format) { case BMP: return exportAsBMP(file); case EPS_LATEX: return exportAsPS(file); case JPG: return exportAsJPG(file); case PDF: return exportAsPDF(file); case PDF_CROP: return exportAsPDF(file); case PNG: return exportAsPNG(file); case TEX: return exportAsPST(file); } return false; } @Override public boolean canDo() { return canvas!=null && format!=null && dialogueBox!=null; } @Override public boolean hadEffect() { return super.hadEffect() && exported; } /** * Exports the drawing as a PNG picture. * @param file The targeted location. * @return true if the picture was well created. */ protected boolean exportAsPNG(final File file) { final RenderedImage rendImage = createRenderedImage(); try { ImageIO.write(rendImage, "png", file); //$NON-NLS-1$ return true; } catch(IOException e) { BadaboomCollector.INSTANCE.add(e); } return false; } /** * Exports the drawing as a JPG picture. * @param file The targeted location. * @return true if the picture was well created. */ protected boolean exportAsJPG(final File file) { final RenderedImage rendImage = createRenderedImage(); try { final ImageWriteParam iwparam = new JPEGImageWriteParam(Locale.getDefault()); final ImageWriter iw = ImageIO.getImageWritersByFormatName("jpg").next();//$NON-NLS-1$ try(final ImageOutputStream ios = ImageIO.createImageOutputStream(file);){ iwparam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); iwparam.setCompressionQuality(dialogueBox.getCompressionRate()/100f); iw.setOutput(ios); iw.write(null, new IIOImage(rendImage, null, null), iwparam); iw.dispose(); return true; } } catch(IOException e) { BadaboomCollector.INSTANCE.add(e); } return false; } /** * Creates a ps document of the given views (compiled using latex). * @param file The targeted location. * @return True: the file has been created. * @since 3.0 */ protected boolean exportAsPS(final File file) { File psFile; try{ psFile = LaTeXGenerator.createPSFile(canvas.getDrawing(), file.getAbsolutePath(), canvas); } catch(final Exception e) { BadaboomCollector.INSTANCE.add(e); psFile = null; } return psFile!=null && psFile.exists(); } /** * Creates a pdf document of the given views (compiled using latex). * @param file The targeted location. * @return True: the file has been created. * @since 3.0 */ protected boolean exportAsPDF(final File file) { File pdfFile; try{ - pdfFile = LaTeXGenerator.createPDFFile(canvas.getDrawing(), file.getAbsolutePath(), canvas, format==ExportFormat.PDF); + pdfFile = LaTeXGenerator.createPDFFile(canvas.getDrawing(), file.getAbsolutePath(), canvas, format==ExportFormat.PDF_CROP); } catch(final Exception e) { BadaboomCollector.INSTANCE.add(e); pdfFile = null; } return pdfFile!=null && pdfFile.exists(); } /** * Exports the drawing as a PST document. * @param file The targeted location. * @return true if the PST document was been successfully created. */ protected boolean exportAsPST(final File file) { boolean ok; try { try(final FileWriter fw = new FileWriter(file); final BufferedWriter bw = new BufferedWriter(fw); final PrintWriter out = new PrintWriter(bw);) { out.println(LaTeXGenerator.getLatexDocument(canvas.getDrawing(), canvas)); ok = true; } } catch(final IOException e) { BadaboomCollector.INSTANCE.add(e); ok = false; } return ok; } /** * Exports the drawing as a BMP picture. * @param file The targeted location. * @return true if the picture was successfully created. */ protected boolean exportAsBMP(final File file){ final RenderedImage rendImage = createRenderedImage(); try { final ImageWriteParam iwparam = new BMPImageWriteParam(); final ImageWriter iw = ImageIO.getImageWritersByFormatName("bmp").next();//$NON-NLS-1$ try(final ImageOutputStream ios = ImageIO.createImageOutputStream(file);) { iwparam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); iw.setOutput(ios); iw.write(null, new IIOImage(rendImage, null, null), iwparam); iw.dispose(); return true; } } catch(final IOException e) { BadaboomCollector.INSTANCE.add(e); } return false; } /** * @return A buffered image that contains given views (not null). * @since 3.0 */ protected BufferedImage createRenderedImage() { final IPoint tr = canvas.getTopRightDrawingPoint(); final IPoint bl = canvas.getBottomLeftDrawingPoint(); final double dec = 5.; BufferedImage bi = new BufferedImage((int)(tr.getX()+dec), (int)(bl.getY()+dec), BufferedImage.TYPE_INT_RGB); Graphics2D graphic = bi.createGraphics(); final double height = bl.getY()-tr.getY(); final double width = tr.getX()-bl.getX(); graphic.setColor(Color.WHITE); graphic.fillRect(0, 0, (int)(tr.getX()+dec), (int)(bl.getY()+dec)); for(IViewShape view : canvas.getViews()) view.paint(graphic); // To delete the empty whitespace, we do a translation to // the North-West point of the drawing (dec: to avoid to cut // the start of some figures, we let a few white space around the drawing. AffineTransform aff = new AffineTransform(); aff.translate(-bl.getX()+dec, -tr.getY()+dec); BufferedImage bufferImage2 = new BufferedImage((int)(width+dec), (int)(height+dec), BufferedImage.TYPE_INT_RGB); Graphics2D graphic2 = bufferImage2.createGraphics(); graphic2.setColor(Color.WHITE); graphic2.fillRect(0, 0, (int)(width+dec), (int)(height+dec)); graphic2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); graphic2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); graphic2.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); graphic2.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); graphic2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); // We draw the new picture graphic2.drawImage(bi, aff, null); graphic.dispose(); graphic2.dispose(); bi.flush(); return bufferImage2; } /** * @param dialogueBox The file chooser to set. * @since 3.0 */ public void setDialogueBox(final ExportDialog dialogueBox) { this.dialogueBox = dialogueBox; } /** * @param format The format to set. * @since 3.0 */ public void setFormat(final ExportFormat format) { this.format = format; } /** * @param canvas The canvas to set. * @since 3.0 */ public void setCanvas(final ICanvas canvas) { this.canvas = canvas; } }

diff --git a/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/ExtensionRegistry.java b/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/ExtensionRegistry.java index 2656f5e3..1d86faeb 100644 --- a/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/ExtensionRegistry.java +++ b/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/ExtensionRegistry.java @@ -1,80 +1,80 @@ /* * Copyright (c) 2006-2011 Nuxeo SA (http://nuxeo.com/) and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * bstefanescu */ package org.nuxeo.runtime.model; import java.util.LinkedList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * A registry of extensions. Designed as a base class for registries that * supports extension merge. The registry keeps track of registered extensions * to be able to remove them without breaking the merges. The implementation is * still required to do the actual merge of two contributions when needed. * * @param <T> - the type of contribution managed by this registry - * * @author <a href="mailto:[email protected]">Bogdan Stefanescu</a> - * + * @deprecated since 5.5: extend {@link ContributionFragmentRegistry} instead */ +@Deprecated public abstract class ExtensionRegistry<T> { private static final Log log = LogFactory.getLog(ExtensionRegistry.class); protected LinkedList<Extension> extensions = new LinkedList<Extension>(); @SuppressWarnings("unchecked") public void registerExtension(Extension extension) { Object[] contribs = extension.getContributions(); if (contribs == null) { return; } extensions.add(extension); for (Object contrib : contribs) { addContribution((T) contrib, extension); } } @SuppressWarnings("unchecked") public void unregisterExtension(Extension extension) { if (extensions.remove(extension)) { removeContributions(); for (Extension xt : extensions) { Object[] contribs = xt.getContributions(); if (contribs == null) { continue; } for (Object contrib : contribs) { addContribution((T) contrib, xt); } } } else { log.warn("Trying to unregister a not registered extension: " + extension); } } public void dispose() { extensions = null; } public abstract void addContribution(T contrib, Extension extension); /** * Remove all registered contributions. This method will be called by - * unregisterExtension to reset the registry so that remaining contributions - * are registered again + * unregisterExtension to reset the registry so that remaining + * contributions are registered again */ public abstract void removeContributions(); }