September 2012 - jbosstools-commits

JBoss Tools SVN: r43667 - trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-09-13 16:15:14 -0400 (Thu, 13 Sep 2012) New Revision: 43667 Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/ParametedType.java trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/TypeDeclaration.java Log: JBIDE-12446 https://issues.jboss.org/browse/JBIDE-12446 Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/ParametedType.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/ParametedType.java 2012-09-13 19:46:59 UTC (rev 43666) +++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/ParametedType.java 2012-09-13 20:15:14 UTC (rev 43667) @@ -24,6 +24,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; import org.jboss.tools.common.core.CommonCorePlugin; +import org.jboss.tools.common.java.TypeDeclaration.Lazy; /** * @@ -50,6 +51,7 @@ public static interface PositionProvider { ISourceRange getRange(String superTypeName); + boolean isLoaded(); } PositionProvider provider = null; @@ -196,12 +198,25 @@ superType = getFactory().getParametedType(type, this, sc); if(superType != null) { if(provider != null) { - String scn = type.getSuperclassName(); - if(scn != null && provider.getRange(scn) != null) { - ISourceRange r = provider.getRange(scn); - superType = new TypeDeclaration(superType, type.getResource(), r.getOffset(), r.getLength()); - } - + final String scn = type.getSuperclassName(); + if(scn != null) { + if(provider.isLoaded() && provider.getRange(scn) != null) { + ISourceRange r = provider.getRange(scn); + superType = new TypeDeclaration(superType, type.getResource(), r.getOffset(), r.getLength()); + } else if(!provider.isLoaded()) { + Lazy lazy = new Lazy() { + @Override + public void init(TypeDeclaration d) { + ISourceRange r = provider.getRange(scn); + if(r != null) { + d.init(r.getOffset(), r.getLength()); + } + } + }; + superType = new TypeDeclaration(superType, type.getResource(), lazy); + } + + } } inheritedTypes.add(superType); } @@ -213,10 +228,23 @@ ParametedType t = getFactory().getParametedType(type, this, p); if(t != null) { if(provider != null) { - String scn = type.getSuperInterfaceNames()[i]; - if(scn != null && provider.getRange(scn) != null) { - ISourceRange r = provider.getRange(scn); - t = new TypeDeclaration(t, type.getResource(), r.getOffset(), r.getLength()); + final String scn = type.getSuperInterfaceNames()[i]; + if(scn != null) { + if(provider.isLoaded() && provider.getRange(scn) != null) { + ISourceRange r = provider.getRange(scn); + t = new TypeDeclaration(t, type.getResource(), r.getOffset(), r.getLength()); + } else if(!provider.isLoaded()) { + Lazy lazy = new Lazy() { + @Override + public void init(TypeDeclaration d) { + ISourceRange r = provider.getRange(scn); + if(r != null) { + d.init(r.getOffset(), r.getLength()); + } + } + }; + t = new TypeDeclaration(t, type.getResource(), lazy); + } } } Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/TypeDeclaration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/TypeDeclaration.java 2012-09-13 19:46:59 UTC (rev 43666) +++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/TypeDeclaration.java 2012-09-13 20:15:14 UTC (rev 43667) @@ -21,7 +21,17 @@ IResource resource; int length; int startPosition; + Lazy lazy = null; + + public static interface Lazy { + void init(TypeDeclaration d); + } + public TypeDeclaration(ParametedType type, IResource resource, Lazy lazy) { + this(type, resource, 0, 0); + this.lazy = lazy; + } + public TypeDeclaration(ParametedType type, IResource resource, int startPosition, int length) { this.setFactory(type.getFactory()); this.type = type.getType(); @@ -42,13 +52,32 @@ isLower = type.isLower; isUpper = type.isUpper; isVariable = type.isVariable; + if(type instanceof TypeDeclaration) { + this.lazy = ((TypeDeclaration)type).lazy; + } } + public void init(int startPosition, int length) { + this.startPosition = startPosition; + this.length = length; + } + + private void init() { + if(lazy != null) { + synchronized (this) { + lazy.init(this); + lazy = null; + } + } + } + public int getLength() { + init(); return length; } public int getStartPosition() { + init(); return startPosition; }

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43666 - in trunk/documentation/whatsnew: as and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-13 15:46:59 -0400 (Thu, 13 Sep 2012) New Revision: 43666 Added: trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html trunk/documentation/whatsnew/as/images/4.0.0.Alpha1/ trunk/documentation/whatsnew/as/images/4.0.0.Alpha1/ds.png Modified: trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html trunk/documentation/whatsnew/index.html trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html Log: -ds.xml wizard N&N Added: trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html 2012-09-13 19:46:59 UTC (rev 43666) @@ -0,0 +1,63 @@ +<html> + +<head> +<link rel="stylesheet" href="../whatsnew.css"> +<title>JBoss AS Tools 3.3.0.Beta1 News</title> +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-17645367-5']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + +</script></head> + +<body> + +<h1>JBoss AS Tools 4.0.0.Beta1 What's New</h1> + + <p align="right"><a href="../index.html">< Main Index</a> <a +href="../cdi/cdi-news-4.0.0.Alpha1.html">CDI Tools></a></p> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr /> + <h3>Data Source xml file wizard</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>persistence.xml registration</b></p> + </td> + <td align="top"> + <p> + Now when you generate a new -ds.xml file using New JBoss Datasource wizard you can generate/update the corresponding persistence.xml file. + </p> + <p><img src="images/4.0.0.Alpha1/ds.png" /></p> + <p> + <small> + <a href="https://issues.jboss.org/browse/JBIDE-11394">Related Jira</a> + </small><br/> + </p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/as/images/4.0.0.Alpha1/ds.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/as/images/4.0.0.Alpha1/ds.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html 2012-09-13 19:13:21 UTC (rev 43665) +++ trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html 2012-09-13 19:46:59 UTC (rev 43666) @@ -23,8 +23,8 @@ <body> <h1>CDI tools 3.3.0.CR1 What's New</h1> -<p align="right"><a href="../index.html">< Main Index</a> <a - href="../maven/maven-news-4.0.0.Alpha1.html">Maven Tools News ></a></p> +<p align="right"><a href="../index.html">< Main Index</a> +<a href="../maven/maven-news-4.0.0.Alpha1.html">Maven Tools News ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2012-09-13 19:13:21 UTC (rev 43665) +++ trunk/documentation/whatsnew/index.html 2012-09-13 19:46:59 UTC (rev 43666) @@ -52,11 +52,12 @@ <td valign="top" align="left"> <p align="right"><b>4.0.0.Alpha1</b> <td valign="top"> - + + <p><a href="as/as-news-4.0.0.Alpha1.html">JBoss AS Server Tools</a></p> <p><a href="cdi/cdi-news-4.0.0.Alpha1.html">CDI Tools</a></p> <p><a href="maven/maven-news-4.0.0.Alpha1.html">Maven Tools</a></p> <p><a href="jst/jst-news-4.0.0.Alpha1.html">JST/JSF Tools</a></p> - + <p><a href="vpe/vpe-news-4.0.0.Alpha1.html">Visual Page Editor/BrowserSim</a></p> </td> </tr> Modified: trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html 2012-09-13 19:13:21 UTC (rev 43665) +++ trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html 2012-09-13 19:46:59 UTC (rev 43666) @@ -24,7 +24,8 @@ <h1>JST/JSF 4.0.0.Alpha1 What's New</h1> <p align="right"><a href="../index.html">< Main - Index</a> </p> + Index</a> +<a href="../vpe/vpe-news-4.0.0.Alpha1.html">Visual Page Editor News ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%">

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43665 - in trunk/documentation/whatsnew/vpe: images and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-09-13 15:13:21 -0400 (Thu, 13 Sep 2012) New Revision: 43665 Added: trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/ trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/browsersim-new-scrollbars.png trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html Log: https://issues.jboss.org/browse/JBIDE-12610 : Visual Editor Component N&N for 4.0.0.Alpha1 Added: trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/browsersim-new-scrollbars.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/vpe/images/4.0.0.Alpha1/browsersim-new-scrollbars.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha1.html 2012-09-13 19:13:21 UTC (rev 43665) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!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"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>What's New Visual Page Editor 3.3.0.Beta1</title> +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-17645367-5']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + +</script></head> +<body> +<h1>What's New Visual Page Editor 3.3.0.Beta1</h1> + +<p align="right"> +<a href="../index.html">< Main Index</a> +<a href="../hibernate/hibernate-news-3.5.0.Beta1.html">Hibernate Tools ></a> +</p> + +<table border="0" cellpadding="10" cellspacing="0"> + <tr> + <td colspan="2"> + <hr /> + <h3>Editor</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <b><p> + TODO + <p></b> + </td> + <td valign="top"> + <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> + <p><img src="images/4.0.0.Alpha1/TODO.png" alt="TODO" /></p> + <p><small> + <a href="https://issues.jboss.org/browse/JBIDE-8631">Related Jira</a> + </small></p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> + <h3>BrowserSim</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <b><p> + New scrollbars (Windows only) + <p></b> + </td> + <td valign="top"> + <p>BrowserSim got new thinner and nicer tollbars (Windows only).</p> + <p><img src="images/4.0.0.Alpha1/browsersim-new-scrollbars.png" height='727' width='384' alt='New scrollbars'></p> + + <p><small> + <a href="https://issues.jboss.org/browse/JBIDE-12191">Related Jira</a> + </small></p> + </td> + </tr> +</table> +</body> +</html> \ No newline at end of file

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43664 - in trunk/documentation/whatsnew: cdi and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-13 14:12:56 -0400 (Thu, 13 Sep 2012) New Revision: 43664 Modified: trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html trunk/documentation/whatsnew/index.html Log: N&N for JSF Tools 4.0.0.Alpha1 Modified: trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html 2012-09-13 18:10:22 UTC (rev 43663) +++ trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html 2012-09-13 18:12:56 UTC (rev 43664) @@ -24,7 +24,7 @@ <h1>CDI tools 3.3.0.CR1 What's New</h1> <p align="right"><a href="../index.html">< Main Index</a> <a - href="../jst/jst-news-4.0.0.Alpha1.html">JST/JSF Tools News ></a></p> + href="../maven/maven-news-4.0.0.Alpha1.html">Maven Tools News ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2012-09-13 18:10:22 UTC (rev 43663) +++ trunk/documentation/whatsnew/index.html 2012-09-13 18:12:56 UTC (rev 43664) @@ -54,8 +54,8 @@ <td valign="top"> <p><a href="cdi/cdi-news-4.0.0.Alpha1.html">CDI Tools</a></p> + <p><a href="maven/maven-news-4.0.0.Alpha1.html">Maven Tools</a></p> <p><a href="jst/jst-news-4.0.0.Alpha1.html">JST/JSF Tools</a></p> - <p><a href="maven/maven-news-4.0.0.Alpha1.html">Maven Tools</a></p> </td>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43663 - in trunk/documentation/whatsnew: jst and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-13 14:10:22 -0400 (Thu, 13 Sep 2012) New Revision: 43663 Added: trunk/documentation/whatsnew/jst/images/4.0.0.Alpha1/maps.png Modified: trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html Log: N&N for JSF Tools 4.0.0.Alpha1 Modified: trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html 2012-09-13 17:52:24 UTC (rev 43662) +++ trunk/documentation/whatsnew/cdi/cdi-news-4.0.0.Alpha1.html 2012-09-13 18:10:22 UTC (rev 43663) @@ -24,7 +24,7 @@ <h1>CDI tools 3.3.0.CR1 What's New</h1> <p align="right"><a href="../index.html">< Main Index</a> <a - href="../maven/maven-news-4.0.0.Alpha1.html">Maven Tools News ></a></p> + href="../jst/jst-news-4.0.0.Alpha1.html">JST/JSF Tools News ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Added: trunk/documentation/whatsnew/jst/images/4.0.0.Alpha1/maps.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/jst/images/4.0.0.Alpha1/maps.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html 2012-09-13 17:52:24 UTC (rev 43662) +++ trunk/documentation/whatsnew/jst/jst-news-4.0.0.Alpha1.html 2012-09-13 18:10:22 UTC (rev 43663) @@ -76,6 +76,27 @@ <hr /> </td> </tr> + <tr> + <td valign="top" align="left"> + <p><b>java.util.Map</b></p> + </td> + <td align="top"> + <p> + EL validation, code completion and navigation now support expressions which use java.util.Map.<br/>For example: #{myBean.myMap['myKey'].size} + </p> + <p><img src="images/4.0.0.Alpha1/maps.png" /></p> + <p> + <small> + <a href="https://issues.jboss.org/browse/JBIDE-6135">Related Jira</a> + </small><br/> + </p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> </table>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43662 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-13 13:52:24 -0400 (Thu, 13 Sep 2012) New Revision: 43662 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java Log: https://issues.jboss.org/browse/JBIDE-12609 NPE when validating EL which uses java.util.Map Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-13 17:49:36 UTC (rev 43661) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-13 17:52:24 UTC (rev 43662) @@ -487,7 +487,9 @@ return; } LexicalToken token = segment.getToken(); - + if(token==null) { + WebKbPlugin.getDefault().logError("The token from unresolved segment is null. EL: [" + operand + "]"); + } varName = token.getText(); if(varName == null) { //This is syntax error case. Reported by parser. @@ -539,8 +541,8 @@ if(u != null) { try { el = u.getElementAt(startPosition); - } catch (CoreException exc) { - CommonPlugin.getDefault().logError(exc); + } catch (CoreException e) { + WebKbPlugin.getDefault().logError(e); } } }

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43661 - in trunk/central/plugins: org.jboss.tools.central.themes and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-09-13 13:49:36 -0400 (Thu, 13 Sep 2012) New Revision: 43661 Modified: trunk/central/plugins/org.jboss.tools.central.themes/ trunk/central/plugins/pom.xml Log: JBIDE-12552: Missing file in commit... Property changes on: trunk/central/plugins/org.jboss.tools.central.themes ___________________________________________________________________ Modified: svn:ignore - bin + bin target Modified: trunk/central/plugins/pom.xml =================================================================== --- trunk/central/plugins/pom.xml 2012-09-13 17:41:42 UTC (rev 43660) +++ trunk/central/plugins/pom.xml 2012-09-13 17:49:36 UTC (rev 43661) @@ -15,6 +15,7 @@ <modules> <module>org.jboss.tools.central</module> <module>org.jboss.tools.community.central</module> + <module>org.jboss.tools.central.themes</module> <module>org.jboss.tools.central.discovery</module> </modules> </project>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43660 - in trunk/central: features and 19 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-09-13 13:41:42 -0400 (Thu, 13 Sep 2012) New Revision: 43660 Added: trunk/central/features/org.jboss.tools.central.themes.feature/ trunk/central/features/org.jboss.tools.central.themes.feature/build.properties trunk/central/features/org.jboss.tools.central.themes.feature/feature.properties trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml trunk/central/features/org.jboss.tools.central.themes.feature/license.html trunk/central/features/org.jboss.tools.central.themes.feature/pom.xml trunk/central/features/org.jboss.tools.central.themes.feature/sourceTemplateFeature/ trunk/central/plugins/org.jboss.tools.central.themes.zip trunk/central/plugins/org.jboss.tools.central.themes/ trunk/central/plugins/org.jboss.tools.central.themes/.classpath trunk/central/plugins/org.jboss.tools.central.themes/.project trunk/central/plugins/org.jboss.tools.central.themes/.settings/ trunk/central/plugins/org.jboss.tools.central.themes/.settings/org.eclipse.jdt.core.prefs trunk/central/plugins/org.jboss.tools.central.themes/META-INF/ trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF trunk/central/plugins/org.jboss.tools.central.themes/build.properties trunk/central/plugins/org.jboss.tools.central.themes/css/ trunk/central/plugins/org.jboss.tools.central.themes/css/jboss.css trunk/central/plugins/org.jboss.tools.central.themes/css/jbt.css trunk/central/plugins/org.jboss.tools.central.themes/icons/ trunk/central/plugins/org.jboss.tools.central.themes/icons/close-active.png trunk/central/plugins/org.jboss.tools.central.themes/icons/close-normal.png trunk/central/plugins/org.jboss.tools.central.themes/pom.xml trunk/central/plugins/org.jboss.tools.central.themes/src/ trunk/central/plugins/org.jboss.tools.central.themes/src/net/ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/CSSClasses.java trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/SharedImages.java trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/UpdateCTabFolderClassesJob.java trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/ChromeTabRendering.java trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/HackedCTabRendering.java trunk/central/plugins/org.jboss.tools.central.themes/src/org/ trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/ trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/ trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/ trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/themes/ trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/themes/Activator.java Modified: trunk/central/features/pom.xml trunk/central/pom.xml trunk/central/site/category.xml Log: JBIDE-12552: Added feature and bundle for theming (e4 specific) Added: trunk/central/features/org.jboss.tools.central.themes.feature/build.properties =================================================================== --- trunk/central/features/org.jboss.tools.central.themes.feature/build.properties (rev 0) +++ trunk/central/features/org.jboss.tools.central.themes.feature/build.properties 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,3 @@ +bin.includes = feature.xml,\ + license.html,\ + feature.properties Property changes on: trunk/central/features/org.jboss.tools.central.themes.feature/build.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/features/org.jboss.tools.central.themes.feature/feature.properties =================================================================== --- trunk/central/features/org.jboss.tools.central.themes.feature/feature.properties (rev 0) +++ trunk/central/features/org.jboss.tools.central.themes.feature/feature.properties 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,54 @@ +############################################################################### +# Copyright (c) 2008-2012 Red Hat, Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# JBoss by Red Hat - Initial implementation. +############################################################################## +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=JBoss Central - UI Themes for Eclipse + +# "providerName" property - name of the company that provides the feature +providerName=JBoss by Red Hat + +# "updateSiteName" property - label for the update site +updateSiteName=JBossTools Update Site + +# "description" property - description of the feature +description=This feature provides some UI Themes for Eclipse. It requires Eclipse 4, since it rely on its CSS engine. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=Copyright (c) 2008-2012 Red Hat, Inc. and others.\nAll rights reserved. This program and the accompanying materials\n +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http\://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors\:\n\ +JBoss by Red Hat - Initial implementation.\n + ############### end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# START NON-TRANSLATABLE +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=Red Hat, Inc. licenses these features and plugins to you under \ +certain open source licenses (or aggregations of such licenses), which \ +in a particular case may include the Eclipse Public License, the GNU \ +Lesser General Public License, and/or certain other open source \ +licenses. For precise licensing details, consult the corresponding \ +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \ +Raleigh NC 27606 USA. +# END NON-TRANSLATABLE +########### end of license property ########################################## Property changes on: trunk/central/features/org.jboss.tools.central.themes.feature/feature.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml =================================================================== --- trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml (rev 0) +++ trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature id="org.jboss.tools.central.themes.feature" label="%featureName" version="1.1.0.qualifier" provider-name="%providerName" plugin="org.jboss.tools.community.central"> + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin id="org.jboss.tools.central.themes" download-size="0" install-size="0" version="0.0.0"/> --> + +</feature> Property changes on: trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/features/org.jboss.tools.central.themes.feature/license.html =================================================================== --- trunk/central/features/org.jboss.tools.central.themes.feature/license.html (rev 0) +++ trunk/central/features/org.jboss.tools.central.themes.feature/license.html 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> + +<body> +<p>Red Hat, Inc. licenses these features and plugins to you under +certain open source licenses (or aggregations of such licenses), which +in a particular case may include the Eclipse Public License, the GNU +Lesser General Public License, and/or certain other open source +licenses. For precise licensing details, consult the corresponding +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, +Raleigh NC 27606 USA. +</p> +</body> +</html> \ No newline at end of file Property changes on: trunk/central/features/org.jboss.tools.central.themes.feature/license.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/features/org.jboss.tools.central.themes.feature/pom.xml =================================================================== --- trunk/central/features/org.jboss.tools.central.themes.feature/pom.xml (rev 0) +++ trunk/central/features/org.jboss.tools.central.themes.feature/pom.xml 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.central</groupId> + <artifactId>features</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.central.features</groupId> + <artifactId>org.jboss.tools.central.themes.feature</artifactId> + + <packaging>eclipse-feature</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tychoVersion}</version> + <executions> + <execution> + <id>attached-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/central/features/org.jboss.tools.central.themes.feature/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/central/features/pom.xml =================================================================== --- trunk/central/features/pom.xml 2012-09-13 17:32:33 UTC (rev 43659) +++ trunk/central/features/pom.xml 2012-09-13 17:41:42 UTC (rev 43660) @@ -9,14 +9,15 @@ </parent> <groupId>org.jboss.tools.central</groupId> <artifactId>features</artifactId> - - <name>central.features</name> + + <name>central.features</name> <packaging>pom</packaging> <modules> <module>org.jboss.tools.central.feature</module> <module>org.jboss.tools.community.central.feature</module> <module>org.jboss.tools.central.discovery.feature</module> + <module>org.jboss.tools.central.themes.feature</module> <module>org.jboss.tools.central.test.feature</module> </modules> </project> - + Property changes on: trunk/central/plugins/org.jboss.tools.central.themes ___________________________________________________________________ Added: svn:ignore + bin Added: trunk/central/plugins/org.jboss.tools.central.themes/.classpath =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/.classpath (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/.classpath 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/.project =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/.project (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/.project 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.central.themes</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/.settings/org.eclipse.jdt.core.prefs 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Themes +Bundle-SymbolicName: org.jboss.tools.central.themes +Bundle-Version: 1.1.0.qualifier +Bundle-Activator: org.jboss.tools.central.themes.Activator +Bundle-Vendor: JBoss, by Red Hat +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.e4.ui.css.core;bundle-version="0.10.1", + org.eclipse.e4.ui.css.swt;bundle-version="0.10.1", + javax.inject;bundle-version="1.0.0", + org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.2" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/build.properties =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/build.properties (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/build.properties 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + css/,\ + icons/ Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/build.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/css/jboss.css =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/css/jboss.css (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/css/jboss.css 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,113 @@ +/* + * Chrome Theme generate css dynamically, So do not inspect this file, See "ChromeCSSGenerator.xtend" instead + */ +.jeeeyul-chrome-theme{ + /* + * This selector rule is exist for detect Chrome Theme to find rewrite target. + * See "RewriteChormeCSS.java" + */ +} + +.MTrimmedWindow.topLevel { + margin-top: 7px; + margin-bottom: 2px; + margin-left: 2px; + margin-right: 2px; +} + +.MPartStack { + font-size: 11; + font-family: 'Arial'; + swt-simple: true; + swt-tab-renderer: + url('bundleclass://org.jboss.tools.central.themes/net.jeeeyul.eclipse.themes.rendering.ChromeTabRendering'); + + padding: 1px 6px 8px 6px; /* top left bottom right */ + swt-tab-outline: #94b0bd; + swt-outer-keyline-color: #94b0bd; + swt-unselected-tabs-color: #e1eef4 #94b0bd #ffffff 99% 100%; + swt-shadow-visible: true; + + swt-selected-tab-fill: #ffffff; + chrome-selected-tab-fill-highlight: #ffffff; + + chrome-selected-tab-color: #754a4a; + chrome-unselected-tab-color: #000000; + + swt-shadow-color: #e1eef4; + + chrome-shiney-shadow: true; + swt-mru-visible: true; +} + +.MPartStack.active { + swt-inner-keyline-color: #FFFFFF; + swt-tab-outline: #4a6575; + swt-outer-keyline-color: #4a6575; + swt-unselected-tabs-color: #94aebd #4a6575 #ffffff 99% 100%; + + swt-selected-tab-fill: #ffffff; + chrome-selected-tab-fill-highlight: #e1eef4; + + chrome-selected-tab-color: #4a5d75; + chrome-unselected-tab-color: #ffffff; + chrome-shiney-shadow: false; +} + +.MPartStack.empty { + swt-unselected-tabs-color: #94aebd #94aebd #94aebd 99% 100%; + swt-tab-outline: #94aebd; + swt-outer-keyline-color: #94aebd; +} + +.MToolControl.TrimStack { + frame-image: url("./winXPTSFrame.png"); + handle-image: url("./winXPHandle.png"); + frame-cuts: 5px 1px 5px 16px; +} + +.MTrimmedWindow { + margin-top: 2px; + margin-bottom: 2px; + margin-left: 0px; + margin-right: 0px; + background-color: #e1eefa; +} + +.MTrimBar { + background-color: #e1eefa; +} + +.MTrimBar#org-eclipse-ui-main-toolbar { + background-color: #e1eef4 #94aebd; +} + +.MToolControl.TrimStack { + frame-image: url("./jeeeyul-TSFrame.png"); + handle-image: url("./jeeeyul-Handle.png"); +} + +#PerspectiveSwitcher { + eclipse-perspective-keyline-color: #4a5d75; + background-color: #9aaebd #e1eefa 100%; +} + +CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active { + swt-shadow-visible: false; +} + +CTabFolder Canvas { + background-color: #F8F8F8; +} + +#org-eclipse-ui-editorss { + swt-tab-renderer: + url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering'); + swt-unselected-tabs-color: #F0F0F0 #F0F0F0 #F0F0F0 100% 100%; + swt-outer-keyline-color: #B4B4B4; + swt-inner-keyline-color: #F0F0F0; + swt-tab-outline: #F0F0F0; + color: #F0F0F0; + swt-tab-height: 8px; + padding: 0px 5px 7px; +} Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/css/jboss.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/css/jbt.css =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/css/jbt.css (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/css/jbt.css 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,113 @@ +/* + * Chrome Theme generate css dynamically, So do not inspect this file, See "ChromeCSSGenerator.xtend" instead + */ +.jeeeyul-chrome-theme{ + /* + * This selector rule is exist for detect Chrome Theme to find rewrite target. + * See "RewriteChormeCSS.java" + */ +} + +.MTrimmedWindow.topLevel { + margin-top: 7px; + margin-bottom: 2px; + margin-left: 2px; + margin-right: 2px; +} + +.MPartStack { + font-size: 11; + font-family: 'Arial'; + swt-simple: true; + swt-tab-renderer: + url('bundleclass://net.jeeeyul.eclipse.themes/net.jeeeyul.eclipse.themes.rendering.ChromeTabRendering'); + + padding: 1px 6px 8px 6px; /* top left bottom right */ + swt-tab-outline: #b39797; + swt-outer-keyline-color: #b39797; + swt-unselected-tabs-color: #ecd2d2 #e0c3c3 #ffffff 99% 100%; + swt-shadow-visible: true; + + swt-selected-tab-fill: #ffffff; + chrome-selected-tab-fill-highlight: #ffffff; + + chrome-selected-tab-color: #000000; + chrome-unselected-tab-color: #000000; + + swt-shadow-color: #e0c2c2; + + chrome-shiney-shadow: true; + swt-mru-visible: true; +} + +.MPartStack.active { + swt-inner-keyline-color: #FFFFFF; + swt-tab-outline: #7b5d5d; + swt-outer-keyline-color: #7b5d5d; + swt-unselected-tabs-color: #b36b6b #aa5b5b #ffffff 99% 100%; + + swt-selected-tab-fill: #ffffff; + chrome-selected-tab-fill-highlight: #ffffff; + + chrome-selected-tab-color: #983030; + chrome-unselected-tab-color: #ffffff; + chrome-shiney-shadow: false; +} + +.MPartStack.empty { + swt-unselected-tabs-color: #907575 #907575 #907575 99% 100%; + swt-tab-outline: #907575; + swt-outer-keyline-color: #907575; +} + +.MToolControl.TrimStack { + frame-image: url("./winXPTSFrame.png"); + handle-image: url("./winXPHandle.png"); + frame-cuts: 5px 1px 5px 16px; +} + +.MTrimmedWindow { + margin-top: 2px; + margin-bottom: 2px; + margin-left: 0px; + margin-right: 0px; + background-color: #faefef; +} + +.MTrimBar { + background-color: #faefef; +} + +.MTrimBar#org-eclipse-ui-main-toolbar { + background-color: #e7cccc #d1b2b2; +} + +.MToolControl.TrimStack { + frame-image: url("./jeeeyul-TSFrame.png"); + handle-image: url("./jeeeyul-Handle.png"); +} + +#PerspectiveSwitcher { + eclipse-perspective-keyline-color: #ac8f8f; + background-color: #faf5f5 #faefef 100%; +} + +CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active { + swt-shadow-visible: false; +} + +CTabFolder Canvas { + background-color: #F8F8F8; +} + +#org-eclipse-ui-editorss { + swt-tab-renderer: + url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering'); + swt-unselected-tabs-color: #F0F0F0 #F0F0F0 #F0F0F0 100% 100%; + swt-outer-keyline-color: #B4B4B4; + swt-inner-keyline-color: #F0F0F0; + swt-tab-outline: #F0F0F0; + color: #F0F0F0; + swt-tab-height: 8px; + padding: 0px 5px 7px; +} Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/css/jbt.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/icons/close-active.png =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/icons/close-active.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central.themes/icons/close-normal.png =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/icons/close-normal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central.themes/pom.xml =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/pom.xml (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/pom.xml 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.central</groupId> + <artifactId>plugins</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.central.plugins</groupId> + <artifactId>org.jboss.tools.central.themes</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/CSSClasses.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/CSSClasses.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/CSSClasses.java 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,69 @@ +// Copyright 2012 Jeeeyul Lee, Seoul, Korea +// https://github.com/jeeeyul/pde-tools +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +package net.jeeeyul.eclipse.themes; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.e4.ui.css.swt.CSSSWTConstants; +import org.eclipse.swt.widgets.Widget; + +@SuppressWarnings("restriction") +public class CSSClasses { + + private List<String> classes = new ArrayList<String>(); + + public CSSClasses(String source) { + if (source != null && !source.trim().isEmpty()) + for (String name : source.split(" ")) + classes.add(name); + } + + public boolean add(String className) { + if (classes.contains(className)) + return false; + return classes.add(className); + } + + public boolean contains(String className) { + return classes.contains(className); + } + + public boolean remove(String className) { + return classes.remove(className); + } + + public static CSSClasses getStyleClasses(Widget w) { + String literal = (String) w.getData(CSSSWTConstants.CSS_CLASS_NAME_KEY); + return new CSSClasses(literal); + } + + public static void setStyleClasses(Widget w, CSSClasses newStyleClasses) { + w.setData(CSSSWTConstants.CSS_CLASS_NAME_KEY, + newStyleClasses.toString()); + } + + public String toString() { + if (classes.isEmpty()) + return ""; + Iterator<String> iter = classes.iterator(); + StringBuilder sb = new StringBuilder(iter.next()); + while (iter.hasNext()) + sb.append(" ").append(iter.next()); + return sb.toString(); + } +} \ No newline at end of file Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/CSSClasses.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/SharedImages.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/SharedImages.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/SharedImages.java 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,104 @@ +// Copyright 2012 Jeeeyul Lee, Seoul, Korea +// https://github.com/jeeeyul/pde-tools +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +package net.jeeeyul.eclipse.themes; + +import java.io.File; +import java.net.URL; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.central.themes.Activator; +import org.osgi.framework.Bundle; + +/* + * Generated by PDE Tools. + */ +public class SharedImages{ + + /** + * <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAHlJREFUKFNjONvaKgPE9lAsygAFQL4okrgMA4hzID39//7k5P9Atj8Q80OxP0gMJAdSA1YIEtgZFvZ/b0ICSDAehEFskBjUALBCkBX+MIldkZH/QRhJI8gWiJOgVsWDFGwPCABjEBtqOj/M3cQpJNpqUjxDdPAQFeAABZ7MoR/tUJQAAAAASUVORK5CYII="> + * Image constant for icons/close-active.png + */ + public static final String CLOSE_ACTIVE = "icons/close-active.png"; + + /** + * <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOvwAADr8BOAVTJAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAZ0lEQVQoU2NgIAVUVlYmAvF1INaA6QOxgfgaEGfAzYIqmgWikRSCNILE+pAVgnSDBMGKkTSC+HBbkDXAFINpnM5HMhW7QqjDYW5CNhXFgwzIbkLyDNzNyG4rgFqLHDySULFoUoKaAQCCfF8Q7f0kfgAAAABJRU5ErkJggg=="> + * Image constant for icons/close-normal.png + */ + public static final String CLOSE_NORMAL = "icons/close-normal.png"; + + private static final ImageRegistry REGISTRY = new ImageRegistry(Display.getDefault()); + + public static Image getImage(String key){ + Image result = REGISTRY.get(key); + if(result == null){ + result = loadImage(key); + REGISTRY.put(key, result); + } + return result; + } + + public static ImageDescriptor getImageDescriptor(String key){ + ImageDescriptor result = REGISTRY.getDescriptor(key); + if(result == null){ + result = loadImageDescriptor(key); + REGISTRY.put(key, result); + } + return result; + } + + private static Image loadImage(String key) { + try { + Bundle bundle = Activator.getDefault().getBundle(); + URL resource = null; + + if(bundle != null){ + resource = bundle.getResource(key); + }else{ + resource = new File(key).toURI().toURL(); + } + + Image image = new Image(null, resource.openStream()); + return image; + } catch (Exception e) { + e.printStackTrace(); + return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); + } + } + + private static ImageDescriptor loadImageDescriptor(String key) { + try { + Bundle bundle = Activator.getDefault().getBundle(); + URL resource = null; + + if(bundle != null){ + resource = bundle.getResource(key); + }else{ + resource = new File(key).toURI().toURL(); + } + + ImageDescriptor descriptor = ImageDescriptor.createFromURL(resource); + return descriptor; + } catch (Exception e) { + e.printStackTrace(); + return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_ERROR_TSK); + } + } +} Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/SharedImages.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/UpdateCTabFolderClassesJob.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/UpdateCTabFolderClassesJob.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/UpdateCTabFolderClassesJob.java 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,76 @@ +// Copyright 2012 Jeeeyul Lee, Seoul, Korea +// https://github.com/jeeeyul/pde-tools +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +package net.jeeeyul.eclipse.themes; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.e4.ui.css.swt.theme.IThemeEngine; +import org.eclipse.swt.custom.CTabFolder; +import org.eclipse.ui.progress.UIJob; + +/** + * Add "empty" class(CSS) into {@link CTabFolder} when there is no item. + */ +@SuppressWarnings("restriction") +public class UpdateCTabFolderClassesJob extends UIJob { + + private CTabFolder folder; + + public UpdateCTabFolderClassesJob(CTabFolder folder) { + super("Update CTabFolder CSS"); + this.folder = folder; + this.setSystem(true); + } + + @Override + public IStatus runInUIThread(IProgressMonitor arg0) { + if (folder == null || folder.isDisposed()) { + return Status.OK_STATUS; + } + + CSSClasses classes = CSSClasses.getStyleClasses(folder); + boolean haveToSetEmpty = folder.getItemCount() == 0; + + if (haveToSetEmpty) { + classes.add("empty"); + classes.remove("nonEmpty"); + } else { + classes.remove("empty"); + classes.add("nonEmpty"); + } + + CSSClasses.setStyleClasses(folder, classes); + getThemeEngine().applyStyles(folder, true); + + return Status.OK_STATUS; + } + + private IThemeEngine getThemeEngine() { + return (IThemeEngine) folder.getDisplay().getData( + "org.eclipse.e4.ui.css.swt.theme"); + } + + @Override + public boolean shouldSchedule() { + return folder != null && !folder.isDisposed(); + } + + @Override + public boolean shouldRun() { + return shouldSchedule(); + } +} \ No newline at end of file Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/UpdateCTabFolderClassesJob.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/ChromeTabRendering.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/ChromeTabRendering.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/ChromeTabRendering.java 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,141 @@ +// Copyright 2012 Jeeeyul Lee, Seoul, Korea +// https://github.com/jeeeyul/pde-tools +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +package net.jeeeyul.eclipse.themes.rendering; + +import java.util.HashSet; +import java.util.Set; + +import javax.inject.Inject; + +import net.jeeeyul.eclipse.themes.CSSClasses; +import net.jeeeyul.eclipse.themes.UpdateCTabFolderClassesJob; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CTabFolder; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; + +public class ChromeTabRendering extends HackedCTabRendering { + + private CTabFolder tabFolder; + private int lastKnownTabHeight = -1; + + private static Set<ChromeTabRendering> INSTANCES = new HashSet<ChromeTabRendering>(); + + public static Set<ChromeTabRendering> getInstances() { + return INSTANCES; + } + + private UpdateCTabFolderClassesJob updateTags; + + private boolean showShineyShadow; + + @Inject + public ChromeTabRendering(CTabFolder tabFolder) { + super(tabFolder); + this.tabFolder = tabFolder; + updateTags = new UpdateCTabFolderClassesJob(tabFolder); + + tabFolder.addListener(SWT.Selection, new Listener() { + @Override + public void handleEvent(Event event) { + updateEmptyClassIfNeeded(); + } + }); + + tabFolder.addListener(SWT.Dispose, new Listener() { + @Override + public void handleEvent(Event event) { + INSTANCES.remove(this); + } + }); + + INSTANCES.add(this); + } + + public void applyChromeThemePreference() { + } + + @Override + protected void dispose() { + super.dispose(); + } + + @Override + protected void draw(int part, int state, Rectangle bounds, GC gc) { + if (parent.isDisposed() || gc.isDisposed()) { + return; + } + + updateEmptyClassIfNeeded(); + + if (part == PART_BODY && !isPreviewingTab()) { + /* + * 7: Editor area - Minimize / maximize look brocken + * https://github.com/jeeeyul/eclipse-themes/issues/issue/7 + * + * Calculated tab height of empty tab seens to cause this problems. + */ + if (tabFolder.getItemCount() == 0) { + if (lastKnownTabHeight < 0) { + lastKnownTabHeight = tabFolder.getFont().getFontData()[0] + .getHeight() + 19; + } + tabFolder.setTabHeight(lastKnownTabHeight); + } else { + tabFolder.setTabHeight(-1); + lastKnownTabHeight = tabFolder.getTabHeight(); + } + } + + super.draw(part, state, bounds, gc); + } + + private boolean isPreviewingTab() { + CSSClasses tags = CSSClasses.getStyleClasses(tabFolder); + return tags.contains("chrome-tabfolder-preview"); + } + + public boolean isShowShineyShadow() { + return showShineyShadow; + } + + public void setShowShineyShadow(boolean showShineyShadow) { + this.showShineyShadow = showShineyShadow; + } + + @Override + protected boolean showUnselectedTabItemShadow() { + return showShineyShadow; + } + + private void updateEmptyClassIfNeeded() { + CSSClasses tags = CSSClasses.getStyleClasses(tabFolder); + + boolean haveToSetEmpty = tabFolder.getItemCount() == 0; + + if (haveToSetEmpty && !tags.contains("empty")) { + updateTags.schedule(); + updateItems(); + } else if (!haveToSetEmpty && !tags.contains("nonEmpty")) { + updateTags.schedule(); + updateItems(); + } + } + +} \ No newline at end of file Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/ChromeTabRendering.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/HackedCTabRendering.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/HackedCTabRendering.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/HackedCTabRendering.java 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,1343 @@ +// Copyright 2012 Jeeeyul Lee, Seoul, Korea +// https://github.com/jeeeyul/pde-tools +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +package net.jeeeyul.eclipse.themes.rendering; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import javax.inject.Inject; + +import net.jeeeyul.eclipse.themes.SharedImages; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CTabFolder; +import org.eclipse.swt.custom.CTabFolderRenderer; +import org.eclipse.swt.custom.CTabItem; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.ImageData; +import org.eclipse.swt.graphics.PaletteData; +import org.eclipse.swt.graphics.Pattern; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.graphics.Region; +import org.eclipse.swt.graphics.TextLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Widget; + +public class HackedCTabRendering extends CTabFolderRenderer { + public static Field HACK_CTabItem_closeRect; + public static Field HACK_CTabItem_shortenText; + public static Field HACK_CTabItem_shortenTextWidth; + public static Field HACK_CTabItem_closeImageState; + public static Field HACK_CTabFolder_curveWidth; + public static Field HACK_CTabFolder_curveIndent; + + public static Method HACK_CTabFolder_getRightItemEdge; + public static Method HACK_CTabFolder_updateItems; + + static { + try { + HACK_CTabItem_closeRect = CTabItem.class + .getDeclaredField("closeRect"); + HACK_CTabItem_closeRect.setAccessible(true); + + HACK_CTabItem_shortenText = CTabItem.class + .getDeclaredField("shortenedText"); + HACK_CTabItem_shortenText.setAccessible(true); + + HACK_CTabItem_shortenTextWidth = CTabItem.class + .getDeclaredField("shortenedTextWidth"); + HACK_CTabItem_shortenTextWidth.setAccessible(true); + + HACK_CTabItem_closeImageState = CTabItem.class + .getDeclaredField("closeImageState"); + HACK_CTabItem_closeImageState.setAccessible(true); + + HACK_CTabFolder_curveWidth = CTabFolderRenderer.class + .getDeclaredField("curveWidth"); + HACK_CTabFolder_curveWidth.setAccessible(true); + + HACK_CTabFolder_curveIndent = CTabFolderRenderer.class + .getDeclaredField("curveIndent"); + HACK_CTabFolder_curveIndent.setAccessible(true); + + HACK_CTabFolder_getRightItemEdge = CTabFolder.class + .getDeclaredMethod("getRightItemEdge", GC.class); + HACK_CTabFolder_getRightItemEdge.setAccessible(true); + + HACK_CTabFolder_updateItems = CTabFolder.class + .getDeclaredMethod("updateItems"); + HACK_CTabFolder_updateItems.setAccessible(true); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + // Constants for circle drawing + final static int LEFT_TOP = 0; + + final static int LEFT_BOTTOM = 1; + + final static int RIGHT_TOP = 2; + + final static int RIGHT_BOTTOM = 3; + + // drop shadow constants + final static int SIDE_DROP_WIDTH = 3; + + final static int BOTTOM_DROP_WIDTH = 4; + + // keylines + final static int OUTER_KEYLINE = 1; + + final static int INNER_KEYLINE = 0; + + final static int TOP_KEYLINE = 0; + + // Item Constants + static final int ITEM_TOP_MARGIN = 2; + + static final int ITEM_BOTTOM_MARGIN = 6; + static final int ITEM_LEFT_MARGIN = 4; + static final int ITEM_RIGHT_MARGIN = 4; + static final int INTERNAL_SPACING = 4; + + static final String E4_SHADOW_IMAGE = "org.eclipse.e4.renderer.shadow_image"; //$NON-NLS-1$ + static final String E4_TOOLBAR_ACTIVE_IMAGE = "org.eclipse.e4.renderer.toolbar_background_active_image"; //$NON-NLS-1$ + + static final String E4_TOOLBAR_INACTIVE_IMAGE = "org.eclipse.e4.renderer.toolbar_background_inactive_image"; //$NON-NLS-1$ + + static int blend(int v1, int v2, int ratio) { + int b = (ratio * v1 + (100 - ratio) * v2) / 100; + return Math.min(255, b); + } + + static RGB blend(RGB c1, RGB c2, int ratio) { + int r = blend(c1.red, c2.red, ratio); + int g = blend(c1.green, c2.green, ratio); + int b = blend(c1.blue, c2.blue, ratio); + return new RGB(r, g, b); + } + + static int[] drawCircle(int xC, int yC, int r, int circlePart) { + int x = 0, y = r, u = 1, v = 2 * r - 1, e = 0; + int[] points = new int[1024]; + int[] pointsMirror = new int[1024]; + int loop = 0; + int loopMirror = 0; + while (x < y) { + if (circlePart == RIGHT_BOTTOM) { + points[loop++] = xC + x; + points[loop++] = yC + y; + } + if (circlePart == RIGHT_TOP) { + points[loop++] = xC + y; + points[loop++] = yC - x; + } + if (circlePart == LEFT_TOP) { + points[loop++] = xC - x; + points[loop++] = yC - y; + } + if (circlePart == LEFT_BOTTOM) { + points[loop++] = xC - y; + points[loop++] = yC + x; + } + x++; + e += u; + u += 2; + if (v < 2 * e) { + y--; + e -= v; + v -= 2; + } + if (x > y) + break; + if (circlePart == RIGHT_BOTTOM) { + pointsMirror[loopMirror++] = xC + y; + pointsMirror[loopMirror++] = yC + x; + } + if (circlePart == RIGHT_TOP) { + pointsMirror[loopMirror++] = xC + x; + pointsMirror[loopMirror++] = yC - y; + } + if (circlePart == LEFT_TOP) { + pointsMirror[loopMirror++] = xC - y; + pointsMirror[loopMirror++] = yC - x; + } + if (circlePart == LEFT_BOTTOM) { + pointsMirror[loopMirror++] = xC - x; + pointsMirror[loopMirror++] = yC + y; + } + // grow? + if ((loop + 1) > points.length) { + int length = points.length * 2; + int[] newPointTable = new int[length]; + int[] newPointTableMirror = new int[length]; + System.arraycopy(points, 0, newPointTable, 0, points.length); + points = newPointTable; + System.arraycopy(pointsMirror, 0, newPointTableMirror, 0, + pointsMirror.length); + pointsMirror = newPointTableMirror; + } + } + int[] finalArray = new int[loop + loopMirror]; + System.arraycopy(points, 0, finalArray, 0, loop); + for (int i = loopMirror - 1, j = loop; i > 0; i = i - 2, j = j + 2) { + int tempY = pointsMirror[i]; + int tempX = pointsMirror[i - 1]; + finalArray[j] = tempX; + finalArray[j + 1] = tempY; + } + return finalArray; + } + + int[] shape; + Image shadowImage, toolbarActiveImage, toolbarInactiveImage; + int cornerSize = 14; + boolean shadowEnabled = true; + + Color shadowColor; + Color outerKeyline, innerKeyline; + Color[] activeToolbar; + + int[] activePercents; + + Color[] inactiveToolbar; + + int[] inactivePercents; + + boolean active; + Color selectedTabFillColor; + Color tabOutlineColor; + int paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0; + + protected Color selectedTabItemColor; + protected Color unselectedTabItemColor; + protected Color selectedTabFillHighlightColor; + + @Inject + public HackedCTabRendering(CTabFolder parent) { + super(parent); + } + + void _drawClose(GC gc, Rectangle closeRect, int closeImageState) { + if (closeRect.width == 0 || closeRect.height == 0) + return; + + // draw X 9x9 + int x = closeRect.x + Math.max(1, (closeRect.width - 9) / 2); + int y = closeRect.y + Math.max(1, (closeRect.height - 9) / 2); + y += parent.getTabPosition() == SWT.BOTTOM ? -1 : 1; + + switch (closeImageState & (SWT.HOT | SWT.SELECTED | SWT.BACKGROUND)) { + case SWT.NONE: { + gc.drawImage(SharedImages.getImage(SharedImages.CLOSE_NORMAL), x, y); + break; + } + case SWT.HOT: { + gc.drawImage(SharedImages.getImage(SharedImages.CLOSE_ACTIVE), x, y); + break; + } + case SWT.SELECTED: { + gc.drawImage(SharedImages.getImage(SharedImages.CLOSE_ACTIVE), + x + 1, y + 1); + break; + } + case SWT.BACKGROUND: { + gc.drawImage(SharedImages.getImage(SharedImages.CLOSE_NORMAL), x, y); + break; + } + } + } + + String _shortenText(GC gc, String text, int width) { + return parent.getSimple() ? _shortenText(gc, text, width, "...") : _shortenText(gc, text, width, ""); //$NON-NLS-1$ + } + + String _shortenText(GC gc, String text, int width, String ellipses) { + if (gc.textExtent(text, SWT.DRAW_TRANSPARENT | SWT.DRAW_MNEMONIC).x <= width) + return text; + int ellipseWidth = gc.textExtent(ellipses, SWT.DRAW_TRANSPARENT + | SWT.DRAW_MNEMONIC).x; + int length = text.length(); + TextLayout layout = new TextLayout(parent.getDisplay()); + layout.setText(text); + int end = layout.getPreviousOffset(length, SWT.MOVEMENT_CLUSTER); + while (end > 0) { + text = text.substring(0, end); + int l = gc.textExtent(text, SWT.DRAW_TRANSPARENT + | SWT.DRAW_MNEMONIC).x; + if (l + ellipseWidth <= width) { + break; + } + end = layout.getPreviousOffset(end, SWT.MOVEMENT_CLUSTER); + } + layout.dispose(); + return end == 0 ? text.substring(0, 1) : text + ellipses; + } + + public ImageData blur(Image src, int radius, int sigma) { + float[] kernel = create1DKernel(radius, sigma); + + ImageData imgPixels = src.getImageData(); + int width = imgPixels.width; + int height = imgPixels.height; + + int[] inPixels = new int[width * height]; + int[] outPixels = new int[width * height]; + int offset = 0; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + RGB rgb = imgPixels.palette.getRGB(imgPixels.getPixel(x, y)); + if (rgb.red == 255 && rgb.green == 255 && rgb.blue == 255) { + inPixels[offset] = (rgb.red << 16) | (rgb.green << 8) + | rgb.blue; + } else { + inPixels[offset] = (imgPixels.getAlpha(x, y) << 24) + | (rgb.red << 16) | (rgb.green << 8) | rgb.blue; + } + offset++; + } + } + + convolve(kernel, inPixels, outPixels, width, height, true); + convolve(kernel, outPixels, inPixels, height, width, true); + + ImageData dst = new ImageData(imgPixels.width, imgPixels.height, 24, + new PaletteData(0xff0000, 0xff00, 0xff)); + + dst.setPixels(0, 0, inPixels.length, inPixels, 0); + offset = 0; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + if (inPixels[offset] == -1) { + dst.setAlpha(x, y, 0); + } else { + int a = (inPixels[offset] >> 24) & 0xff; + // if (a < 150) a = 0; + dst.setAlpha(x, y, a); + } + offset++; + } + } + return dst; + } + + private int clamp(int value) { + if (value > 255) + return 255; + if (value < 0) + return 0; + return value; + } + + protected Point computeSize(int part, int state, GC gc, int wHint, int hHint) { + wHint += paddingLeft + paddingRight; + hHint += paddingTop + paddingBottom; + if (0 <= part && part < parent.getItemCount()) { + gc.setAdvanced(true); + Point result = super.computeSize(part, state, gc, wHint, hHint); + gc.setAdvanced(false); + return result; + } + return super.computeSize(part, state, gc, wHint, hHint); + } + + protected Rectangle computeTrim(int part, int state, int x, int y, + int width, int height) { + GC gc = new GC(parent); + gc.dispose(); + int borderTop = TOP_KEYLINE + OUTER_KEYLINE; + int borderBottom = INNER_KEYLINE + OUTER_KEYLINE; + int marginHeight = parent.marginHeight; + int sideDropWidth = shadowEnabled ? SIDE_DROP_WIDTH : 0; + switch (part) { + case PART_BODY: + x = -1 - paddingLeft; + int tabHeight = parent.getTabHeight() + 1; + y = y - paddingTop - marginHeight - tabHeight - borderTop + - (cornerSize / 4); + width = 2 + paddingLeft + paddingRight; + height += paddingTop + paddingBottom; + height += tabHeight + (cornerSize / 4) + borderBottom + borderTop; + break; + case PART_HEADER: + x = x - (INNER_KEYLINE + OUTER_KEYLINE) - sideDropWidth; + width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth); + break; + case PART_BORDER: + x = x - INNER_KEYLINE - OUTER_KEYLINE - sideDropWidth + - (cornerSize / 4); + width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth) + + cornerSize / 2; + y = y - borderTop; + height = height + borderTop + borderBottom; + break; + default: + if (0 <= part && part < parent.getItemCount()) { + x = x - ITEM_LEFT_MARGIN;// - (CORNER_SIZE/2); + width = width + ITEM_LEFT_MARGIN + ITEM_RIGHT_MARGIN + 1; + y = y - ITEM_TOP_MARGIN; + height = height + ITEM_TOP_MARGIN + ITEM_BOTTOM_MARGIN; + } + break; + } + return new Rectangle(x, y, width, height); + } + + private void convolve(float[] kernel, int[] inPixels, int[] outPixels, + int width, int height, boolean alpha) { + int kernelWidth = kernel.length; + int kernelMid = kernelWidth / 2; + for (int y = 0; y < height; y++) { + int index = y; + int currentLine = y * width; + for (int x = 0; x < width; x++) { + // do point + float a = 0, r = 0, g = 0, b = 0; + for (int k = -kernelMid; k <= kernelMid; k++) { + float val = kernel[k + kernelMid]; + int xcoord = x + k; + if (xcoord < 0) + xcoord = 0; + if (xcoord >= width) + xcoord = width - 1; + int pixel = inPixels[currentLine + xcoord]; + // float alp = ((pixel >> 24) & 0xff); + a += val * ((pixel >> 24) & 0xff); + r += val * (((pixel >> 16) & 0xff)); + g += val * (((pixel >> 8) & 0xff)); + b += val * (((pixel) & 0xff)); + } + int ia = alpha ? clamp((int) (a + 0.5)) : 0xff; + int ir = clamp((int) (r + 0.5)); + int ig = clamp((int) (g + 0.5)); + int ib = clamp((int) (b + 0.5)); + outPixels[index] = (ia << 24) | (ir << 16) | (ig << 8) | ib; + index += height; + } + } + + } + + private float[] create1DKernel(int radius, int sigma) { + // guideline: 3*sigma should be the radius + int size = radius * 2 + 1; + float[] kernel = new float[size]; + int radiusSquare = radius * radius; + float sigmaSquare = 2 * sigma * sigma; + float piSigma = 2 * (float) Math.PI * sigma; + float sqrtSigmaPi2 = (float) Math.sqrt(piSigma); + int start = size / 2; + int index = 0; + float total = 0; + for (int i = -start; i <= start; i++) { + float d = i * i; + if (d > radiusSquare) { + kernel[index] = 0; + } else { + kernel[index] = (float) Math.exp(-(d) / sigmaSquare) + / sqrtSigmaPi2; + } + total += kernel[index]; + index++; + } + for (int i = 0; i < size; i++) { + kernel[i] /= total; + } + return kernel; + } + + void createShadow(final Display display, boolean recreate) { + Object obj = display.getData(E4_SHADOW_IMAGE); + if (obj != null && !recreate) { + shadowImage = (Image) obj; + } else { + ImageData data = new ImageData(60, 60, 32, new PaletteData( + 0xFF0000, 0xFF00, 0xFF)); + Image tmpImage = shadowImage = new Image(display, data); + GC gc = new GC(tmpImage); + if (shadowColor == null) + shadowColor = gc.getDevice().getSystemColor(SWT.COLOR_GRAY); + gc.setBackground(shadowColor); + drawTabBody(gc, new Rectangle(0, 0, 60, 60), SWT.None); + ImageData blured = blur(tmpImage, 5, 25); + shadowImage = new Image(display, blured); + display.setData(E4_SHADOW_IMAGE, shadowImage); + tmpImage.dispose(); + display.disposeExec(new Runnable() { + public void run() { + Object obj = display.getData(E4_SHADOW_IMAGE); + if (obj != null) { + Image tmp = (Image) obj; + tmp.dispose(); + display.setData(E4_SHADOW_IMAGE, null); + } + } + }); + } + } + + protected void dispose() { + super.dispose(); + } + + protected void draw(int part, int state, Rectangle bounds, GC gc) { + switch (part) { + + case PART_BODY: + this.drawTabBody(gc, bounds, state); + return; + case PART_HEADER: + this.drawTabHeader(gc, bounds, state); + return; + default: + if (0 <= part && part < parent.getItemCount()) { + if (bounds.width == 0 || bounds.height == 0) + return; + gc.setAdvanced(true); + + if ((state & SWT.SELECTED) != 0) { + drawSelectedTabItemBackground(part, gc, bounds, state); + state &= ~SWT.BACKGROUND; + drawSelectedTabItem(part, gc, bounds, state); + } else { + drawUnselectedTabItemBackground(part, gc, bounds, state); + + if ((state & SWT.HOT) == 0 && !active) { + state &= ~SWT.BACKGROUND; + drawUnselectedTabItem(part, gc, bounds, state); + } else { + state &= ~SWT.BACKGROUND; + drawUnselectedTabItem(part, gc, bounds, state); + } + } + + gc.setAdvanced(false); + return; + } + } + super.draw(part, state, bounds, gc); + } + + protected void drawSelectedTabItem(int itemIndex, GC gc, Rectangle bounds, + int state) { + CTabItem item = parent.getItem(itemIndex); + int x = bounds.x; + int y = bounds.y; + int height = bounds.height; + int width = bounds.width; + if (!parent.getSimple() && !parent.getSingle()) + width -= (getCurveWidth() - getCurveIndent()); + + int rightEdge = Math.min(x + width, getRightItemEdge(parent, gc)); + // Draw selection border across all tabs + + // draw Image + Rectangle trim = computeTrim(itemIndex, SWT.NONE, 0, 0, 0, 0); + int xDraw = x - trim.x; + if (parent.getSingle() + && (hasStyle(parent, SWT.CLOSE) || hasStyle(item, SWT.CLOSE))) + xDraw += getCloseRect(item).width; + Image image = item.getImage(); + if (image != null && !image.isDisposed()) { + Rectangle imageBounds = image.getBounds(); + // only draw image if it won't overlap with close button + int maxImageWidth = rightEdge - xDraw - (trim.width + trim.x); + if (!parent.getSingle() && getCloseRect(item).width > 0) + maxImageWidth -= getCloseRect(item).width + INTERNAL_SPACING; + if (imageBounds.width < maxImageWidth) { + int imageX = xDraw; + int imageY = y + (height - imageBounds.height) / 2; + imageY += parent.getTabPosition() == SWT.BOTTOM ? -1 : 1; + gc.drawImage(image, imageX, imageY); + xDraw += imageBounds.width + INTERNAL_SPACING; + } + } + + // draw Text + int textWidth = rightEdge - xDraw - (trim.width + trim.x); + if (!parent.getSingle() && getCloseRect(item).width > 0) + textWidth -= getCloseRect(item).width + INTERNAL_SPACING; + if (textWidth > 0) { + Font gcFont = gc.getFont(); + gc.setFont(item.getFont() == null ? parent.getFont() : item + .getFont()); + + if (getShortenText(item) == null + || getShortenTextWidth(item) != textWidth) { + setShortenText(item, + _shortenText(gc, item.getText(), textWidth)); + setShortenTextWidth(item, textWidth); + } + Point extent = gc.textExtent(getShortenText(item), + SWT.DRAW_TRANSPARENT | SWT.DRAW_MNEMONIC); + int textY = y + (height - extent.y) / 2; + textY += parent.getTabPosition() == SWT.BOTTOM ? -1 : 1; + + if (selectedTabItemColor != null) { + gc.setForeground(selectedTabItemColor); + } else { + gc.setForeground(parent.getSelectionForeground()); + } + + gc.drawText(getShortenText(item), xDraw, textY, + SWT.DRAW_TRANSPARENT | SWT.DRAW_MNEMONIC); + gc.setFont(gcFont); + + // draw a Focus rectangle + if (parent.isFocusControl()) { + Display display = parent.getDisplay(); + if (parent.getSimple() || parent.getSingle()) { + gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK)); + gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE)); + gc.drawFocus(xDraw - 1, textY - 1, extent.x + 2, + extent.y + 2); + } else { + gc.setForeground(display + .getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW)); + gc.drawLine(xDraw, textY + extent.y + 1, xDraw + extent.x + + 1, textY + extent.y + 1); + } + } + } + if (hasStyle(parent, SWT.CLOSE) || hasStyle(item, SWT.CLOSE)) + _drawClose(gc, getCloseRect(item), getCloseImageState(item)); + } + + protected void drawSelectedTabItemBackground(int itemIndex, GC gc, + Rectangle bounds, int state) { + if (parent.getSingle() && parent.getItem(itemIndex).isShowing()) + return; + + int width = bounds.width; + int[] points = new int[1024]; + int index = 0; + int radius = cornerSize / 2; + int circX = bounds.x + radius; + int circY = bounds.y - 1 + radius; + int selectionX1, selectionY1, selectionX2, selectionY2; + if ((itemIndex == 0 || bounds.x <= 5) + && bounds.x == -computeTrim(CTabFolderRenderer.PART_HEADER, + SWT.NONE, 0, 0, 0, 0).x) { + circX -= 1; + points[index++] = circX - radius; + points[index++] = bounds.y + bounds.height; + + points[index++] = selectionX1 = circX - radius; + points[index++] = selectionY1 = bounds.y + bounds.height; + } else { + if (active) { + points[index++] = shadowEnabled ? SIDE_DROP_WIDTH : 0 + + INNER_KEYLINE + OUTER_KEYLINE; + points[index++] = bounds.y + bounds.height; + } + points[index++] = selectionX1 = bounds.x; + points[index++] = selectionY1 = bounds.y + bounds.height; + } + int[] ltt = drawCircle(circX, circY, radius, LEFT_TOP); + int startX = ltt[6]; + for (int i = 0; i < ltt.length / 2; i += 2) { + int tmp = ltt[i]; + ltt[i] = ltt[ltt.length - i - 2]; + ltt[ltt.length - i - 2] = tmp; + tmp = ltt[i + 1]; + ltt[i + 1] = ltt[ltt.length - i - 1]; + ltt[ltt.length - i - 1] = tmp; + } + System.arraycopy(ltt, 0, points, index, ltt.length); + index += ltt.length; + + int[] rt = drawCircle(circX + width - (radius * 2), circY, radius, + RIGHT_TOP); + int endX = rt[rt.length - 4]; + for (int i = 0; i < rt.length / 2; i += 2) { + int tmp = rt[i]; + rt[i] = rt[rt.length - i - 2]; + rt[rt.length - i - 2] = tmp; + tmp = rt[i + 1]; + rt[i + 1] = rt[rt.length - i - 1]; + rt[rt.length - i - 1] = tmp; + } + System.arraycopy(rt, 0, points, index, rt.length); + index += rt.length; + + points[index++] = selectionX2 = bounds.width + circX - radius; + points[index++] = selectionY2 = bounds.y + bounds.height; + + if (active) { + points[index++] = parent.getSize().x + - (shadowEnabled ? SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + + OUTER_KEYLINE); + points[index++] = bounds.y + bounds.height; + } + gc.setClipping(0, bounds.y, parent.getSize().x + - (shadowEnabled ? SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + + OUTER_KEYLINE), bounds.y + bounds.height);// bounds.height + // + + // 4); + if (selectedTabFillColor == null) + selectedTabFillColor = gc.getDevice().getSystemColor( + SWT.COLOR_WHITE); + gc.setBackground(selectedTabFillColor); + gc.setForeground(selectedTabFillColor); + Pattern backgroundPattern = null; + + if (selectedTabFillHighlightColor != null) { + backgroundPattern = new Pattern(gc.getDevice(), 0, 0, 0, + bounds.height + 1, selectedTabFillHighlightColor, + selectedTabFillColor); + gc.setBackgroundPattern(backgroundPattern); + } + + int[] tmpPoints = new int[index]; + System.arraycopy(points, 0, tmpPoints, 0, index); + + gc.fillPolygon(translate(tmpPoints, 1, 1)); + gc.drawLine(selectionX1, selectionY1, selectionX2, selectionY2); + if (tabOutlineColor == null) + tabOutlineColor = gc.getDevice().getSystemColor(SWT.COLOR_BLACK); + gc.setForeground(tabOutlineColor); + Color gradientLineTop = null; + Pattern foregroundPattern = null; + if (!active) { + RGB blendColor = gc.getDevice() + .getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW).getRGB(); + RGB topGradient = blend(blendColor, tabOutlineColor.getRGB(), 40); + gradientLineTop = new Color(gc.getDevice(), topGradient); + foregroundPattern = new Pattern(gc.getDevice(), 0, 0, 0, + bounds.height + 1, gradientLineTop, gc.getDevice() + .getSystemColor(SWT.COLOR_WHITE)); + gc.setForegroundPattern(foregroundPattern); + } + gc.drawPolyline(tmpPoints); + Rectangle rect = null; + gc.setClipping(rect); + + if (active) { + if (outerKeyline == null) + outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_RED); + gc.setForeground(outerKeyline); + gc.drawPolyline(shape); + } else { + gc.drawLine(startX, 0, endX, 0); + if (backgroundPattern != null) + backgroundPattern.dispose(); + if (gradientLineTop != null) + gradientLineTop.dispose(); + if (foregroundPattern != null) + foregroundPattern.dispose(); + + } + } + + void drawShadow(final Display display, Rectangle bounds, GC gc) { + if (shadowImage == null) { + createShadow(display, true); + } + + int x = bounds.x; + int y = bounds.y; + int SIZE = shadowImage.getBounds().width / 3; + + int height = Math.max(bounds.height, SIZE * 2); + int width = Math.max(bounds.width, SIZE * 2); + // top left + gc.drawImage(shadowImage, 0, 0, SIZE, SIZE, 2, 10, SIZE, 20); + int fillHeight = height - SIZE * 2; + int fillWidth = width + 5 - SIZE * 2; + + int xFill = 0; + for (int i = SIZE; i < fillHeight; i += SIZE) { + xFill = i; + gc.drawImage(shadowImage, 0, SIZE, SIZE, SIZE, 2, i, SIZE, SIZE); + } + + // Pad the rest of the shadow + gc.drawImage(shadowImage, 0, SIZE, SIZE, fillHeight - xFill, 2, xFill + + SIZE, SIZE, fillHeight - xFill); + + // bl + gc.drawImage(shadowImage, 0, 40, 20, 20, 2, y + height - SIZE, 20, 20); + + int yFill = 0; + for (int i = SIZE; i <= fillWidth; i += SIZE) { + yFill = i; + gc.drawImage(shadowImage, SIZE, SIZE * 2, SIZE, SIZE, i, y + height + - SIZE, SIZE, SIZE); + } + // Pad the rest of the shadow + gc.drawImage(shadowImage, SIZE, SIZE * 2, fillWidth - yFill, SIZE, + yFill + SIZE, y + height - SIZE, fillWidth - yFill, SIZE); + + // br + gc.drawImage(shadowImage, SIZE * 2, SIZE * 2, SIZE, SIZE, x + width + - SIZE - 1, y + height - SIZE, SIZE, SIZE); + + // tr + gc.drawImage(shadowImage, (SIZE * 2), 0, SIZE, SIZE, x + width - SIZE + - 1, 10, SIZE, SIZE); + + xFill = 0; + for (int i = SIZE; i < fillHeight; i += SIZE) { + xFill = i; + gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, SIZE, x + width + - SIZE - 1, i, SIZE, SIZE); + } + + // Pad the rest of the shadow + gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, fillHeight - xFill, x + + width - SIZE - 1, xFill + SIZE, SIZE, fillHeight - xFill); + } + + void drawTabBody(GC gc, Rectangle bounds, int state) { + int[] points = new int[1024]; + int index = 0; + int radius = cornerSize / 2; + int marginWidth = parent.marginWidth; + int marginHeight = parent.marginHeight; + int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 + * (shadowEnabled ? SIDE_DROP_WIDTH : 0) + 2 * marginWidth; + int width = bounds.width - delta; + int height = Math.max(parent.getTabHeight() + INNER_KEYLINE + + OUTER_KEYLINE + (shadowEnabled ? BOTTOM_DROP_WIDTH : 0), + bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2 + * marginHeight + - (shadowEnabled ? BOTTOM_DROP_WIDTH : 0)); + + int circX = bounds.x + delta / 2 + radius; + int circY = bounds.y + radius; + + // Body + index = 0; + int[] ltt = drawCircle(circX, circY, radius, LEFT_TOP); + System.arraycopy(ltt, 0, points, index, ltt.length); + index += ltt.length; + + int[] lbb = drawCircle(circX, circY + height - (radius * 2), radius, + LEFT_BOTTOM); + System.arraycopy(lbb, 0, points, index, lbb.length); + index += lbb.length; + + int[] rb = drawCircle(circX + width - (radius * 2), circY + height + - (radius * 2), radius, RIGHT_BOTTOM); + System.arraycopy(rb, 0, points, index, rb.length); + index += rb.length; + + int[] rt = drawCircle(circX + width - (radius * 2), circY, radius, + RIGHT_TOP); + System.arraycopy(rt, 0, points, index, rt.length); + index += rt.length; + points[index++] = circX; + points[index++] = circY - radius; + + int[] tempPoints = new int[index]; + System.arraycopy(points, 0, tempPoints, 0, index); + gc.fillPolygon(tempPoints); + + // Fill in parent background for non-rectangular shape + Region r = new Region(); + r.add(bounds); + r.subtract(tempPoints); + gc.setBackground(parent.getParent().getBackground()); + Display display = parent.getDisplay(); + Region clipping = new Region(); + gc.getClipping(clipping); + r.intersect(clipping); + gc.setClipping(r); + Rectangle mappedBounds = display + .map(parent, parent.getParent(), bounds); + + parent.getParent().drawBackground(gc, bounds.x, bounds.y, bounds.width, + bounds.height, mappedBounds.x, mappedBounds.y); + + // Shadow + if (shadowEnabled) + drawShadow(display, bounds, gc); + + gc.setClipping(clipping); + clipping.dispose(); + r.dispose(); + + // Remember for use in header drawing + shape = tempPoints; + } + + void drawTabHeader(GC gc, Rectangle bounds, int state) { + int[] points = new int[1024]; + int index = 0; + int radius = cornerSize / 2; + int marginWidth = parent.marginWidth; + int marginHeight = parent.marginHeight; + int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 + * (shadowEnabled ? SIDE_DROP_WIDTH : 0) + 2 * marginWidth; + int width = bounds.width - delta; + int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2 + * marginHeight - (shadowEnabled ? BOTTOM_DROP_WIDTH : 0); + int circX = bounds.x + delta / 2 + radius; + int circY = bounds.y + radius; + + // Fill in background + Region clipping = new Region(); + gc.getClipping(clipping); + Region region = new Region(); + region.add(shape); + region.intersect(clipping); + gc.setClipping(region); + + int header = 3; // TODO: this needs to be added to computeTrim for + // HEADER + Rectangle trim = computeTrim(PART_HEADER, state, 0, 0, 0, 0); + trim.width = bounds.width - trim.width; + trim.height = (parent.getTabHeight() + 1 + header) - trim.height; + trim.x = -trim.x; + trim.y = -trim.y; + + draw(PART_BACKGROUND, SWT.NONE, trim, gc); + + gc.setClipping(clipping); + clipping.dispose(); + region.dispose(); + + int[] ltt = drawCircle(circX + 1, circY + 1, radius, LEFT_TOP); + System.arraycopy(ltt, 0, points, index, ltt.length); + index += ltt.length; + + int[] lbb = drawCircle(circX + 1, circY + height - (radius * 2) - 2, + radius, LEFT_BOTTOM); + System.arraycopy(lbb, 0, points, index, lbb.length); + index += lbb.length; + + int[] rb = drawCircle(circX + width - (radius * 2) - 2, circY + height + - (radius * 2) - 2, radius, RIGHT_BOTTOM); + System.arraycopy(rb, 0, points, index, rb.length); + index += rb.length; + + int[] rt = drawCircle(circX + width - (radius * 2) - 2, circY + 1, + radius, RIGHT_TOP); + System.arraycopy(rt, 0, points, index, rt.length); + index += rt.length; + points[index++] = points[0]; + points[index++] = points[1]; + + int[] tempPoints = new int[index]; + System.arraycopy(points, 0, tempPoints, 0, index); + + if (outerKeyline == null) + outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK); + gc.setForeground(outerKeyline); + gc.drawPolyline(shape); + } + + protected void drawUnselectedTabItem(int index, GC gc, Rectangle bounds, + int state) { + try { + CTabItem item = parent.getItem(index); + int x = bounds.x; + int y = bounds.y; + int height = bounds.height; + int width = bounds.width; + + // Do not draw partial items + if (!item.isShowing()) + return; + + Rectangle clipping = gc.getClipping(); + if (!clipping.intersects(bounds)) + return; + + if ((state & SWT.FOREGROUND) != 0) { + // draw Image + Rectangle trim = computeTrim(index, SWT.NONE, 0, 0, 0, 0); + int xDraw = x - trim.x; + Image image = item.getImage(); + if (image != null && !image.isDisposed() + && parent.getUnselectedImageVisible()) { + Rectangle imageBounds = image.getBounds(); + // only draw image if it won't overlap with close button + int maxImageWidth = x + width - xDraw + - (trim.width + trim.x); + if (parent.getUnselectedCloseVisible() + && ((parent.getStyle() & SWT.CLOSE) != 0 || item + .getShowClose())) { + maxImageWidth -= ((Rectangle) HACK_CTabItem_closeRect + .get(item)).width + 4; + } + if (imageBounds.width < maxImageWidth) { + int imageX = xDraw; + int imageHeight = imageBounds.height; + int imageY = y + (height - imageHeight) / 2; + imageY += parent.getTabPosition() == SWT.BOTTOM ? -1 + : 1; + int imageWidth = imageBounds.width * imageHeight + / imageBounds.height; + gc.drawImage(image, imageBounds.x, imageBounds.y, + imageBounds.width, imageBounds.height, imageX, + imageY, imageWidth, imageHeight); + xDraw += imageWidth + 4; + } + } + + // draw Text + int textWidth = x + width - xDraw - (trim.width + trim.x); + if (parent.getUnselectedCloseVisible() + && ((parent.getStyle() & SWT.CLOSE) != 0 || item + .getShowClose())) { + textWidth -= ((Rectangle) HACK_CTabItem_closeRect.get(item)).width + 4; + } + if (textWidth > 0) { + Font gcFont = gc.getFont(); + gc.setFont(item.getFont() == null ? parent.getFont() : item + .getFont()); + if (HACK_CTabItem_shortenText.get(item) == null + || HACK_CTabItem_shortenTextWidth.getInt(item) != textWidth) { + HACK_CTabItem_shortenText.set(item, + _shortenText(gc, item.getText(), textWidth)); + HACK_CTabItem_shortenTextWidth.setInt(item, textWidth); + } + Point extent = gc.textExtent( + (String) HACK_CTabItem_shortenText.get(item), + SWT.DRAW_TRANSPARENT | SWT.DRAW_MNEMONIC); + int textY = y + (height - extent.y) / 2; + textY += parent.getTabPosition() == SWT.BOTTOM ? -1 : 1; + + if (showUnselectedTabItemShadow()) { + gc.setAlpha(180); + gc.setForeground(parent.getDisplay().getSystemColor( + SWT.COLOR_WHITE)); + gc.drawText( + (String) HACK_CTabItem_shortenText.get(item), + xDraw, textY + 1, SWT.DRAW_TRANSPARENT + | SWT.DRAW_MNEMONIC); + } + + gc.setAlpha(255); + + if (unselectedTabItemColor != null) { + gc.setForeground(unselectedTabItemColor); + } else { + gc.setForeground(parent.getForeground()); + } + gc.drawText((String) HACK_CTabItem_shortenText.get(item), + xDraw, textY, SWT.DRAW_TRANSPARENT + | SWT.DRAW_MNEMONIC); + gc.setFont(gcFont); + } + + if ((state & SWT.HOT) != 0 + && parent.getUnselectedCloseVisible() + && (hasStyle(parent, SWT.CLOSE) || hasStyle(item, + SWT.CLOSE))) + _drawClose(gc, getCloseRect(item), getCloseImageState(item)); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + protected void drawUnselectedTabItemBackground(int itemIndex, GC gc, + Rectangle bounds, int state) { + if ((state & SWT.HOT) != 0) { + int width = bounds.width; + int[] points = new int[1024]; + int[] inactive = new int[8]; + int index = 0, inactive_index = 0; + int radius = cornerSize / 2; + int circX = bounds.x + radius; + int circY = bounds.y - 1 + radius; + + int leftIndex = circX; + if (itemIndex == 0 || bounds.x <= 5) { + if (parent.getSelectionIndex() != 0) + leftIndex -= 1; + points[index++] = leftIndex - radius; + points[index++] = bounds.y + bounds.height; + } else { + points[index++] = bounds.x; + points[index++] = bounds.y + bounds.height; + } + + if (!active) { + System.arraycopy(points, 0, inactive, 0, index); + inactive_index += 2; + } + + int[] ltt = drawCircle(leftIndex, circY, radius, LEFT_TOP); + for (int i = 0; i < ltt.length / 2; i += 2) { + int tmp = ltt[i]; + ltt[i] = ltt[ltt.length - i - 2]; + ltt[ltt.length - i - 2] = tmp; + tmp = ltt[i + 1]; + ltt[i + 1] = ltt[ltt.length - i - 1]; + ltt[ltt.length - i - 1] = tmp; + } + System.arraycopy(ltt, 0, points, index, ltt.length); + index += ltt.length; + + if (!active) { + System.arraycopy(ltt, 0, inactive, inactive_index, 2); + inactive_index += 2; + } + + int rightIndex = circX - 1; + int[] rt = drawCircle(rightIndex + width - (radius * 2), circY, + radius, RIGHT_TOP); + for (int i = 0; i < rt.length / 2; i += 2) { + int tmp = rt[i]; + rt[i] = rt[rt.length - i - 2]; + rt[rt.length - i - 2] = tmp; + tmp = rt[i + 1]; + rt[i + 1] = rt[rt.length - i - 1]; + rt[rt.length - i - 1] = tmp; + } + System.arraycopy(rt, 0, points, index, rt.length); + index += rt.length; + if (!active) { + System.arraycopy(rt, rt.length - 4, inactive, inactive_index, 2); + inactive[inactive_index] -= 1; + inactive_index += 2; + } + + points[index++] = bounds.width + rightIndex - radius; + points[index++] = bounds.y + bounds.height; + + if (!active) { + System.arraycopy(points, index - 2, inactive, inactive_index, 2); + inactive[inactive_index] -= 1; + inactive_index += 2; + } + + gc.setClipping(points[0], bounds.y, parent.getSize().x + - (shadowEnabled ? SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + + OUTER_KEYLINE), bounds.y + bounds.height); + + gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE)); + int[] tmpPoints = new int[index]; + System.arraycopy(points, 0, tmpPoints, 0, index); + + gc.setAlpha(120); + gc.fillPolygon(translate(tmpPoints, 1, 1)); + Color tempBorder = new Color(gc.getDevice(), 182, 188, 204); + gc.setForeground(tempBorder); + gc.drawPolygon(tmpPoints); + tempBorder.dispose(); + gc.setAlpha(255); + } + } + + private Integer getCloseImageState(CTabItem item) { + try { + return (Integer) HACK_CTabItem_closeImageState.get(item); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + private Rectangle getCloseRect(CTabItem item) { + try { + return (Rectangle) HACK_CTabItem_closeRect.get(item); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + private Integer getCurveIndent() { + try { + return (Integer) HACK_CTabFolder_curveIndent.get(this); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + private Integer getCurveWidth() { + try { + return (Integer) HACK_CTabFolder_curveWidth.get(this); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public Rectangle getPadding() { + return new Rectangle(paddingTop, paddingRight, paddingBottom, + paddingLeft); + } + + private Integer getRightItemEdge(CTabFolder folder, GC gc) { + try { + return (Integer) HACK_CTabFolder_getRightItemEdge + .invoke(folder, gc); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public Color getSelectedTabFillHighlightColor() { + return selectedTabFillHighlightColor; + } + + public Color getSelectedTabItemColor() { + return selectedTabItemColor; + } + + private String getShortenText(CTabItem item) { + try { + return (String) HACK_CTabItem_shortenText.get(item); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + private Integer getShortenTextWidth(CTabItem item) { + try { + return (Integer) HACK_CTabItem_shortenTextWidth.get(item); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public Color getUnselectedTabItemColor() { + return unselectedTabItemColor; + } + + private boolean hasStyle(Widget w, int flag) { + return (w.getStyle() & flag) != 0; + } + + public void setActive(boolean active) { + this.active = active; + } + + public void setActiveToolbarGradient(Color[] color, int[] percents) { + activeToolbar = color; + activePercents = percents; + } + + public void setCornerRadius(int radius) { + cornerSize = radius; + parent.redraw(); + } + + public void setInactiveToolbarGradient(Color[] color, int[] percents) { + inactiveToolbar = color; + inactivePercents = percents; + } + + public void setInnerKeyline(Color color) { + this.innerKeyline = color; + parent.redraw(); + } + + public void setOuterKeyline(Color color) { + this.outerKeyline = color; + // TODO: HACK! Should be set based on pseudo-state. + setActive(!(color.getRed() == 255 && color.getGreen() == 255 && color + .getBlue() == 255)); + parent.redraw(); + } + + public void setPadding(int paddingLeft, int paddingRight, int paddingTop, + int paddingBottom) { + this.paddingLeft = paddingLeft; + this.paddingRight = paddingRight; + this.paddingTop = paddingTop; + this.paddingBottom = paddingBottom; + parent.redraw(); + } + + public void setSelectedTabFill(Color color) { + this.selectedTabFillColor = color; + parent.redraw(); + } + + public void setSelectedTabFillHighlightColor( + Color selectedTabFillHighlightColor) { + this.selectedTabFillHighlightColor = selectedTabFillHighlightColor; + } + + public void setSelectedTabItemColor(Color selectedTabItemColor) { + this.selectedTabItemColor = selectedTabItemColor; + } + + public void setShadowColor(Color color) { + this.shadowColor = color; + createShadow(parent.getDisplay(), true); + parent.redraw(); + } + + public void setShadowVisible(boolean visible) { + this.shadowEnabled = visible; + parent.redraw(); + } + + private void setShortenText(CTabItem item, String shortenText) { + try { + HACK_CTabItem_shortenText.set(item, shortenText); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void setShortenTextWidth(CTabItem item, int width) { + try { + HACK_CTabItem_shortenTextWidth.set(item, width); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void setTabOutline(Color color) { + this.tabOutlineColor = color; + parent.redraw(); + } + + public void setUnselectedTabItemColor(Color unselectedTabItemColor) { + this.unselectedTabItemColor = unselectedTabItemColor; + } + + protected boolean showUnselectedTabItemShadow() { + return true; + } + + private int[] translate(int[] pointArray, int dx, int dy) { + int[] result = new int[pointArray.length]; + System.arraycopy(pointArray, 0, result, 0, pointArray.length); + for (int i = 0; i < result.length; i += 2) { + result[i] += dx; + result[i + 1] += dy; + } + return result; + } + + protected void updateItems() { + try { + HACK_CTabFolder_updateItems.invoke(parent); + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/src/net/jeeeyul/eclipse/themes/rendering/HackedCTabRendering.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/themes/Activator.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/themes/Activator.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/themes/Activator.java 2012-09-13 17:41:42 UTC (rev 43660) @@ -0,0 +1,65 @@ +// Copyright 2012 Jeeeyul Lee, Seoul, Korea +// https://github.com/jeeeyul/pde-tools +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +package org.jboss.tools.central.themes; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.central.themes"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Property changes on: trunk/central/plugins/org.jboss.tools.central.themes/src/org/jboss/tools/central/themes/Activator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/central/plugins/org.jboss.tools.central.themes.zip =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central.themes.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/central/pom.xml =================================================================== --- trunk/central/pom.xml 2012-09-13 17:32:33 UTC (rev 43659) +++ trunk/central/pom.xml 2012-09-13 17:41:42 UTC (rev 43660) @@ -13,17 +13,17 @@ <version>1.1.0-SNAPSHOT</version> <name>central.all</name> <packaging>pom</packaging> -  <modules> + <module>plugins</module> <module>features</module> - <module>plugins</module> <module>tests</module> <module>site</module> </modules> @@ -41,4 +41,4 @@ </repository> </repositories> </project> - + Modified: trunk/central/site/category.xml =================================================================== --- trunk/central/site/category.xml 2012-09-13 17:32:33 UTC (rev 43659) +++ trunk/central/site/category.xml 2012-09-13 17:41:42 UTC (rev 43660) @@ -17,6 +17,8 @@ </feature> <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0"> </feature> + <feature id="org.jboss.tools.central.themes.feature" version="0.0.0"/> + <feature id="org.jboss.tools.central.themes.feature.source" version="0.0.0"/> <feature url="features/org.jboss.tools.central.test.feature_0.0.0.jar" id="org.jboss.tools.central.test.feature" version="0.0.0"> <category name="JBoss Central Nightly Build Update Site"/>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43659 - in trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common: util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-09-13 13:32:33 -0400 (Thu, 13 Sep 2012) New Revision: 43659 Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/JavaAnnotation.java trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/TypeResolutionCache.java Log: JBIDE-12446 https://issues.jboss.org/browse/JBIDE-12446 Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/JavaAnnotation.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/JavaAnnotation.java 2012-09-13 17:18:52 UTC (rev 43658) +++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/JavaAnnotation.java 2012-09-13 17:32:33 UTC (rev 43659) @@ -24,19 +24,12 @@ public class JavaAnnotation implements IJavaAnnotation { IAnnotation annotation; - String annotationTypeName; - IType type; public JavaAnnotation(IAnnotation annotation, IType declaringType) { this.annotation = annotation; - try { - String name = annotation.getElementName(); - annotationTypeName = EclipseJavaUtil.resolveType(declaringType, name); - type = EclipseJavaUtil.findType(annotation.getJavaProject(), annotationTypeName); - } catch (JavaModelException e) { - CommonCorePlugin.getDefault().logError(e); - } + String name = annotation.getElementName(); + annotationTypeName = EclipseJavaUtil.resolveType(declaringType, name); } public IResource getResource() { @@ -48,7 +41,12 @@ } public IType getType() { - return type; + try { + return EclipseJavaUtil.findType(annotation.getJavaProject(), annotationTypeName); + } catch (JavaModelException e) { + CommonCorePlugin.getDefault().logError(e); + } + return null; } public int getLength() { Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2012-09-13 17:18:52 UTC (rev 43658) +++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2012-09-13 17:32:33 UTC (rev 43659) @@ -13,7 +13,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.Hashtable; import java.util.List; +import java.util.Map; import java.util.Set; import org.eclipse.core.runtime.CoreException; @@ -74,11 +76,21 @@ public static String resolveType(IType type, String typeName) { return TypeResolutionCache.getInstance().resolveType(type, typeName); } + + static Map<String, Map<String, IType>> typeCache = new Hashtable<String, Map<String,IType>>(); public static IType findType(IJavaProject javaProject, String qualifiedName) throws JavaModelException { if(qualifiedName == null || qualifiedName.length() == 0) return null; + Map<String, IType> cache = typeCache.get(javaProject.getElementName()); + if(cache == null) { + cache = new Hashtable<String, IType>(); + typeCache.put(javaProject.getElementName(), cache); + } else { + IType type = cache.get(qualifiedName); + if(type != null) return type; + } IType type = javaProject.findType(qualifiedName); - if(type != null) return type; + if(type != null) return register(cache, qualifiedName, type); int dot = qualifiedName.lastIndexOf('.'); String packageName = (dot < 0) ? "" : qualifiedName.substring(0, dot); //$NON-NLS-1$ String shortName = qualifiedName.substring(dot + 1); @@ -89,11 +101,16 @@ ICompilationUnit[] us = f.getCompilationUnits(); for (int j = 0; j < us.length; j++) { IType t = us[j].getType(shortName); - if(t != null && t.exists()) return t; + if(t != null && t.exists()) return register(cache, qualifiedName, t);; } } return null; } + + private static IType register(Map<String, IType> cache, String qualifiedName, IType type) { + cache.put(qualifiedName, type); + return type; + } public static List<IType> getSupperTypes(IType type) throws JavaModelException { ITypeHierarchy typeHierarchy = type.newSupertypeHierarchy(new NullProgressMonitor()); Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/TypeResolutionCache.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/TypeResolutionCache.java 2012-09-13 17:18:52 UTC (rev 43658) +++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/TypeResolutionCache.java 2012-09-13 17:32:33 UTC (rev 43659) @@ -205,6 +205,7 @@ public void clean() { resolved = new Hashtable<String, Resolved>(); + EclipseJavaUtil.typeCache = new Hashtable<String, Map<String,IType>>(); } private String __resolveType(IType type, String typeName) {

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43658 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2012-09-13 13:18:52 -0400 (Thu, 13 Sep 2012) New Revision: 43658 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: CDI hyper links should work on modified files correctly https://issues.jboss.org/browse/JBIDE-12404 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2012-09-13 15:58:29 UTC (rev 43657) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2012-09-13 17:18:52 UTC (rev 43658) @@ -61,6 +61,10 @@ } public void testInjectedPointHyperlinkDetector() throws Exception { + String[] paths = new String[]{ + "/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BasicLogger.java", + "/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TimestampLogger.java" + }; Collection<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BasicLogger.java", true); IBean bean=null; for(IBean b : beans){ @@ -69,23 +73,23 @@ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); regionList.add(new TestRegion(/*115, 6*/"Inject", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // Inject regionList.add(new TestRegion(/*133, 6*/"Logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // Logger regionList.add(new TestRegion(/*140, 6*/"logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // logger regionList.add(new TestRegion(/*196, 6*/"logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // logger regionList.add(new TestRegion(/*250, 6*/"logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // logger CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java", regionList, new InjectedPointHyperlinkDetector()); @@ -131,6 +135,10 @@ } public void testInjectedPointHyperlinkDetectorWithComment() throws Exception { + String[] paths = new String[]{ + "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/BasicLogger.java", + "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/TestInjections.java" + }; Collection<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/BasicLogger.java", true); IBean bean=null; for(IBean b : beans){ @@ -139,23 +147,23 @@ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); regionList.add(new TestRegion("Inject", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // Inject regionList.add(new TestRegion("Logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // Logger regionList.add(new TestRegion("logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // logger regionList.add(new TestRegion("logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // logger regionList.add(new TestRegion("logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), - new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE) + new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths) })); // logger CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/LoggerConsumer.java", regionList, new InjectedPointHyperlinkDetector());

13 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2012