From 01bfe0bd23f92625e4b52710c1460f64f3a270b6 Mon Sep 17 00:00:00 2001 From: HuabingZhao Date: Tue, 20 Sep 2016 13:59:27 +0800 Subject: Now we have pulled the winery source codes from github and publish the winery binary to OPEN-O third party Nexus repository. So we don't use winery code in the OPEN-O git repo anymore. Issue id: OCS-55 Change-Id: I76fdfb17b1c90377a44c2d47f81b5698d5a220d3 Signed-off-by: HuabingZhao --- .../src/main/webapp/WEB-INF/tags/about.tag | 65 ---- .../webapp/WEB-INF/tags/addComponentInstance.tag | 147 --------- .../src/main/webapp/WEB-INF/tags/colorwheel.tag | 36 --- .../main/webapp/WEB-INF/tags/componentinstance.tag | 163 ---------- .../WEB-INF/tags/componentinstancewithName.tag | 33 -- ...entinstancewithNameDerivedFromAbstractFinal.tag | 45 --- .../webapp/WEB-INF/tags/constraints/constraint.tag | 83 ----- .../main/webapp/WEB-INF/tags/entitytemplate.tag | 43 --- .../src/main/webapp/WEB-INF/tags/entitytype.tag | 49 --- .../nodetypes/reqandcapdefs/reqandcapdefs.tag | 334 -------------------- .../src/main/webapp/WEB-INF/tags/genericpage.tag | 349 --------------------- .../src/main/webapp/WEB-INF/tags/imageUpload.tag | 42 --- .../main/webapp/WEB-INF/tags/namespaceChooser.tag | 52 --- .../WEB-INF/tags/parameters/parametersHTML.tag | 38 --- .../WEB-INF/tags/parameters/parametersInput.tag | 20 -- .../WEB-INF/tags/parameters/parametersJS.tag | 177 ----------- .../WEB-INF/tags/parameters/parametersOutput.tag | 20 -- .../validnodetypeendingsselect.tag | 43 --- .../boundarydefinitions/browseForReqOrCap.tag | 161 ---------- .../browseForServiceTemplatePropertyReqOrCap.tag | 166 ---------- .../boundarydefinitions/browseForX.tag | 49 --- .../webapp/WEB-INF/tags/simpleSingleFileUpload.tag | 114 ------- .../src/main/webapp/WEB-INF/tags/submenu.tag | 26 -- .../WEB-INF/tags/topologyTemplateRenderer.tag | 208 ------------ .../WEB-INF/tags/typeswithshortnameasselect.tag | 46 --- 25 files changed, 2509 deletions(-) delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/about.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/addComponentInstance.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/colorwheel.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstance.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithName.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithNameDerivedFromAbstractFinal.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/constraints/constraint.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytemplate.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytype.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytypes/nodetypes/reqandcapdefs/reqandcapdefs.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/genericpage.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/imageUpload.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/namespaceChooser.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersHTML.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersInput.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersJS.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersOutput.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/relationshiptype/validnodetypeendingsselect.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForReqOrCap.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForServiceTemplatePropertyReqOrCap.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForX.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/simpleSingleFileUpload.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/submenu.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/topologyTemplateRenderer.tag delete mode 100644 winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/typeswithshortnameasselect.tag (limited to 'winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags') diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/about.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/about.tag deleted file mode 100644 index 351bd0f..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/about.tag +++ /dev/null @@ -1,65 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> - -<%@tag description="About for the repository" pageEncoding="UTF-8"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> -<%@taglib prefix="w" uri="http://www.eclipse.org/winery/repository/functions"%> - - - - \ No newline at end of file diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/addComponentInstance.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/addComponentInstance.tag deleted file mode 100644 index a82901a..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/addComponentInstance.tag +++ /dev/null @@ -1,147 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="used by genericcomponentpage.jsp and by implementations.jsp to create a component instance" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> -<%@taglib prefix="w" uri="http://www.eclipse.org/winery/repository/functions"%> -<%-- -function createResource(nameOfResource, fields, url, onSuccess) cannot be used as this method is more diverse ---%> - -<%@attribute name="label" required="true" description="The lable to display"%> - -<%@attribute name="URL" description=""%> -<%@attribute name="onSuccess" description=""%> -<%@attribute name="type" description="added to dataToSend when doing a POST"%> -<%@attribute name="typeSelectorData" type="java.util.Collection" description="All available types when creating a template. We do not support types with names (additional to the id) as the current TOSCA specification does not foresee the usage of both name and id at types"%> -<%@attribute name="openinnewwindow" description="if true, the editor for the created component instance is openend in a new window"%> - - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/colorwheel.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/colorwheel.tag deleted file mode 100644 index 1b7fede..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/colorwheel.tag +++ /dev/null @@ -1,36 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="displays a color wheel" pageEncoding="UTF-8"%> - -<%@attribute name="id" required="true" description="id of the div to initialize"%> -<%@attribute name="url" required="true" description="URL to put to"%> -<%@attribute name="color" required="true" description="the initial color"%> -<%@attribute name="label" required="true" description="the label"%> - -
- -
-
-
- -

Enter the hex value above

- -
-
-
- - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstance.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstance.tag deleted file mode 100644 index c5c2b4f..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstance.tag +++ /dev/null @@ -1,163 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013, 2015 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Wrapper for resources, which are backed by definitions and thus offer an XML div" pageEncoding="UTF-8"%> - -<%-- - quick hack to avoid specifying windowtitle at elements having it.name, too. - TODO: check why in this class a check on it.name is done, although there is componentinstancewithname.tag ---%> -<%@attribute name="windowtitle" description="If it.name is not available, this parameter should be given"%> - -<%@attribute name="selected" required="true"%> - -<%@attribute name="cssClass" required="true"%> - -<%@attribute name="image" required="false"%> - -<%@attribute name="libs" fragment="true" %> - -<%@attribute name="subMenus" required="false" type="java.util.List" description="list of SubMenuData objects stating the content of the submenus. The first submenu is used as default page. Subpage #xml must not be included, it is added automatically."%> - -<%@attribute name="implementationFor" description="In case the component instance is an implementation for another type, the link (a href) to the type is put here"%> - -<%@attribute name="type" description="In case the component instance is a template, the link (a href) to the type is put here"%> - -<%@attribute name="twolines" required="false" description="if set, two lines are required for the tabs"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="w" uri="http://www.eclipse.org/winery/repository/functions" %> -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - - - - - - - -
twolines"> - - - - - <%-- Quick hack to enable usage of this tag at adminresource --%> - - - <%@ include file="/jsp/componentnaming.jspf" %> -
-
- - XML - CSAR - - - -
- -
- Implementation for ${implementationFor} -
- - -
- Type ${type} -
- -
- -
- - - - - - - - <%-- Quick hack to enable usage of this tag at adminresource --%> - - - - - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithName.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithName.tag deleted file mode 100644 index f970b99..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithName.tag +++ /dev/null @@ -1,33 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag import="org.eclipse.winery.repository.resources.SubMenuData"%> -<%@tag description="Wrapper for component instances with a name. Name is also used for window title." pageEncoding="UTF-8"%> - -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - -<%@tag import="java.util.ArrayList"%> - - -<%@attribute name="selected" required="true"%> -<%@attribute name="cssClass" required="true"%> -<%@attribute name="image" required="false"%> -<%@attribute name="libs" fragment="true" %> -<%@attribute name="implementationFor" %> -<%@attribute name="twolines" required="false" description="if set, two lines are required for the tabs"%> -<%@attribute name="type" description="In case the component instance is a template, the link (a href) to the type is put here"%> - -<%@attribute name="subMenus" required="false" type="java.util.List" %> - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithNameDerivedFromAbstractFinal.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithNameDerivedFromAbstractFinal.tag deleted file mode 100644 index a8ea212..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/componentinstancewithNameDerivedFromAbstractFinal.tag +++ /dev/null @@ -1,45 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag import="org.eclipse.winery.repository.resources.SubMenuData"%> -<%@tag description="Wrapper for component instances with name, derived from, abstract, final (equivalent to AbstractComponentInstanceWithName..." pageEncoding="UTF-8"%> - -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - -<%@tag import="java.util.ArrayList"%> - - -<%@attribute name="selected" required="true"%> -<%@attribute name="cssClass" required="true"%> -<%@attribute name="image" required="false"%> -<%@attribute name="libs" fragment="true" %> -<%@attribute name="implementationFor" %> -<%@attribute name="twolines" required="false" description="if set, two lines are required for the tabs"%> - -<%@attribute name="subMenus" required="false" type="java.util.List" description="list of SubMenuData objects stating the content of the submenus. The first submenu is used as default page. Subpage #xml must not be included, it is added automatically."%> - - -<% - -if (subMenus == null) { - subMenus = new ArrayList(1); -} - -SubMenuData data; - -data = new SubMenuData("#inheritance", "Inheritance"); -subMenus.add(data); -%> - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/constraints/constraint.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/constraints/constraint.tag deleted file mode 100644 index 30607b6..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/constraints/constraint.tag +++ /dev/null @@ -1,83 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2014 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Models editing a single constraint" pageEncoding="UTF-8"%> - -<%@taglib prefix="o" tagdir="/WEB-INF/tags/common/orioneditor"%> -<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> - - - - -<%-- -Quick hack to get the representation of an empty constraint -TODO: A resource should provide the empty representation (?!) - -The alternative is not to use the complete XML as the specification only allows the content of the XML wrapper to be modified. -If we use that method, this textarea is not required, but the sending of an existing constraint has to be modified to send only lines 2 to n-1, i.e., send without the wrapping lines. -This is not possible if the stored constraint is empty, then there are 2 lines only. ---%> - - - \ No newline at end of file diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytemplate.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytemplate.tag deleted file mode 100644 index 781e2d8..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytemplate.tag +++ /dev/null @@ -1,43 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Wrapper for instances of entity types" pageEncoding="UTF-8"%> - -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - -<%@tag import="java.util.ArrayList"%> -<%@tag import="org.eclipse.winery.repository.resources.SubMenuData"%> - - -<%@attribute name="selected" required="true"%> -<%@attribute name="cssClass" required="true"%> -<%@attribute name="image" required="false"%> -<%@attribute name="libs" fragment="true" %> - -<%@attribute name="subMenus" required="false" type="java.util.List" description="list of SubMenuData objects stating the content of the submenus. The first submenu is used as default page. Subpage #xml must not be included, it is added automatically."%> - - -<% - -if (subMenus == null) { - subMenus = new ArrayList(2); -} - -SubMenuData data; - -data = new SubMenuData("#properties", "Properties"); -subMenus.add(data); -%> - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytype.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytype.tag deleted file mode 100644 index 6bd1d3d..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytype.tag +++ /dev/null @@ -1,49 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Wrapper for instances of entity types" pageEncoding="UTF-8"%> - -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - -<%@tag import="java.util.ArrayList"%> -<%@tag import="org.eclipse.winery.repository.resources.SubMenuData"%> - - -<%@attribute name="selected" required="true"%> -<%@attribute name="cssClass" required="true"%> -<%@attribute name="image" required="false"%> -<%@attribute name="twolines" required="false" description="if set, two lines are required for the tabs"%> -<%@attribute name="libs" fragment="true" %> - -<%@attribute name="subMenus" required="false" type="java.util.List" description="list of SubMenuData objects stating the content of the submenus. The first submenu is used as default page. Subpage #xml must not be included, it is added automatically."%> - - -<% - -if (subMenus == null) { - subMenus = new ArrayList(2); -} - -SubMenuData data; - -data = new SubMenuData("#propertiesdefinition", "Properties Definition"); -subMenus.add(data); - -// Tags are currently not implemented -> Don't confuse users by showing the tab -// has to be enabled again, when tags are implemented -//data = new SubMenuData("#tags", "Tags"); -//subMenus.add(data); -%> - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytypes/nodetypes/reqandcapdefs/reqandcapdefs.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytypes/nodetypes/reqandcapdefs/reqandcapdefs.tag deleted file mode 100644 index 3748bd6..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/entitytypes/nodetypes/reqandcapdefs/reqandcapdefs.tag +++ /dev/null @@ -1,334 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2014 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - * Yves Schubert - switch to bootstrap 3, integration with spinnerwithinphty - *******************************************************************************/ ---%> -<%@tag description="Models Requirement and Capability Definitions" pageEncoding="UTF-8"%> - -<%@attribute name="labelForSingleItem" required="true" %> -<%@attribute name="url" required="true"%> -<%@attribute name="allSubResources" required="true" type="java.util.List" description="All available req-/cap-defs" %> -<%@attribute name="allTypes" required="true" type="java.util.Collection" description="All available types of req-/cap-def" %> -<%@attribute name="typeClass" required="true" type="java.lang.Class" description="The class of the type" %> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="ct" tagdir="/WEB-INF/tags/common" %> -<%@taglib prefix="con" tagdir="/WEB-INF/tags/constraints" %> -<%@taglib prefix="o" tagdir="/WEB-INF/tags/common/orioneditor"%> -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> -<%@taglib prefix="w" uri="http://www.eclipse.org/winery/repository/functions"%> -<%@taglib prefix="wc" uri="http://www.eclipse.org/winery/functions"%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
nametypelower boundupper boundconstraints
${r.def.name}${wc:qname2href(pageContext.request.contextPath, typeClass, r.type)}${w:renderMinInstances(r.def.lowerBound)}${w:renderMaxInstances(r.def.upperBound)}
- -<%-- Editing a set of constraints --%> - - - - - - -<%-- Editing a single constraint --%> - - - - - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/genericpage.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/genericpage.tag deleted file mode 100644 index 7063697..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/genericpage.tag +++ /dev/null @@ -1,349 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - * Yves Schubert - switch to bootstrap 3 - *******************************************************************************/ ---%> -<%@tag description="Global Wrapper" pageEncoding="UTF-8"%> - -<%@attribute name="windowtitle" required="true" description="String to be used as window title"%> -<%@attribute name="selected" required="true"%> -<%@attribute name="cssClass" required="true"%> - -<%@attribute name="libs" fragment="true" %> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="ct" tagdir="/WEB-INF/tags/common"%> -<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> -<%@taglib prefix="w" uri="http://www.eclipse.org/winery/repository/functions"%> - -<%@tag import="org.eclipse.winery.repository.Prefs" %> - - - - - - ${windowtitle} - - - - - - - <%-- CSS to style the file input field as button and adjust the Bootstrap progress bars --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -
- -
-
- - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/imageUpload.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/imageUpload.tag deleted file mode 100644 index 6ef5d18..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/imageUpload.tag +++ /dev/null @@ -1,42 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="form div to upload an icon" pageEncoding="UTF-8"%> - -<%@attribute name="label" required="true" description="LAbel to be used. Also used as title of the dialog"%> -<%@attribute name="URL" required="true" description="URL to post to"%> -<%@attribute name="id" required="true" description="id to form basis for ...Diag: id of diag; ...Form: id of input field used for file upload; ...Img: Image to refresh"%> -<%@attribute name="accept" description="if not null/'': list of accepted MIME file types"%> -<%@attribute name="width" required="true" description="Width of the image to display"%> -<%@attribute name="resize" description="if not null/'': enables image resizing. Currently not supported"%> - -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - - - -
- -
-
- n/a -
- or drop the image in this area. -
-
diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/namespaceChooser.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/namespaceChooser.tag deleted file mode 100644 index 56b0712..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/namespaceChooser.tag +++ /dev/null @@ -1,52 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="places a bootstrap form control to chooose a namespace. A new namespace can be created" pageEncoding="UTF-8"%> - - - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -<%@attribute name="allNamespaces" required="true" type="java.util.Collection" description="All known namespaces"%> -<%@attribute name="idOfInput" required="true" description="The id if the input field storing the namespace. Also used as name"%> -<%@attribute name="nameOfInput" required="false" description="The name if the input field storing the namespace. If not provided, ifOfInput is used"%> -<%@attribute name="selected" description="The currently selected namespace (optional)"%> - - - - -
- - -
- - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersHTML.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersHTML.tag deleted file mode 100644 index 7474851..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersHTML.tag +++ /dev/null @@ -1,38 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Input or Output parameters" pageEncoding="UTF-8"%> - -<%@attribute name="label" required="true" %> -<%@attribute name="inOrOut" required="true" %> -<%@attribute name="tableId" required="true" %> -<%@attribute name="baseURL" required="true" description="JavaScript expression for determining the baseURL"%> - -
-
- - - -
- - - - - - - - - - -
NameTypeRequired
-
diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersInput.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersInput.tag deleted file mode 100644 index 73b8c1b..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersInput.tag +++ /dev/null @@ -1,20 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag pageEncoding="UTF-8"%> - -<%@attribute name="baseURL" required="true" description="JavaScript expression for determining the baseURL"%> - -<%@ taglib prefix="p" tagdir="/WEB-INF/tags/parameters" %> - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersJS.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersJS.tag deleted file mode 100644 index 021c8c0..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersJS.tag +++ /dev/null @@ -1,177 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013,2015 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Input and Output parameters handling. Used at interface/operation and plan" pageEncoding="UTF-8"%> - -<%@attribute name="afterLoad" description="JavaScript code to be executed after successfully loading/initialization"%> - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersOutput.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersOutput.tag deleted file mode 100644 index 32a5565..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/parameters/parametersOutput.tag +++ /dev/null @@ -1,20 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag pageEncoding="UTF-8"%> - -<%@attribute name="baseURL" required="true" description="JavaScript expression for determining the baseURL"%> - -<%@ taglib prefix="p" tagdir="/WEB-INF/tags/parameters" %> - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/relationshiptype/validnodetypeendingsselect.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/relationshiptype/validnodetypeendingsselect.tag deleted file mode 100644 index 1e0702d..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/relationshiptype/validnodetypeendingsselect.tag +++ /dev/null @@ -1,43 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Offers choice for valid endings" pageEncoding="UTF-8"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - -<%@attribute name="shortName" required="true" description="source|target"%> -<%@attribute name="currentSelection" required="false"%> -<%@attribute name="possibleValidEndings" type="java.util.Collection" %> - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForReqOrCap.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForReqOrCap.tag deleted file mode 100644 index 5195f9b..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForReqOrCap.tag +++ /dev/null @@ -1,161 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2014 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> - -<%@tag pageEncoding="UTF-8"%> - -<%@attribute name="label" description="Requirement|Capability" required="true" %> -<%@attribute name="requirementsOrCapabilities" description="requirements|capabilities" required="true" %> -<%@attribute name="reqOrCap" description="requirement|capability" required="true" %> - -<%@taglib prefix="b" tagdir="/WEB-INF/tags/servicetemplates/boundarydefinitions"%> - - - - - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForServiceTemplatePropertyReqOrCap.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForServiceTemplatePropertyReqOrCap.tag deleted file mode 100644 index 430d4db..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForServiceTemplatePropertyReqOrCap.tag +++ /dev/null @@ -1,166 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2013-2014 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> - -<%@tag pageEncoding="UTF-8"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="bd" tagdir="/WEB-INF/tags/servicetemplates/boundarydefinitions" %> - -<%@attribute name="definedPropertiesAsJSONString" required="true" %> - - - -<%-- Browse for property --%> -<%-- -The following cannot be used as we return TWO things: the template and the property - ---%> - - - - - - \ No newline at end of file diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForX.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForX.tag deleted file mode 100644 index 4b38b62..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/servicetemplates/boundarydefinitions/browseForX.tag +++ /dev/null @@ -1,49 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2014 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> - -<%@tag pageEncoding="UTF-8"%> - -<%@attribute name="XShort" description="The X to browse for. Short form. E.g., Req, Cap, ..." required="true" %> -<%@attribute name="XLong" description="The X to browse for. Long form. E.g., Requirement, Capability, ..." required="true" %> - - -<%-- Browse for property --%> - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/simpleSingleFileUpload.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/simpleSingleFileUpload.tag deleted file mode 100644 index 9774ba3..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/simpleSingleFileUpload.tag +++ /dev/null @@ -1,114 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - * Yves Schubert - switch to bootstrap 3 - *******************************************************************************/ ---%> -<%@tag description="Global Wrapper" pageEncoding="UTF-8"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - -<%@attribute name="title" required="true" description="title of the dialog"%> -<%@attribute name="text" required="true" description="text to show before upload box"%> -<%@attribute name="URL" required="true" description="URL to post to"%> -<%@attribute name="type" required="true" description="PUT|POST"%> -<%@attribute name="additionalDropZone" required="false" description="jQuery selector for an additional dropzone"%> -<%@attribute name="id" required="true" description="id to form basis for ...Diag: id of diag; ...Form: id of input field used for file upload; ...Img: Image to refresh"%> -<%@attribute name="accept" description="if not null/'': list of accepted MIME file types"%> -<%@attribute name="resize" description="if not null/'': enables image resizing. Currently not supported"%> - - - - diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/submenu.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/submenu.tag deleted file mode 100644 index 0e6a320..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/submenu.tag +++ /dev/null @@ -1,26 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> - -<%@tag description="submenu" pageEncoding="UTF-8"%> - -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -<%@attribute name="subMenuData" required="true" type="org.eclipse.winery.repository.resources.SubMenuData"%> -<%@attribute name="selected" required="true"%> - - selected"> -
-
${subMenuData.text}
-
- diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/topologyTemplateRenderer.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/topologyTemplateRenderer.tag deleted file mode 100644 index 5f0aaa4..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/topologyTemplateRenderer.tag +++ /dev/null @@ -1,208 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2013 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Pascal Hirmer - skeletton for topology rendering - * Oliver Kopp - converted to .tag and integrated in the repository - *******************************************************************************/ ---%> -<%@tag description="Renders a toplogytemplate. This tag is used to render a topology template readonly. The topoology modeler does the rendering on itself." pageEncoding="UTF-8" %> - -<%@tag import="java.lang.Math"%> -<%@tag import="java.util.ArrayList"%> -<%@tag import="java.util.Collection"%> -<%@tag import="java.util.Map"%> -<%@tag import="java.util.HashMap"%> -<%@tag import="java.util.UUID"%> -<%@tag import="javax.xml.namespace.QName"%> -<%@tag import="org.eclipse.winery.common.ModelUtilities"%> -<%@tag import="org.eclipse.winery.model.tosca.TEntityTemplate"%> -<%@tag import="org.eclipse.winery.model.tosca.TNodeTemplate"%> -<%@tag import="org.eclipse.winery.model.tosca.TNodeType"%> -<%@tag import="org.eclipse.winery.model.tosca.TRelationshipTemplate"%> -<%@tag import="org.eclipse.winery.model.tosca.TRelationshipTemplate.SourceElement"%> -<%@tag import="org.eclipse.winery.model.tosca.TRelationshipTemplate.TargetElement"%> -<%@tag import="org.eclipse.winery.model.tosca.TRelationshipType"%> -<%@tag import="org.eclipse.winery.model.tosca.TTopologyTemplate"%> -<%@tag import="org.eclipse.winery.repository.Utils"%> - -<%@attribute name="topology" required="true" description="the topology template to be rendered" type="org.eclipse.winery.model.tosca.TTopologyTemplate" %> -<%@attribute name="repositoryURL" required="true" %> -<%@attribute name="client" required="true" type="org.eclipse.winery.common.interfaces.IWineryRepository" %> -<%@attribute name="fullscreen" required="false" type="java.lang.Boolean" %> -<%@attribute name="additonalCSS" required="false"%> -<%@attribute name="autoLayoutOnLoad" required="false" type="java.lang.Boolean" %> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="tmpl" tagdir="/WEB-INF/tags/common/templates" %> -<%@taglib prefix="nt" tagdir="/WEB-INF/tags/common/templates/nodetemplates" %> -<%@taglib prefix="w" uri="http://www.eclipse.org/winery/repository/functions"%> - -<%-- required for vShowError --%> - - - -<%-- required for vShowError --%> - - - -<%-- winery-common.css also contains definitions for properties --%> - - - - - - -<% - Collection relationshipTypes = client.getAllTypes(TRelationshipType.class); - - // quick hack - // better would be to collect all types used in the curren topoloy template - Collection nodeTypes = client.getAllTypes(TNodeType.class); -%> - - - - - -<% - // used for the position of the NodeTemplates - int topCounter = 0; -%> - -
-
- - -
-
-<%-- div #editorArea required for layouter --%> -
-
- - - -<% - // can be used later to call a doLayout() - boolean somethingWithoutPosition = false; - - Collection relationshipTemplates = new ArrayList(); - Collection nodeTemplates = new ArrayList(); - - // the minimum x/y coordinates. - // used to move the content to the top left corner - int minTop = Integer.MAX_VALUE; - int minLeft = Integer.MAX_VALUE; - - for (TEntityTemplate entity: topology.getNodeTemplateOrRelationshipTemplate()) { - if (entity instanceof TNodeTemplate) { - TNodeTemplate nodeTemplate = (TNodeTemplate) entity; - nodeTemplates.add(nodeTemplate); - - // determine minTop and minLeft - String top = ModelUtilities.getTop(nodeTemplate); - if (top != null) { - int intTop = Utils.convertStringToInt(top); - if (intTop != 0) { - minTop = Math.min(minTop, intTop); - } - } - - String left = ModelUtilities.getLeft(nodeTemplate); - if (left != null) { - int intLeft = Utils.convertStringToInt(left); - if (intLeft != 0) { - minLeft = Math.min(minLeft, intLeft); - } - } - - } else { - assert(entity instanceof TRelationshipTemplate); - relationshipTemplates.add((TRelationshipTemplate) entity); - } - } - - for (TNodeTemplate nodeTemplate: nodeTemplates) { - // assuming the topology can be displayed as a stack, else call doLayout() afterwards - topCounter = topCounter + 150; - - String left = ModelUtilities.getLeft(nodeTemplate); - if (left == null) { - left = "0"; - somethingWithoutPosition = true; - } else { - // calulate offset - // we could hash the coordinate in the loop before - // but that would obfuscate the code and currently, we don't have speed issues here - left = Integer.toString(Utils.convertStringToInt(left) - minLeft); - } - String top = ModelUtilities.getTop(nodeTemplate); - if (top == null) { - top = Integer.toString(topCounter); - somethingWithoutPosition = true; - } else { - // calulate offset - top = Integer.toString(Utils.convertStringToInt(top) - minTop); - } -%> - -<% - } - if (somethingWithoutPosition) { - autoLayoutOnLoad = true; - } -%> - - - -
-
diff --git a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/typeswithshortnameasselect.tag b/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/typeswithshortnameasselect.tag deleted file mode 100644 index f658b2b..0000000 --- a/winery/org.eclipse.winery.repository/src/main/webapp/WEB-INF/tags/typeswithshortnameasselect.tag +++ /dev/null @@ -1,46 +0,0 @@ -<%-- -/******************************************************************************* - * Copyright (c) 2012-2014 University of Stuttgart. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * Oliver Kopp - initial API and implementation and/or initial documentation - *******************************************************************************/ ---%> -<%@tag description="Renders pairs of types with shortname as select element" pageEncoding="UTF-8"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -<%@attribute name="label" required="true"%> -<%@attribute name="selectname" required="true" description="Used as Name and as Id"%> -<%@attribute name="typesWithShortNames" required="true" type="java.util.Collection"%> -<%@attribute name="type" required="true" description="The type of all types. E.g., planlanguage"%> - -
- - -
- - - Manage -
-
- - -- cgit 1.2.3-korg