JBoss Tools SVN: r43707 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:12:57 -0400 (Fri, 14 Sep 2012)
New Revision: 43707
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
add methods for regenCompositeMetadata, getSubDirsCount so we can produce current metadata in the folder
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:12:50 UTC (rev 43706)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:12:57 UTC (rev 43707)
@@ -1,6 +1,6 @@
#!/bin/sh
# This script is run here: http://hudson.qa.jboss.com/hudson/job/jbosstools-cleanup/configure
-# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse....
+# And archived here: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst...
# --------------------------------------------------------------------------------
# clean JBT builds from sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/builds/nightly
@@ -85,13 +85,48 @@
echo "+ $sd/$dd (${day}d)" | tee -a $log
fi
done
+ getSubDirs $sd 1; #return #getSubDirsReturn
+ getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
+ regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository compositeContent.xml
+ regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository compositeArtifacts.xml
+
done
echo "" | tee -a $log
}
+
+getSubDirCount ()
+{
+ # need count of children
+ for ssd in $subsubdirs; do
+ let getSubDirsCountReturn=getSubDirsCountReturn+1;
+ done
+}
+
+#regen metadata for remaining subdirs in this folder
+regenCompositeMetadata ()
+{
+ subsubdirs=$1
+ countChildren=$2
+ fileType=$3
+ fileName=$4
+ now=$(date +%s000)
+
+ echo "<?xml version='1.0' encoding='UTF-8'?><?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Builds - ${type}' type='${fileType}' version='1.0.0'>
+<properties size='2'><property name='p2.timestamp' value='${now}'/><property name='p2.compressed' value='true'/></properties>
+<children size='${countChildren}'>" > ${fileName}
+ for ssd in $subsubdirs; do
+ echo "<child location='${ssd}/all/repo/'/>" >> ${fileName}
+ done
+echo "
+</children>
+</repository>
+" >> ${fileName}
+}
+
clean nightly/core 1 2
clean nightly/coretests 1 2
clean nightly/soa-tooling 1 2
clean nightly/soatests 1 2
clean nightly/webtools 1 2
clean nightly/bottests 1 2
-
13 years, 3 months
JBoss Tools SVN: r43706 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:12:50 -0400 (Fri, 14 Sep 2012)
New Revision: 43706
Removed:
trunk/build/util/cleanup/devstudio-cleanup.sh
Log:
https://issues.jboss.org/browse/JBIDE-8667 move scripts from devstudio/trunk/releng/org.jboss.ide.eclipse.releng/hudson/cleanup to jbosstools/trunk/build/util/cleanup
Deleted: trunk/build/util/cleanup/devstudio-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/devstudio-cleanup.sh 2012-09-14 18:45:57 UTC (rev 43705)
+++ trunk/build/util/cleanup/devstudio-cleanup.sh 2012-09-14 19:12:50 UTC (rev 43706)
@@ -1,51 +0,0 @@
-#!/bin/bash
-# This script is run here: http://hudson.qa.jboss.com/hudson/job/devstudio-cleanup/configure
-# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse....
-# --------------------------------------------------------------------------------
-# clean JBDS builds from fish://dev01.qa.atl2.redhat.com:/qa/services/http/binaries/RHDS/{nightly,release}
-
-root=/qa/services/http/binaries/RHDS/builds
-log=/tmp/${0##*/}.log.`date +%Y%m%d-%H%M`.txt
-
-echo "Logfile: $log" | tee -a $log
-echo "" | tee -a $log
-
-# before
-df -h $root | tee -a $log
-echo "" | tee -a $log
-
-# Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch
-clean ()
-{
- type=$1 # nightly or release
- numkeep=$2 # number of builds to keep per branch
- threshhold=$3 # age at which a build is available for delete
- echo "Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch" | tee -a $log
- for d in $(find $root/$type -maxdepth 1 -mindepth 1 -type d); do
- newest=$(find $d -maxdepth 1 -mindepth 1 -type d -name "201*" | sort -r | head -$numkeep) # keep these
- all=$(find $d -maxdepth 1 -mindepth 1 -type d -name "201*" | sort -r) # only look to delete things more than $threshhold days old
- for dd in $all; do
- keep=0;
- for n in $newest; do
- if [[ $dd == $n ]]; then
- keep=1
- fi
- done
- if [[ $keep -eq 0 ]]; then
- echo "- $dd... " | tee -a $log
- if [[ $USER == "hudson" ]]; then rm -fr $dd; fi
- else
- echo "+ $dd" | tee -a $log
- fi
- done
- done
- echo "" | tee -a $log
-}
-
-clean nightly 3 3
-
-# after
-df -h $root | tee -a $log
-echo "" | tee -a $log
-
-#du -sch $root/* | tee -a $log
13 years, 3 months
JBoss Tools SVN: r43705 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-14 14:45:57 -0400 (Fri, 14 Sep 2012)
New Revision: 43705
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java
Log:
JBIDE-12616 - Project examples have disabled Finish button
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java 2012-09-14 18:38:19 UTC (rev 43704)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java 2012-09-14 18:45:57 UTC (rev 43705)
@@ -27,6 +27,7 @@
public class ProjectExample implements ProjectModelElement,
Comparable<ProjectExample> {
+ public static final String IMPORT_TYPE_ZIP = "zip"; //$NON-NLS-1$
private static final String SEP = "/"; //$NON-NLS-1$
private static String[] PREFIXES = { "file:", "http:", "https:", "ftp:" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
private String name;
@@ -62,7 +63,7 @@
url = ""; //$NON-NLS-1$
welcome = false;
perspectiveId = null;
- importType = "zip";
+ importType = IMPORT_TYPE_ZIP;
setCategory(ProjectExampleCategory.OTHER);
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-09-14 18:38:19 UTC (rev 43704)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-09-14 18:45:57 UTC (rev 43705)
@@ -77,7 +77,7 @@
*/
public class ProjectExampleUtil {
- private static final String SERVER_PROJECT_EXAMPLE_XML = ".project_example.xml";
+ private static final String SERVER_PROJECT_EXAMPLE_XML = ".project_example.xml"; //$NON-NLS-1$
private static final String URL = "url"; //$NON-NLS-1$
@@ -476,9 +476,9 @@
if (path != null) {
project.setIconPath(path);
}
- } else if (nodeName.equals("essentialEnterpriseDependencies")) {
+ } else if (nodeName.equals("essentialEnterpriseDependencies")) { //$NON-NLS-1$
parseEssentialEnterpriseDependencies(project, child);
- } else if (nodeName.equals("stacksId")) {
+ } else if (nodeName.equals("stacksId")) { //$NON-NLS-1$
String stacksId = child.getAttribute("stacksId"); //$NON-NLS-1$
if (stacksId != null) {
project.setStacksId(stacksId);
@@ -795,11 +795,11 @@
if (monitor.isCanceled()) {
return null;
}
- BufferedOutputStream destination = new BufferedOutputStream(
- new FileOutputStream(file));
if (monitor.isCanceled()) {
return null;
}
+ BufferedOutputStream destination = new BufferedOutputStream(
+ new FileOutputStream(file));
IStatus result = getTransport().download(prefix,
url.toExternalForm(), destination, monitor);
if (!result.isOK()) {
@@ -929,7 +929,7 @@
@Override
public Tuple<IProjectExampleSite, Document> call() throws Exception {
URL url = tuple.key.getUrl();
- File file = getProjectExamplesFile(url, "projectExamples", ".xml", new NullProgressMonitor());
+ File file = getProjectExamplesFile(url, "projectExamples", ".xml", new NullProgressMonitor()); //$NON-NLS-1$ //$NON-NLS-2$
if(file == null || !file.exists() || !file.isFile()) {
ProjectExamplesActivator.log(NLS.bind(Messages.ProjectUtil_Invalid_URL, url.toString()));
return tuple;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-09-14 18:38:19 UTC (rev 43704)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-09-14 18:45:57 UTC (rev 43705)
@@ -462,7 +462,7 @@
canFinish=true;
ProjectExample project = (ProjectExample) object;
String importType = project.getImportType();
- if (importType != null && importType.length() > 0) {
+ if (!ProjectExample.IMPORT_TYPE_ZIP.equals(importType) && importType != null && importType.length() > 0) {
IImportProjectExample importProjectExample = ProjectExamplesActivator.getDefault().getImportProjectExample(importType);
if (importProjectExample == null) {
// FIXME
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-09-14 18:38:19 UTC (rev 43704)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-09-14 18:45:57 UTC (rev 43705)
@@ -614,7 +614,7 @@
@Override
public String getProjectExampleType() {
- return "zip";
+ return ProjectExample.IMPORT_TYPE_ZIP;
}
@Override
13 years, 3 months
JBoss Tools SVN: r43704 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 14:38:19 -0400 (Fri, 14 Sep 2012)
New Revision: 43704
Added:
trunk/build/util/cleanup/devstudio-product-cleanup.sh
Log:
https://issues.jboss.org/browse/JBIDE-8667 move scripts from devstudio/trunk/releng/org.jboss.ide.eclipse.releng/hudson/cleanup to jbosstools/trunk/build/util/cleanup
Added: trunk/build/util/cleanup/devstudio-product-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/devstudio-product-cleanup.sh (rev 0)
+++ trunk/build/util/cleanup/devstudio-product-cleanup.sh 2012-09-14 18:38:19 UTC (rev 43704)
@@ -0,0 +1,55 @@
+#!/bin/bash
+# This script is run here: http://hudson.qa.jboss.com/hudson/job/devstudio-cleanup/configure
+# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse....
+# --------------------------------------------------------------------------------
+# clean JBDS builds from fish://dev01.qa.atl2.redhat.com:/qa/services/http/binaries/RHDS/{nightly,release}
+
+roots=$(find /qa/services/http/binaries/RHDS/builds/staging/ -maxdepth 2 -name builds | egrep "devstudio.*product")
+log=/tmp/${0##*/}.log.`date +%Y%m%d-%H%M`.txt
+
+echo "Logfile: $log" | tee -a $log
+echo "" | tee -a $log
+
+# before
+df -h $roots | tee -a $log
+echo "" | tee -a $log
+
+# Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch
+clean ()
+{
+ type=$1 # nightly or release
+ numkeep=$2 # number of builds to keep per branch
+ threshhold=$3 # age at which a build is available for delete
+ echo "Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch" | tee -a $log
+ for root in $roots; do
+ for d in $(find $root/$type -maxdepth 1 -mindepth 1 -type d); do
+ echo "searching in $d"
+ newest=$(find $d -maxdepth 1 -mindepth 1 -type d -name "*" | sort -r | head -$numkeep) # keep these
+ echo "newest=$newest"
+ all=$(find $d -maxdepth 1 -mindepth 1 -type d -name "*" | sort -r) # only look to delete things more than $threshhold days old
+ echo "all=$all"
+ for dd in $all; do
+ keep=0;
+ for n in $newest; do
+ if [[ $dd == $n ]]; then
+ keep=1
+ fi
+ done
+ if [[ $keep -eq 0 ]]; then
+ echo "- $dd... " | tee -a $log
+ if [[ $USER == "hudson" ]]; then rm -fr $dd; fi
+ else
+ echo "+ $dd" | tee -a $log
+ fi
+ done
+ done
+ done
+ echo "" | tee -a $log
+}
+
+clean nightly 3 3
+
+# after
+df -h $roots | tee -a $log
+echo "" | tee -a $log
+
Property changes on: trunk/build/util/cleanup/devstudio-product-cleanup.sh
___________________________________________________________________
Added: svn:executable
+ *
13 years, 3 months
JBoss Tools SVN: r43703 - in trunk/build/util: cleanup and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 14:30:43 -0400 (Fri, 14 Sep 2012)
New Revision: 43703
Added:
trunk/build/util/cleanup/
trunk/build/util/cleanup/devstudio-cleanup.sh
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
https://issues.jboss.org/browse/JBIDE-8667 move scripts from devstudio/trunk/releng/org.jboss.ide.eclipse.releng/hudson/cleanup to jbosstools/trunk/build/util/cleanup
Added: trunk/build/util/cleanup/devstudio-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/devstudio-cleanup.sh (rev 0)
+++ trunk/build/util/cleanup/devstudio-cleanup.sh 2012-09-14 18:30:43 UTC (rev 43703)
@@ -0,0 +1,51 @@
+#!/bin/bash
+# This script is run here: http://hudson.qa.jboss.com/hudson/job/devstudio-cleanup/configure
+# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse....
+# --------------------------------------------------------------------------------
+# clean JBDS builds from fish://dev01.qa.atl2.redhat.com:/qa/services/http/binaries/RHDS/{nightly,release}
+
+root=/qa/services/http/binaries/RHDS/builds
+log=/tmp/${0##*/}.log.`date +%Y%m%d-%H%M`.txt
+
+echo "Logfile: $log" | tee -a $log
+echo "" | tee -a $log
+
+# before
+df -h $root | tee -a $log
+echo "" | tee -a $log
+
+# Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch
+clean ()
+{
+ type=$1 # nightly or release
+ numkeep=$2 # number of builds to keep per branch
+ threshhold=$3 # age at which a build is available for delete
+ echo "Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch" | tee -a $log
+ for d in $(find $root/$type -maxdepth 1 -mindepth 1 -type d); do
+ newest=$(find $d -maxdepth 1 -mindepth 1 -type d -name "201*" | sort -r | head -$numkeep) # keep these
+ all=$(find $d -maxdepth 1 -mindepth 1 -type d -name "201*" | sort -r) # only look to delete things more than $threshhold days old
+ for dd in $all; do
+ keep=0;
+ for n in $newest; do
+ if [[ $dd == $n ]]; then
+ keep=1
+ fi
+ done
+ if [[ $keep -eq 0 ]]; then
+ echo "- $dd... " | tee -a $log
+ if [[ $USER == "hudson" ]]; then rm -fr $dd; fi
+ else
+ echo "+ $dd" | tee -a $log
+ fi
+ done
+ done
+ echo "" | tee -a $log
+}
+
+clean nightly 3 3
+
+# after
+df -h $root | tee -a $log
+echo "" | tee -a $log
+
+#du -sch $root/* | tee -a $log
Property changes on: trunk/build/util/cleanup/devstudio-cleanup.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh (rev 0)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 18:30:43 UTC (rev 43703)
@@ -0,0 +1,97 @@
+#!/bin/sh
+# This script is run here: http://hudson.qa.jboss.com/hudson/job/jbosstools-cleanup/configure
+# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse....
+# --------------------------------------------------------------------------------
+# clean JBT builds from sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/builds/nightly
+
+now=$(date +%s)
+log=/tmp/${0##*/}.log.`date +%Y%m%d-%H%M`.txt
+
+echo "Logfile: $log" | tee -a $log
+echo "" | tee -a $log
+
+getSubDirs ()
+{
+ getSubDirsReturn="";
+ tab="";
+ if [[ $1 ]]; then dir="$1"; else dir="/downloads_htdocs/tools/builds/nightly/"; fi
+ if [[ $2 ]] && [[ $2 -gt 0 ]]; then
+ lev=$2
+ while [[ $lev -gt 0 ]]; do
+ tab=$tab"> ";
+ (( lev-- ));
+ done
+ fi
+ echo "${tab}Check $dir..." | tee -a $log
+ tmp=`mktemp`
+ echo "ls $dir" > $tmp
+ dirs=$(sftp -b $tmp tools(a)filemgmt.jboss.org 2>/dev/null)
+ i=0
+ for c in $dirs; do
+ if [[ $i -gt 2 ]] && [[ $c != "sftp>" ]] && [[ ${c##*.} != "" ]]; then # valid dir
+ getSubDirsReturn=$getSubDirsReturn" "$c
+ fi
+ (( i++ ))
+ done
+ rm -f $tmp
+}
+
+# Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch
+clean ()
+{
+ type=$1 # nightly or release
+ numkeep=$2 # number of builds to keep per branch
+ threshhold=$3 # age at which a build is available for delete
+ echo "Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch" | tee -a $log
+
+ getSubDirs /downloads_htdocs/tools/builds/$type/ 0
+ subdirs=$getSubDirsReturn
+ for sd in $subdirs; do
+ getSubDirs $sd 1
+ subsubdirs=$getSubDirsReturn
+ #echo $subsubdirs
+ tmp=`mktemp`
+ for ssd in $subsubdirs; do
+ if [[ ${ssd##$sd/201*} == "" ]]; then # a build dir
+ buildid=${ssd##*/};
+ echo $buildid >> $tmp
+ fi
+ done
+ newest=$(cat $tmp | sort -r | head -$numkeep) # keep these
+ all=$(cat $tmp | sort -r) # check these
+ rm -f $tmp
+ for dd in $all; do
+ keep=0;
+ # sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT
+ sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT
+ (( day = now - sec ))
+ (( day = day / 3600 / 24 ))
+ for n in $newest; do
+ if [[ $dd == $n ]] || [[ $day -le $threshhold ]]; then
+ keep=1
+ fi
+ done
+ if [[ $keep -eq 0 ]]; then
+ echo -n "- $sd/$dd (${day}d)... " | tee -a $log
+ if [[ $USER == "hudson" ]]; then
+ # can't delete the dir, but can at least purge its contents
+ rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null
+ rsync -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log
+ echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/
+ popd >/dev/null; rm -fr /tmp/$dd
+ fi
+ echo "" | tee -a $log
+ else
+ echo "+ $sd/$dd (${day}d)" | tee -a $log
+ fi
+ done
+ done
+ echo "" | tee -a $log
+}
+clean nightly/core 1 2
+clean nightly/coretests 1 2
+clean nightly/soa-tooling 1 2
+clean nightly/soatests 1 2
+clean nightly/webtools 1 2
+clean nightly/bottests 1 2
+
Property changes on: trunk/build/util/cleanup/jbosstools-cleanup.sh
___________________________________________________________________
Added: svn:executable
+ *
13 years, 3 months
JBoss Tools SVN: r43702 - trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-14 14:26:52 -0400 (Fri, 14 Sep 2012)
New Revision: 43702
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2BeanMapValuesOpenOnTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
Log:
JBIDE-12609
NPE when validating EL which uses java.util.Map
JUnit Test Case is added
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2BeanMapValuesOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2BeanMapValuesOpenOnTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2BeanMapValuesOpenOnTest.java 2012-09-14 18:26:52 UTC (rev 43702)
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.text.ext.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ * JUnit test for JBIDE-12609
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class JSF2BeanMapValuesOpenOnTest extends TestCase {
+ private static final String PROJECT_NAME = "JSF2CompositeOpenOn";
+ private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/templates/common.xhtml";
+ private static final String SOURCE_PAGE_NAME = PROJECT_NAME+"/WebContent/pages/inputname3.xhtml";
+ private static final String EL0 = "#{user}";
+ private static final String EL0_SEGMENT = "user";
+ private static final String EL = "#{group.users['admin'].name}";
+ private static final String EL_SEGMENT0 = "admin";
+ private static final String EL_SEGMENT1 = "name";
+ private static final String EDITOR_NAME = "User.java";
+ private ELHyperlinkDetector elHyperlinkDetector = new ELHyperlinkDetector();
+
+ public IProject project = null;
+
+ protected void setUp() {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ PROJECT_NAME);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ }
+
+ protected void tearDown() {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ }
+
+ public JSF2BeanMapValuesOpenOnTest() {
+ super("JSF2 OpenOn on Bean Map Values test");
+ }
+
+ public void testBeanMapValues() throws PartInitException, BadLocationException {
+ IEditorPart editor = WorkbenchUtils.openEditor(SOURCE_PAGE_NAME);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ EL0, true, true, false, false);
+
+ assertNotNull("EL: " + EL0 + " not found",reg);
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
+ EL0_SEGMENT, true, true, false, false);
+
+ assertNotNull("Segment: " + EL0_SEGMENT + " not found in EL",reg);
+
+ IHyperlink[] links = elHyperlinkDetector.detectHyperlinks(viewer, new Region(reg.getOffset() + reg.getLength() - 1, 0), false);
+
+ assertNotNull("Hyperlinks for EL Segment:"+EL0_SEGMENT+" not found",links);
+
+ assertTrue("Hyperlinks for EL Segment:"+EL0_SEGMENT+" not found",links.length!=0);
+
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+
+ editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ document = viewer.getDocument();
+ IRegion reg0 = new FindReplaceDocumentAdapter(document).find(0,
+ EL, true, true, false, false);
+
+ assertNotNull("EL: " + EL + " not found",reg0);
+
+ // Open On over 'admin' argument shouldn't return any links
+ try {
+ reg = new FindReplaceDocumentAdapter(document).find(reg0.getOffset(),
+ EL_SEGMENT0, true, true, false, false);
+
+ assertNotNull("Segment: " + EL_SEGMENT0 + " not found in EL",reg);
+
+ links = elHyperlinkDetector.detectHyperlinks(viewer, new Region(reg.getOffset() + reg.getLength() - 1, 0), false);
+
+ assertTrue("Some Hyperlinks found for EL Segment:"+EL_SEGMENT0+"!",(links == null || links.length == 0));
+ } catch (NullPointerException e) {
+ fail("NPE occurred while trying to get Open On over the Segment:" + EL_SEGMENT0);
+ }
+
+ // Open On over 'name' segment should return a link to User.java
+ reg = new FindReplaceDocumentAdapter(document).find(reg0.getOffset(),
+ EL_SEGMENT1, true, true, false, false);
+
+ assertNotNull("Segment: " + EL_SEGMENT1 + " not found in EL",reg);
+
+ links = elHyperlinkDetector.detectHyperlinks(viewer, new Region(reg.getOffset() + reg.getLength() - 1, 0), false);
+
+ assertNotNull("Hyperlinks for EL Segment:"+EL_SEGMENT1+" not found",links);
+
+ assertTrue("Hyperlinks for EL Segment:"+EL_SEGMENT1+" not found",links.length!=0);
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if(EDITOR_NAME.equals(resultEditor.getTitle())){
+ found = true;
+ return;
+ }
+ }
+ assertTrue("OpenOn have not opened "+EDITOR_NAME+" editor",found);
+
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2BeanMapValuesOpenOnTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2012-09-14 18:18:16 UTC (rev 43701)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2012-09-14 18:26:52 UTC (rev 43702)
@@ -31,7 +31,8 @@
JSF2CSSStylesheetOpenOnTest.class,
JSF2CCAttrsOpenOnTest.class,
JSF2XMLOpenOnTest.class,
- JSPELHyperlinkUIParamTest.class),
+ JSPELHyperlinkUIParamTest.class,
+ JSF2BeanMapValuesOpenOnTest.class),
"org.jboss.tools.jsf.text.ext.test",
new String[]{"projects/JSF2CompositeOpenOn"},
new String[]{"JSF2CompositeOpenOn"}));
13 years, 3 months
JBoss Tools SVN: r43701 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn: JavaSource/demo and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-14 14:18:16 -0400 (Fri, 14 Sep 2012)
New Revision: 43701
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/jsf-api-2.0.3.jar
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml
Log:
JBIDE-12609
NPE when validating EL which uses java.util.Map
JUnit Test Case is added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath 2012-09-14 16:31:36 UTC (rev 43700)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath 2012-09-14 18:18:16 UTC (rev 43701)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="lib" path="lib/jsf-api-2.0.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
@@ -8,7 +9,7 @@
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="owner.project.facets" value="jst.java"/>
</attributes>
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java 2012-09-14 18:18:16 UTC (rev 43701)
@@ -0,0 +1,48 @@
+package demo;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+
+@ManagedBean(name="user")
+@SessionScoped
+public class User {
+ private Map<String, User> users = new HashMap<String, User>();
+ private Map<String, Collection> list = new HashMap<String, Collection>();
+
+ private String name;
+
+ public User() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String sayHello() {
+ return "greeting";
+ }
+
+ public Map<String, User> getUsers() {
+ return users;
+ }
+
+ public void setUsers(Map<String, User> users) {
+ this.users = users;
+ }
+
+ public Map<String, Collection> getList() {
+ return list;
+ }
+
+ public void setList(Map<String, Collection> list) {
+ this.list = list;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml (from rev 43624, trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname.xhtml)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml 2012-09-14 18:18:16 UTC (rev 43701)
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ez="http://java.sun.com/jsf/composite/demo">
+
+<f:loadBundle basename="resources" var="pageMsgs" />
+
+<ui:composition template="/templates/common.xhtml"
+ xmlns:jar="http://java.sun.com/jsf/composite/jarPage"
+ xmlns:jar1="http://java.sun.com/jsf/composite/jarPage1">
+ <ui:param name="group" value="#{user}" />
+
+ <h:outputStylesheet name="stylesheet/style.css" type="text/css"/>
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
+
+ <ui:define name="body">
+ <ez:input id="inputname" label="${registeredMsgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/>
+ <h:outputText value="${registeredMsgs['demo.long.named.property']}" />
+ <h:outputText value="${pageMsgs.prompt}" />
+ <h:outputText value="${pageMsgs['demo.long.named.property']}" />
+ <div class="info">
+ <form>
+ <jar:echo1 echo="Hello" />
+ <jar:echo echo="Hello" />
+ <jar:echo anknownAttr="1" echo="Hello" />
+ <jar1:echo echo="Hello" />
+ </form>
+ </div>
+ </ui:define>
+</ui:composition>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml 2012-09-14 16:31:36 UTC (rev 43700)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml 2012-09-14 18:18:16 UTC (rev 43701)
@@ -27,6 +27,9 @@
</head>
<body bgcolor="#ffffff">
+
+<h:outputText value="#{group.users['admin'].name}" />
+
<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400">
<tbody>
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/jsf-api-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/jsf-api-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 3 months
JBoss Tools SVN: r43700 - trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-14 12:31:36 -0400 (Fri, 14 Sep 2012)
New Revision: 43700
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java
Log:
[JBIDE-12622] fixed unmarshalling problem if gear_profile:null
Modified: trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java 2012-09-14 16:30:16 UTC (rev 43699)
+++ trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java 2012-09-14 16:31:36 UTC (rev 43700)
@@ -21,6 +21,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.Future;
import org.jboss.tools.openshift.express.internal.core.EmbedCartridgeStrategy;
import org.junit.Before;
@@ -355,8 +356,7 @@
@Override
public void removeEmbeddedCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- // TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException();
}
@Override
@@ -496,6 +496,11 @@
public Session getSSHSession() {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public Future<Boolean> waitForAccessibleAsync(long timeout) throws OpenShiftException {
+ throw new UnsupportedOperationException();
+ }
}
private static final class DomainFake implements IDomain {
13 years, 3 months
JBoss Tools SVN: r43699 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-14 12:30:16 -0400 (Fri, 14 Sep 2012)
New Revision: 43699
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/TableViewerBuilder.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java
Log:
[JBIDE-11912] create TableviewerBuilder to reuse table viewer creation code
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/TableViewerBuilder.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/TableViewerBuilder.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/TableViewerBuilder.java 2012-09-14 16:30:16 UTC (rev 43699)
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.utils;
+
+import org.eclipse.jface.layout.TableColumnLayout;
+import org.eclipse.jface.viewers.CellLabelProvider;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class TableViewerBuilder {
+
+ private TableViewer viewer;
+ private TableColumnLayout tableLayout;
+
+ public TableViewerBuilder(Table table, Composite tableContainer) {
+ this(new TableViewer(table), tableContainer);
+ }
+
+ public TableViewerBuilder(TableViewer viewer, Composite tableContainer) {
+ this.viewer = viewer;
+ this.tableLayout = new TableColumnLayout();
+ tableContainer.setLayout(tableLayout);
+ }
+
+ public TableViewerBuilder contentProvider(IStructuredContentProvider contentProvider) {
+ viewer.setContentProvider(contentProvider);
+ return this;
+ }
+
+ public <V> ColumnBuilder<V> column(ICellValueProvider<V> valueProvider) {
+ return new ColumnBuilder<V>(valueProvider);
+ }
+
+ public TableViewer buildViewer() {
+ return viewer;
+ }
+
+ public class ColumnBuilder<E> {
+
+ private int alignement;
+ private ICellValueProvider<E> cellValueProvider;
+ private String name;
+ private int weight;
+
+ private ColumnBuilder(ICellValueProvider<E> valueProvider) {
+ this.cellValueProvider = valueProvider;
+ }
+
+ public ColumnBuilder<E> align(int alignement) {
+ this.alignement = alignement;
+ return this;
+ }
+
+ public ColumnBuilder<E> name(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public ColumnBuilder<E> weight(int weight) {
+ this.weight = weight;
+ return this;
+ }
+
+ public TableViewerBuilder buildColumn() {
+ TableViewerColumn column = new TableViewerColumn(viewer, alignement);
+ column.getColumn().setText(name);
+ column.setLabelProvider(new CellLabelProvider() {
+
+ @Override
+ public void update(ViewerCell cell) {
+ @SuppressWarnings("unchecked")
+ String cellValue = cellValueProvider.getValue((E) cell.getElement());
+ cell.setText(cellValue);
+ }
+ });
+ tableLayout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true));
+ return TableViewerBuilder.this;
+ }
+ }
+
+ public static interface ICellValueProvider<E> {
+ public String getValue(E e);
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/TableViewerBuilder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java 2012-09-14 16:09:36 UTC (rev 43698)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ManageSSHKeysWizardPage.java 2012-09-14 16:30:16 UTC (rev 43699)
@@ -27,9 +27,6 @@
import org.eclipse.jface.viewers.IElementComparer;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
@@ -39,6 +36,8 @@
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.utils.TableViewerBuilder;
+import org.jboss.tools.openshift.express.internal.ui.utils.TableViewerBuilder.ICellValueProvider;
import com.openshift.client.IOpenShiftSSHKey;
@@ -70,7 +69,7 @@
Composite tableContainer = new Composite(sshKeysGroup, SWT.NONE);
this.viewer = createTable(tableContainer);
GridDataFactory.fillDefaults()
- .span(1, 4).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(tableContainer);
+ .span(1, 4).align(SWT.FILL, SWT.FILL).hint(500, 260).applyTo(tableContainer);
Button addButton = new Button(sshKeysGroup, SWT.PUSH);
GridDataFactory.fillDefaults()
@@ -92,60 +91,47 @@
Table table =
new Table(tableContainer, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL);
table.setLinesVisible(true);
- TableColumnLayout tableLayout = new TableColumnLayout();
- tableContainer.setLayout(tableLayout);
- TableViewer viewer = new TableViewer(table);
- viewer.setComparer(new EqualityComparer());
- viewer.setContentProvider(new ArrayContentProvider());
+ table.setHeaderVisible(true);
+ this.viewer = new TableViewerBuilder(table, tableContainer)
+ .contentProvider(new ArrayContentProvider())
+ .column(new ICellValueProvider<IOpenShiftSSHKey>() {
- viewer.setSorter(new ViewerSorter() {
+ @Override
+ public String getValue(IOpenShiftSSHKey key) {
+ return key.getName();
+ }
+ })
+ .name("Name")
+ .align(SWT.LEFT)
+ .weight(2)
+ .buildColumn()
+ .column(new ICellValueProvider<IOpenShiftSSHKey>() {
- @Override
- public int compare(Viewer viewer, Object thisKey, Object thatKey) {
- if (thisKey instanceof IOpenShiftSSHKey
- && thatKey instanceof IOpenShiftSSHKey) {
- return ((IOpenShiftSSHKey) thisKey).getName().compareTo(((IOpenShiftSSHKey) thatKey).getName());
+ @Override
+ public String getValue(IOpenShiftSSHKey key) {
+ return key.getKeyType().getTypeId();
}
- return super.compare(viewer, thisKey, thatKey);
- }
+ })
+ .name("Type")
+ .align(SWT.LEFT)
+ .weight(1)
+ .buildColumn()
+ .column(new ICellValueProvider<IOpenShiftSSHKey>() {
- });
-
- createTableColumn("Name", 1, new CellLabelProvider() {
-
- @Override
- public void update(ViewerCell cell) {
- IOpenShiftSSHKey key = (IOpenShiftSSHKey) cell.getElement();
- cell.setText(key.getName());
- }
- }, viewer, tableLayout);
- createTableColumn("Type", 1, new CellLabelProvider() {
-
- @Override
- public void update(ViewerCell cell) {
- IOpenShiftSSHKey key = (IOpenShiftSSHKey) cell.getElement();
- cell.setText(key.getKeyType().getTypeId());
- }
- }, viewer, tableLayout);
- createTableColumn("Public Key", 1, new CellLabelProvider() {
-
- @Override
- public void update(ViewerCell cell) {
- IOpenShiftSSHKey key = (IOpenShiftSSHKey) cell.getElement();
- cell.setText(key.getPublicKey());
- }
- }, viewer, tableLayout);
+ @Override
+ public String getValue(IOpenShiftSSHKey key) {
+ return key.getPublicKey();
+ }
+ })
+ .name("Type")
+ .align(SWT.LEFT)
+ .weight(4)
+ .buildColumn()
+ .buildViewer();
+
return viewer;
}
- private void createTableColumn(String name, int weight, CellLabelProvider cellLabelProvider, TableViewer viewer,
- TableColumnLayout layout) {
- TableViewerColumn column = new TableViewerColumn(viewer, SWT.LEFT);
- column.getColumn().setText(name);
- column.setLabelProvider(cellLabelProvider);
- layout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true));
- }
-
@Override
protected void onPageActivated(DataBindingContext dbc) {
try {
13 years, 3 months
JBoss Tools SVN: r43698 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-14 12:09:36 -0400 (Fri, 14 Sep 2012)
New Revision: 43698
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-12622] fixed unmarshalling problem if "gear_profile":null
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 3 months