JBoss Tools SVN: r35058 - trunk/central/plugins.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-27 11:10:39 -0400 (Tue, 27 Sep 2011)
New Revision: 35058
Modified:
trunk/central/plugins/pom.xml
Log:
fix version of parent pom ref (1.0.0 not 1.2.1)
Modified: trunk/central/plugins/pom.xml
===================================================================
--- trunk/central/plugins/pom.xml 2011-09-27 15:01:57 UTC (rev 35057)
+++ trunk/central/plugins/pom.xml 2011-09-27 15:10:39 UTC (rev 35058)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>central</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.central</groupId>
<artifactId>plugins</artifactId>
14 years, 3 months
JBoss Tools SVN: r35057 - in trunk/central: plugins/org.jboss.tools.central and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-27 11:01:57 -0400 (Tue, 27 Sep 2011)
New Revision: 35057
Added:
trunk/central/features/org.jboss.tools.central.feature/pom.xml
trunk/central/plugins/org.jboss.tools.central/pom.xml
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
Added: trunk/central/features/org.jboss.tools.central.feature/pom.xml
===================================================================
--- trunk/central/features/org.jboss.tools.central.feature/pom.xml (rev 0)
+++ trunk/central/features/org.jboss.tools.central.feature/pom.xml 2011-09-27 15:01:57 UTC (rev 35057)
@@ -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>features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.central.features</groupId>
+ <artifactId>org.jboss.tools.central.feature</artifactId>
+
+ <packaging>eclipse-feature</packaging>
+</project>
Added: trunk/central/plugins/org.jboss.tools.central/pom.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/pom.xml (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central/pom.xml 2011-09-27 15:01:57 UTC (rev 35057)
@@ -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.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.central.plugins</groupId>
+ <artifactId>org.jboss.tools.central</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+</project>
14 years, 3 months
JBoss Tools SVN: r35056 - in trunk/forge/plugins/org.jboss.tools.forge.runtime.ext: src/org/jboss/tools/forge/runtime/ext and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-26 15:22:55 -0400 (Mon, 26 Sep 2011)
New Revision: 35056
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs
Log:
rename MetaCommandTriggeredAction into MetaCommandAction
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs 2011-09-26 19:21:31 UTC (rev 35055)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs 2011-09-26 19:22:55 UTC (rev 35056)
@@ -1,8 +1,81 @@
-#Mon Jul 18 13:48:41 CEST 2011
+#Mon Sep 26 21:11:41 CEST 2011
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.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.6
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java (from rev 34844, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java 2011-09-26 19:22:55 UTC (rev 35056)
@@ -0,0 +1,107 @@
+package org.jboss.tools.forge.runtime.ext;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.inject.Inject;
+
+import org.jboss.forge.shell.Shell;
+import org.jboss.forge.shell.command.CommandMetadata;
+import org.jboss.forge.shell.command.PluginMetadata;
+import org.jboss.forge.shell.command.PluginRegistry;
+import org.jboss.forge.shell.spi.TriggeredAction;
+
+public class MetaCommandAction implements TriggeredAction {
+
+ private static final String ESCAPE = new String(new char[] { 27, '%' });
+
+ @Inject Shell shell;
+
+ @Inject PluginRegistry registry;
+
+
+
+ @Override
+ public ActionListener getListener() {
+ return new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ try {
+ shell.print(ESCAPE);
+ String text = shell.readLine();
+ shell.print(ESCAPE);
+ handleHiddenCommand(text);
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+ }
+ };
+ }
+
+ private void handleHiddenCommand(String text) {
+ try {
+ FileWriter fileWriter = new FileWriter("/Users/koen/Temp/handleHiddenCommand.txt", true);
+ BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+ bufferedWriter.write("handleHiddenCommand(" + text + ")\n");
+ if ("plugin-candidates-query".equals(text)) {
+ bufferedWriter.write("query is plugin-candidates-query\n");
+ shell.print(ESCAPE + "plugin-candidates-answer: " + getPluginCandidates() + ESCAPE);
+ bufferedWriter.write("response sent back to tools\n");
+ }
+ bufferedWriter.write("about to exit handleHiddenCommand\n");
+ bufferedWriter.flush();
+// fileWriter.close();
+ } catch (Exception e) {
+ // ignored
+ }
+ }
+
+ private String getPluginCandidates() {
+ try {
+ FileWriter fileWriter = new FileWriter("/Users/koen/Temp/getPluginCandidates.txt", true);
+ BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+ bufferedWriter.write("getPluginCandidates()\n");
+ StringBuffer resultBuffer = new StringBuffer();
+ Map<String, List<PluginMetadata>> plugins = registry.getPlugins();
+ bufferedWriter.write("got the plugins\n");
+ for (Entry<String, List<PluginMetadata>> entry : plugins.entrySet()) {
+ bufferedWriter.write("processing entry : " + entry.getKey() + "\n");
+ for (PluginMetadata pluginMeta : entry.getValue()) {
+ bufferedWriter.write("processing pluginMeta : " + pluginMeta.getName());
+ if (pluginMeta.constrantsSatisfied(shell)) {
+ bufferedWriter.write("pluginMeta : " + pluginMeta.getName() + " satisfies constraints\n");
+ List<CommandMetadata> commands = pluginMeta.getAllCommands();
+ bufferedWriter.write("got the commands\n");
+ if (!commands.isEmpty()) {
+ bufferedWriter.write("commands is not empty\n");
+ resultBuffer.append("p:").append(pluginMeta.getName()).append(' ');
+ bufferedWriter.write("result becomes : " + resultBuffer.toString() + "\n");
+ for (CommandMetadata commandMeta : commands) {
+ bufferedWriter.write("processing command : " + commandMeta.getName() + "\n");
+ resultBuffer.append("c:").append(commandMeta.getName()).append(' ');
+ bufferedWriter.write("result becomes : " + resultBuffer.toString() + "\n");
+ }
+ }
+ }
+ }
+ }
+ bufferedWriter.write("about to return result : " + resultBuffer.toString() + "\n");
+ bufferedWriter.flush();
+ return resultBuffer.toString();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ @Override
+ public char getTrigger() {
+ return (char)31;
+ }
+
+}
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java 2011-09-26 19:21:31 UTC (rev 35055)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java 2011-09-26 19:22:55 UTC (rev 35056)
@@ -1,107 +0,0 @@
-package org.jboss.tools.forge.runtime.ext;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.inject.Inject;
-
-import org.jboss.forge.shell.Shell;
-import org.jboss.forge.shell.command.CommandMetadata;
-import org.jboss.forge.shell.command.PluginMetadata;
-import org.jboss.forge.shell.command.PluginRegistry;
-import org.jboss.forge.shell.spi.TriggeredAction;
-
-public class MetaCommandTriggeredAction implements TriggeredAction {
-
- private static final String ESCAPE = new String(new char[] { 27, '%' });
-
- @Inject Shell shell;
-
- @Inject PluginRegistry registry;
-
-
-
- @Override
- public ActionListener getListener() {
- return new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- try {
- shell.print(ESCAPE);
- String text = shell.readLine();
- shell.print(ESCAPE);
- handleHiddenCommand(text);
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- }
- };
- }
-
- private void handleHiddenCommand(String text) {
- try {
- FileWriter fileWriter = new FileWriter("/Users/koen/Temp/handleHiddenCommand.txt", true);
- BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
- bufferedWriter.write("handleHiddenCommand(" + text + ")\n");
- if ("plugin-candidates-query".equals(text)) {
- bufferedWriter.write("query is plugin-candidates-query\n");
- shell.print(ESCAPE + "plugin-candidates-answer: " + getPluginCandidates() + ESCAPE);
- bufferedWriter.write("response sent back to tools\n");
- }
- bufferedWriter.write("about to exit handleHiddenCommand\n");
- bufferedWriter.flush();
-// fileWriter.close();
- } catch (Exception e) {
- // ignored
- }
- }
-
- private String getPluginCandidates() {
- try {
- FileWriter fileWriter = new FileWriter("/Users/koen/Temp/getPluginCandidates.txt", true);
- BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
- bufferedWriter.write("getPluginCandidates()\n");
- StringBuffer resultBuffer = new StringBuffer();
- Map<String, List<PluginMetadata>> plugins = registry.getPlugins();
- bufferedWriter.write("got the plugins\n");
- for (Entry<String, List<PluginMetadata>> entry : plugins.entrySet()) {
- bufferedWriter.write("processing entry : " + entry.getKey() + "\n");
- for (PluginMetadata pluginMeta : entry.getValue()) {
- bufferedWriter.write("processing pluginMeta : " + pluginMeta.getName());
- if (pluginMeta.constrantsSatisfied(shell)) {
- bufferedWriter.write("pluginMeta : " + pluginMeta.getName() + " satisfies constraints\n");
- List<CommandMetadata> commands = pluginMeta.getAllCommands();
- bufferedWriter.write("got the commands\n");
- if (!commands.isEmpty()) {
- bufferedWriter.write("commands is not empty\n");
- resultBuffer.append("p:").append(pluginMeta.getName()).append(' ');
- bufferedWriter.write("result becomes : " + resultBuffer.toString() + "\n");
- for (CommandMetadata commandMeta : commands) {
- bufferedWriter.write("processing command : " + commandMeta.getName() + "\n");
- resultBuffer.append("c:").append(commandMeta.getName()).append(' ');
- bufferedWriter.write("result becomes : " + resultBuffer.toString() + "\n");
- }
- }
- }
- }
- }
- bufferedWriter.write("about to return result : " + resultBuffer.toString() + "\n");
- bufferedWriter.flush();
- return resultBuffer.toString();
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public char getTrigger() {
- return (char)31;
- }
-
-}
14 years, 3 months
JBoss Tools SVN: r35055 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-26 15:21:31 -0400 (Mon, 26 Sep 2011)
New Revision: 35055
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/CtrlCAction.java
Log:
JBIDE 8912: Ctrl-C is also working!
Added: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/CtrlCAction.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/CtrlCAction.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/CtrlCAction.java 2011-09-26 19:21:31 UTC (rev 35055)
@@ -0,0 +1,28 @@
+package org.jboss.tools.forge.runtime.ext;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import org.jboss.forge.shell.spi.TriggeredAction;
+
+import sun.misc.Signal;
+
+@SuppressWarnings("restriction")
+public class CtrlCAction implements TriggeredAction {
+
+ @Override
+ public ActionListener getListener() {
+ return new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Signal.raise(new Signal("INT"));
+ }
+ };
+ }
+
+ @Override
+ public char getTrigger() {
+ return (char)3;
+ }
+
+}
14 years, 3 months
JBoss Tools SVN: r35054 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-09-26 14:45:15 -0400 (Mon, 26 Sep 2011)
New Revision: 35054
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
Log:
JBIDE-7892
Search for @Named beans.
History update is made to verify for removed beans
Labels are made styled and providing path to bean declaration
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-26 18:44:00 UTC (rev 35053)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-26 18:45:15 UTC (rev 35054)
@@ -27,11 +27,17 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jface.dialogs.DialogSettings;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.TextStyle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
@@ -62,6 +68,7 @@
private static final String BEAN_NAME = "BeanName"; //$NON-NLS-1$
private static final String DELETED = "Deleted"; //$NON-NLS-1$
private static final String SEPARATOR = " - "; //$NON-NLS-1$
+ private static final String DOT = "."; //$NON-NLS-1$
private static final String YES = "yes"; //$NON-NLS-1$
private static final String NO = "no"; //$NON-NLS-1$
@@ -267,7 +274,22 @@
public class CDINamedBeanFilter extends ItemsFilter {
public boolean isConsistentItem(Object item) {
- return true;
+ if (item instanceof CDINamedBeanWrapper) {
+ CDINamedBeanWrapper beanWrapper = (CDINamedBeanWrapper) item;
+ String projectName = beanWrapper.getProjectName();
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ ICDIProject cdiProject = CDICorePlugin.getCDIProject(project, true);
+ if (cdiProject == null) {
+ return false;
+ }
+
+ String beanName = beanWrapper.getBeanName();
+ Set<IBean> beans = cdiProject
+ .getBeans(beanName, true);
+ IBean bean = (beans == null || beans.isEmpty() ? null : beans.iterator().next());
+ return (bean != null);
+ }
+ return false;
}
public boolean matchItem(Object item) {
@@ -333,22 +355,76 @@
}
}
- public class CDINamedBeanLabelProvider implements ILabelProvider {
+ private static class CDIBeanStyler extends Styler {
+ private final Color foreground;
+ public CDIBeanStyler(Color foreground) {
+ this.foreground = foreground;
+ }
+
+ public void applyStyles(TextStyle textStyle) {
+ if (foreground != null) {
+ textStyle.foreground = foreground;
+ }
+ }
+ }
+
+ public class CDINamedBeanLabelProvider implements IStyledLabelProvider, ILabelProvider {
+ final Color gray = new Color(null, 128, 128, 128);
+ final Color black = new Color(null, 0, 0, 0);
+
+ final Styler NAME_STYLE = new CDIBeanStyler(black);
+ final Styler QUALIFIED_NAME_STYLE = new CDIBeanStyler(gray);
+ final Styler BEAN_PATH_STYLE = new CDIBeanStyler(gray);
+
public Image getImage(Object element) {
if (element instanceof CDINamedBeanWrapper) {
return CDIImages.getImageByElement(((CDINamedBeanWrapper)element).getBean());
}
return null;
}
+
+ public String getText(Object element) {
+ return getStyledText(element).getString();
+ }
- public String getText(Object element) {
+ public StyledString getStyledText(Object element) {
+ StyledString styledString = new StyledString();
+
if (element instanceof CDINamedBeanWrapper) {
CDINamedBeanWrapper beanWrapper = (CDINamedBeanWrapper) element;
- return beanWrapper.getBeanName() + SEPARATOR
- + beanWrapper.getProjectName();
+
+ styledString.append(beanWrapper.getBeanName(), NAME_STYLE);
+
+ IBean b = beanWrapper.getBean();
+ if (b == null)
+ return styledString;
+
+ IType t = b.getBeanClass();
+
+ IPath beanPath = t.getPackageFragment().getParent().getPath();//beanWrapper.getBean().getBeanClass().getPackageFragment().getParent().getPath()
+ IPath beanProjectPath = b.getCDIProject().getNature().getProject().getFullPath();
+ if (beanProjectPath != null && beanPath != null && beanProjectPath.isPrefixOf(beanPath)) {
+ beanPath = beanPath.makeRelative();
+ }
+
+ String elementName = b.getElementName();
+ String packageName = t.getPackageFragment().getElementName();
+
+ if (elementName != null) {
+ styledString.append(SEPARATOR, QUALIFIED_NAME_STYLE);
+ if (packageName != null && packageName.length() > 0) {
+ styledString.append(packageName, QUALIFIED_NAME_STYLE);
+ styledString.append(DOT, QUALIFIED_NAME_STYLE);
+ }
+ styledString.append(elementName, QUALIFIED_NAME_STYLE);
+ }
+ if (beanPath != null) {
+ styledString.append(SEPARATOR, BEAN_PATH_STYLE);
+ styledString.append(beanPath.toString(), BEAN_PATH_STYLE);
+ }
}
- return null;
+ return styledString;
}
public void addListener(ILabelProviderListener listener) {
@@ -364,7 +440,7 @@
public void removeListener(ILabelProviderListener listener) {
}
}
-
+
public class CDINamedBeanWrapper {
private String beanName;
private String projectName;
14 years, 3 months
JBoss Tools SVN: r35053 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-26 14:44:00 -0400 (Mon, 26 Sep 2011)
New Revision: 35053
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE 8912: Ctrl-D is working
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-09-26 16:54:53 UTC (rev 35052)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-09-26 18:44:00 UTC (rev 35053)
@@ -12,6 +12,7 @@
import org.eclipse.swt.custom.ST;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.custom.VerifyKeyListener;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
@@ -24,11 +25,14 @@
public class ForgeTextViewer extends TextViewer {
- private static String BACKSPACE = new Character('\b').toString();
- private static String UP_ARROW = new Character((char)16).toString();
- private static String DOWN_ARROW = new Character((char)14).toString();
- private static String LEFT_ARROW = new Character((char)2).toString();
- private static String RIGHT_ARROW = new Character((char)6).toString();
+ private static String PREV_CHAR = new Character((char)2).toString();
+ private static String BLAH = new Character((char)3).toString();
+ private static String EXIT = new Character((char)4).toString();
+ private static String NEXT_CHAR = new Character((char)6).toString();
+ private static String DELETE_PREV_CHAR = new Character((char)8).toString();
+ private static String PREV_HISTORY = new Character((char)16).toString();
+ private static String NEXT_HISTORY = new Character((char)14).toString();
+ private static String DELETE_NEXT_CHAR = new Character((char)127).toString();
private class RuntimeStopListener implements PropertyChangeListener {
@Override
@@ -39,7 +43,7 @@
}
}
}
-
+
private class DocumentListener implements IDocumentListener {
@Override
public void documentAboutToBeChanged(DocumentEvent event) {
@@ -53,7 +57,6 @@
if (textWidget != null && !textWidget.isDisposed()) {
int lineCount = textWidget.getLineCount();
textWidget.setTopIndex(lineCount - 1);
-// textWidget.setCaretOffset(event.fOffset + event.fLength);
}
}
});
@@ -90,6 +93,19 @@
private void initViewer() {
getTextWidget().setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT));
+ getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
+
+ @Override
+ public void verifyKey(VerifyEvent event) {
+ if ((event.stateMask & SWT.CTRL) == SWT.CTRL ) {
+ if (event.keyCode == 'd') {
+ runtime.sendInput(EXIT);
+ } else if (event.keyCode == 'c') {
+ runtime.sendInput(BLAH);
+ }
+ }
+ }
+ });
}
protected StyledText createTextWidget(Composite parent, int styles) {
@@ -97,20 +113,23 @@
public void invokeAction(int action) {
switch (action) {
case ST.LINE_UP:
- runtime.sendInput(UP_ARROW);
+ runtime.sendInput(PREV_HISTORY);
break;
case ST.LINE_DOWN:
- runtime.sendInput(DOWN_ARROW);
+ runtime.sendInput(NEXT_HISTORY);
break;
case ST.COLUMN_PREVIOUS:
- runtime.sendInput(LEFT_ARROW);
+ runtime.sendInput(PREV_CHAR);
break;
case ST.COLUMN_NEXT:
- runtime.sendInput(RIGHT_ARROW);
+ runtime.sendInput(NEXT_CHAR);
break;
case ST.DELETE_PREVIOUS:
- runtime.sendInput(BACKSPACE);
+ runtime.sendInput(DELETE_PREV_CHAR);
break;
+ case ST.DELETE_NEXT:
+ runtime.sendInput(DELETE_NEXT_CHAR);
+ break;
default: super.invokeAction(action);
}
}
14 years, 3 months
JBoss Tools SVN: r35052 - in workspace/snjeza/org.jboss.tools.central.update: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-26 12:54:53 -0400 (Mon, 26 Sep 2011)
New Revision: 35052
Added:
workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261851.jar
workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261851.jar
Removed:
workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261417.jar
workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261417.jar
Modified:
workspace/snjeza/org.jboss.tools.central.update/artifacts.jar
workspace/snjeza/org.jboss.tools.central.update/content.jar
workspace/snjeza/org.jboss.tools.central.update/site.xml
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
Modified: workspace/snjeza/org.jboss.tools.central.update/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.central.update/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261417.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261851.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261851.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261417.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261851.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261851.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.central.update/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.central.update/site.xml 2011-09-26 16:43:50 UTC (rev 35051)
+++ workspace/snjeza/org.jboss.tools.central.update/site.xml 2011-09-26 16:54:53 UTC (rev 35052)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.central.feature_1.0.0.201109261417.jar" id="org.jboss.tools.central.feature" version="1.0.0.201109261417">
+ <feature url="features/org.jboss.tools.central.feature_1.0.0.201109261851.jar" id="org.jboss.tools.central.feature" version="1.0.0.201109261851">
<category name="org.jboss.tools.central"/>
</feature>
<category-def name="org.jboss.tools.central" label="JBoss Central"/>
14 years, 3 months
JBoss Tools SVN: r35051 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-26 12:43:50 -0400 (Mon, 26 Sep 2011)
New Revision: 35051
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
Log:
[JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-26 16:24:58 UTC (rev 35050)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-26 16:43:50 UTC (rev 35051)
@@ -54,7 +54,7 @@
charactersRead = readStatus(cbuf, off, len);
} while (charactersRead == -1);
} catch (InterruptedException e) {
- throw new IOException(e);
+ // do nothing
}
return charactersRead;
}
@@ -64,7 +64,7 @@
int charactersRead = -1;
if (logReader == null) {
String status = requestStatus();
- if (isSameStatus(status, currentStatus)) {
+ if (status == null) {
Thread.sleep(STATUS_REQUEST_DELAY);
return -1;
}
@@ -75,6 +75,7 @@
charactersRead = logReader.read(cbuf, off, len);
if (charactersRead == -1) {
this.logReader = null;
+ return -1;
}
return charactersRead;
}
@@ -100,7 +101,12 @@
protected String requestStatus() throws IOException {
try {
- return service.getStatus(application.getName(), application.getCartridge(), user);
+ String status = service.getStatus(application.getName(), application.getCartridge(), user);
+ if (isSameStatus(status, currentStatus)) {
+ return null;
+ }
+ return status;
+
} catch (OpenshiftException e) {
throw new IOException(e);
}
14 years, 3 months
JBoss Tools SVN: r35050 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-26 12:24:58 -0400 (Mon, 26 Sep 2011)
New Revision: 35050
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java 2011-09-26 15:55:10 UTC (rev 35049)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java 2011-09-26 16:24:58 UTC (rev 35050)
@@ -49,21 +49,21 @@
private int y;
private boolean focused = false;
- private Listener deactivateListener = new Listener() {
-
- @Override
- public void handleEvent(Event event) {
- if (focused) {
- if (CURRENT_TOOLTIP != null) {
- CURRENT_TOOLTIP.dispose();
- CURRENT_TOOLTIP = null;
- }
- activate();
- hide();
- focused = false;
- }
- }
- };
+// private Listener deactivateListener = new Listener() {
+//
+// @Override
+// public void handleEvent(Event event) {
+// if (focused) {
+// if (CURRENT_TOOLTIP != null) {
+// CURRENT_TOOLTIP.dispose();
+// CURRENT_TOOLTIP = null;
+// }
+// activate();
+// hide();
+// focused = false;
+// }
+// }
+// };
private MouseMoveListener mouseMoveListener = new MouseMoveListener() {
public void mouseMove(MouseEvent e) {
@@ -145,9 +145,9 @@
if (!focused) {
formText.setFocus();
}
- if (formText.getShell() != null) {
- formText.getShell().addListener(SWT.Deactivate, deactivateListener);
- }
+// if (formText.getShell() != null) {
+// formText.getShell().addListener(SWT.Deactivate, deactivateListener);
+// }
formText.addMouseMoveListener(mouseMoveListener);
formText.addListener(SWT.KeyDown, keyListener);
@@ -158,9 +158,9 @@
if (formText != null && !formText.isDisposed()) {
formText.removeMouseMoveListener(mouseMoveListener);
formText.removeListener(SWT.KeyDown, keyListener);
- if (formText.getShell() != null && !formText.getShell().isDisposed()) {
- formText.getShell().removeListener(SWT.Deactivate, deactivateListener);
- }
+// if (formText.getShell() != null && !formText.getShell().isDisposed()) {
+// formText.getShell().removeListener(SWT.Deactivate, deactivateListener);
+// }
}
}
});
14 years, 3 months
JBoss Tools SVN: r35049 - in trunk/as: tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-26 11:55:10 -0400 (Mon, 26 Sep 2011)
New Revision: 35049
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
Log:
[JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-26 15:44:45 UTC (rev 35048)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-26 15:55:10 UTC (rev 35049)
@@ -32,12 +32,13 @@
private static final Pattern LOG_REGEX = Pattern.compile("Tail of .+$", Pattern.MULTILINE);
+ private static final long STATUS_REQUEST_DELAY = 4 * 1024;
+
private IOpenshiftService service;
private StringReader logReader;
private Application application;
- private int logIndex = 0;
-
private User user;
+ private String currentStatus;
public ApplicationLogReader(Application application, User user, IOpenshiftService service) {
this.application = application;
@@ -48,18 +49,41 @@
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
int charactersRead = -1;
+ try {
+ do {
+ charactersRead = readStatus(cbuf, off, len);
+ } while (charactersRead == -1);
+ } catch (InterruptedException e) {
+ throw new IOException(e);
+ }
+ return charactersRead;
+ }
+
+ protected int readStatus(char[] cbuf, int off, int len) throws IOException,
+ InterruptedException {
+ int charactersRead = -1;
if (logReader == null) {
- this.logReader = createLogReader(requestStatus());
+ String status = requestStatus();
+ if (isSameStatus(status, currentStatus)) {
+ Thread.sleep(STATUS_REQUEST_DELAY);
+ return -1;
+ }
+ this.currentStatus = status;
+ this.logReader = createLogReader(status);
}
+
charactersRead = logReader.read(cbuf, off, len);
- if (charactersRead != -1) {
- logIndex += charactersRead;
- return charactersRead;
+ if (charactersRead == -1) {
+ this.logReader = null;
}
- this.logReader = null;
- return -1;
+ return charactersRead;
}
+ private boolean isSameStatus(String status, String currentStatus) {
+ return currentStatus != null
+ && currentStatus.equals(status);
+ }
+
protected StringReader createLogReader(String status) throws IOException {
String log = getLog(status);
return new StringReader(log);
@@ -67,10 +91,11 @@
private String getLog(String status) throws IOException {
Matcher matcher = LOG_REGEX.matcher(status);
+ int logStart = 0;
if (matcher.find()) {
- logIndex = matcher.end() + 1;
+ logStart = matcher.end() + 1;
}
- return status.substring(logIndex);
+ return status.substring(logStart);
}
protected String requestStatus() throws IOException {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-26 15:44:45 UTC (rev 35048)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-26 15:55:10 UTC (rev 35049)
@@ -23,7 +23,6 @@
import org.jboss.ide.eclipse.as.openshift.core.internal.Application;
import org.jboss.ide.eclipse.as.openshift.core.internal.IOpenshiftService;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
-import org.jboss.ide.eclipse.as.openshift.core.internal.utils.StreamUtils;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationUtils;
import org.junit.Before;
@@ -93,18 +92,18 @@
try {
application = user.createTestApplication();
ApplicationLogReader logReader = application.getLog();
- String log = StreamUtils.readToString(logReader);
- System.err.println(log);
LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader);
executor = Executors.newSingleThreadExecutor();
executor.submit(logReaderRunnable);
- boolean logAvailable = waitForLog(startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable);
+ boolean logAvailable = waitForNewLogEntries(0, startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable);
+ int logLength = logReaderRunnable.getLog().length();
assertTrue(logReaderRunnable.isRunning());
- assertFalse(logAvailable);
+ assertTrue(logAvailable);
application.restart();
- logAvailable = waitForLog(startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable);
+ logAvailable = waitForNewLogEntries(logLength, startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable);
assertTrue(logAvailable);
assertTrue(logReaderRunnable.isRunning());
+ assertTrue(logReaderRunnable.getLog().length() > logLength);
} finally {
if (executor != null) {
executor.shutdownNow();
@@ -115,13 +114,14 @@
}
}
- protected boolean waitForLog(long startTime, long timeout, LogReaderRunnable logReaderRunnable)
+ protected boolean waitForNewLogEntries(int logLength, long startTime, long timeout, LogReaderRunnable logReaderRunnable)
throws InterruptedException {
while (logReaderRunnable.isEmpty()
+ && logReaderRunnable.getLog().length() <= logLength
&& System.currentTimeMillis() <= timeout) {
Thread.sleep(1 * 1024);
}
- return logReaderRunnable.isEmpty();
+ return logReaderRunnable.getLog().length() > logLength;
}
private static class LogReaderRunnable implements Runnable {
14 years, 3 months