Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plugins customizing is intialized once at start

Browse Source
This commit is contained in:
Jarred Li
2012-04-13 14:43:21 +08:00
parent 01f8037231
commit 5d8a8d9c46
9 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/shell/Bootstrap.java
View File

@@ -78,8 +78,6 @@ public class Bootstrap {
//System.out.println("Registering converter " + converter);
shell.getSimpleParser().add(converter);
}
shell.start();
//TODO use listener and latch..
@@ -125,6 +123,7 @@ public class Bootstrap {
annctx.refresh();
ctx = initPluginApplicationContext(annctx);
ctx.refresh();

37
src/main/java/org/springframework/shell/JLineShell.java
View File

@@ -82,6 +82,10 @@ public abstract class JLineShell extends AbstractShell
private ApplicationContext applicatonContext;
private boolean printBanner = true;
private String historyFileName;
private String promptText;
private String version;
private String welcomeMessage;
public void run() {
@@ -122,7 +126,7 @@ public abstract class JLineShell extends AbstractShell
// Try to build previous command history from the project's log
try {
String logFileContents = FileCopyUtils.copyToString(new File(getHistoryFileName()));
String logFileContents = FileCopyUtils.copyToString(new File(this.historyFileName));
String[] logEntries = logFileContents.split(StringUtils.LINE_SEPARATOR);
// LIFO
for (String logEntry : logEntries) {
@@ -174,7 +178,7 @@ public abstract class JLineShell extends AbstractShell
public void printBannerAndWelcome(){
if(printBanner){
logger.info(version(null));
logger.info(this.version);
logger.info(getWelcomeMessage());
}
}
@@ -202,7 +206,7 @@ public abstract class JLineShell extends AbstractShell
if (reader.getTerminal().isANSISupported()) {
ANSIBuffer ansi = JLineLogHandler.getANSIBuffer();
if (path == null || "".equals(path)) {
shellPrompt = ansi.yellow(getPromptText()).toString();
shellPrompt = ansi.yellow(this.promptText).toString();
}
else {
if (overrideStyle) {
@@ -211,7 +215,7 @@ public abstract class JLineShell extends AbstractShell
else {
ansi.cyan(path);
}
shellPrompt = ansi.yellow(" " + getPromptText()).toString();
shellPrompt = ansi.yellow(" " + this.promptText).toString();
}
}
else {
@@ -456,7 +460,7 @@ public abstract class JLineShell extends AbstractShell
private void openFileLogIfPossible() {
try {
fileLog = new FileWriter(getHistoryFileName(), true);
fileLog = new FileWriter(this.historyFileName, true);
// First write, so let's record the date and time of the first user command
fileLog.write("// Spring Roo " + versionInfo() + " log opened at " + df.format(new Date()) + "\n");
fileLog.flush();
@@ -528,6 +532,12 @@ public abstract class JLineShell extends AbstractShell
this.applicatonContext = applicationContext;
}
public void costomizePlugin(){
this.historyFileName = getHistoryFileName();
this.promptText = getPromptText();
this.version = getBannerText()[0];
this.welcomeMessage = getBannerText()[1];
}
/**
* get history file name from provider. The provider has highest order
@@ -538,9 +548,9 @@ public abstract class JLineShell extends AbstractShell
private String getHistoryFileName() {
String historyFileName = null;
Map<String, HistoryFileNameProvider> historyFileProviders = getBeansInFactory(HistoryFileNameProvider.class);
int order = Integer.MIN_VALUE;
int order = Integer.MAX_VALUE;
for(HistoryFileNameProvider p : historyFileProviders.values()){
if(p.getOrder() > order){
if(p.getOrder() < order){
order = p.getOrder();
historyFileName = p.getHistoryFileName();
}
@@ -557,9 +567,9 @@ public abstract class JLineShell extends AbstractShell
private String getPromptText(){
String promptText = null;
Map<String, PromptProvider> promptProviders = getBeansInFactory(PromptProvider.class);
int order = Integer.MIN_VALUE;
int order = Integer.MAX_VALUE;
for(PromptProvider p : promptProviders.values()){
if(p.getOrder() > order){
if(p.getOrder() < order){
order = p.getOrder();
promptText = p.getPromptText();
}
@@ -576,9 +586,9 @@ public abstract class JLineShell extends AbstractShell
private String[] getBannerText(){
String[] bannerText = new String[2];
Map<String, BannerProvider> bannerProviders = getBeansInFactory(BannerProvider.class);
int order = Integer.MIN_VALUE;
int order = Integer.MAX_VALUE;
for(BannerProvider p : bannerProviders.values()){
if(p.getOrder() > order){
if(p.getOrder() < order){
order = p.getOrder();
bannerText[0] = p.getBanner();
bannerText[1] = p.getWelcomMessage();
@@ -594,12 +604,13 @@ public abstract class JLineShell extends AbstractShell
return result;
}
@Override
public String version(String text){
return getBannerText()[0];
return this.version;
}
public String getWelcomeMessage(){
return getBannerText()[1];
return this.welcomeMessage;
}

2
src/main/java/org/springframework/shell/JLineShellComponent.java
View File

@@ -34,6 +34,8 @@ public class JLineShellComponent extends JLineShell implements Lifecycle {
public void start() {
//customizePlug must run before start thread to take plugin's configuration into effect
super.costomizePlugin();
shellThread = new Thread(this, "Spring Shell");
shellThread.start();
running = true;

2
src/main/java/org/springframework/shell/plugin/BannerProvider.java
View File

@@ -19,7 +19,7 @@ import org.springframework.core.Ordered;
/**
* Banner provider. Plugin should implements this interface to replace the version banner.
* <code>getOrder</code> should be > 1 to override default.
* <code>getOrder</code> indicate the priority, higher values can be interpreted as lower priority
*
* @author Jarred Li
* @since 1.0

2
src/main/java/org/springframework/shell/plugin/HistoryFileNameProvider.java
View File

@@ -19,7 +19,7 @@ import org.springframework.core.Ordered;
/**
* History file name provider. Plugin should implements this interface to customize history file.
* <code>getOrder</code> should be > 1 to override default.
* <code>getOrder</code> indicate the priority, higher values can be interpreted as lower priority
*
* @author Jarred Li
* @since 1.0

3
src/main/java/org/springframework/shell/plugin/PromptProvider.java
View File

@@ -19,8 +19,7 @@ import org.springframework.core.Ordered;
/**
* Shell prompt provider. Plugin should implements this interface to customize prompt.
*
* <code>getOrder</code> should be > 1 to override default.
* <code>getOrder</code> indicate the priority, higher values can be interpreted as lower priority
*
* @author Jarred Li
*

3
src/main/java/org/springframework/shell/plugin/support/DefaultBannerProvider.java
View File

@@ -17,7 +17,6 @@ package org.springframework.shell.plugin.support;
import static org.springframework.roo.support.util.StringUtils.LINE_SEPARATOR;
import org.springframework.roo.shell.CliCommand;
import org.springframework.roo.shell.CommandMarker;
import org.springframework.roo.support.util.VersionUtils;
import org.springframework.shell.Constant;
@@ -37,7 +36,7 @@ public class DefaultBannerProvider implements BannerProvider, CommandMarker {
* @see org.springframework.core.Ordered#getOrder()
*/
public int getOrder() {
return 0;
return Integer.MAX_VALUE;
}
/* (non-Javadoc)

2
src/main/java/org/springframework/shell/plugin/support/DefaultHistoryFileNameProvider.java
View File

@@ -32,7 +32,7 @@ public class DefaultHistoryFileNameProvider implements HistoryFileNameProvider{
* @see org.springframework.core.Ordered#getOrder()
*/
public int getOrder() {
return 0;
return Integer.MAX_VALUE;
}
/* (non-Javadoc)

2
src/main/java/org/springframework/shell/plugin/support/DefaultPromptProvider.java
View File

@@ -32,7 +32,7 @@ public class DefaultPromptProvider implements PromptProvider{
* @see org.springframework.core.Ordered#getOrder()
*/
public int getOrder() {
return 0;
return Integer.MAX_VALUE;
}
/* (non-Javadoc)