Skip to content

Commit

Permalink
Edit README&CHANGELOG, cleanup codes
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiromu Hota committed Nov 22, 2016
1 parent cb6518d commit d7b45f7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 0.0.0.3 - 2016-11-22
### Fixed
- Restore the missing menubar.
- Revert the type of menuitem from "checkbox" to "push_button" (a fix has been made to pentaho-xul-swt regarding this).
- Fix the issue #3 "Certain keys cannot be typed" by disabling shortcut keys.

## 0.0.0.2 - 2016-11-09
### Fixed
- Fix the main Shell resizing: now the app area aligns with the browser window size.
Expand Down
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ webSpoon does not work with Java 7 since the dependent library (Eclipse RAP/RWT)
The following procedures assume that Pentaho BI server (CE or EE) has already been installed and webSpoon is deployed to the Apache Tomcat shipped with them, but webSpoon can also be deployed to other Java Application server (e.g., Jetty).

1. Download the latest `spoon.war` from [here](https://github.com/HiromuHota/pentaho-kettle/releases).
2. Copy the downloaded `spoon.war` to the `webapps` folder, e.g., `biserver-ce/tomcat/webapps` for CE, `Pentaho/server/biserver-ee/tomcat/webapps/` for EE.
2. Copy the downloaded `spoon.war` to the `webapps` folder, e.g., `biserver-ce/tomcat/webapps` for CE, `Pentaho/server/biserver-ee/tomcat/webapps` for EE.
3. (Re)start the BI server.

WebSpoon will sit next to the Pentaho User Console (i.e., `http://address:8080/spoon` when PUC is `http://address:8080/pentaho`).
Expand All @@ -56,12 +56,6 @@ WebSpoon will sit next to the Pentaho User Console (i.e., `http://address:8080/s

It is strongly recommended to use webSpoon with a Repository (can be Pentaho Repository, Kettle Database Repository, or Kettle File Repository), otherwise opening/saving files does not function as you would expect.
The steps to connect to a Repository is described [here](https://help.pentaho.com/Documentation/6.1/0J0/0C0/015) and [here](https://help.pentaho.com/Documentation/6.1/0L0/0Y0/040).
Since webSpoon currently doesn't have the menubar, the repository dialog cannot be opened from the menu.
Luckily there is another way to open the dialog: enabling the "Show this dialog at startup" in the `$HOME/.kettle/.spoonrc` (if `user` runs the Java Application server, `$HOME` is `/home/user`) as follows:

```
ShowRepositoriesAtStartup=Y
```

A progress bar will appear when clicking a OK button after selecting a connection, typing username and password.
Please remember to move the progress bar, otherwise it will not close.
Expand All @@ -78,7 +72,10 @@ Place plugins into either one of the following two folders:

## JDBC drivers

Place jar files into `webapps/spoon/WEB-INF/lib`.
Place jar files into either one of the following folders:

1. `biserver-ce/tomcat/lib` for CE or `Pentaho/server/biserver-ee/tomcat/lib` for EE.
2. `webapps/spoon/WEB-INF/lib`, but not recommended because this folder is overwritten when upgrading `spoon.war`.

# How to use (end-user perspective)

Expand All @@ -88,7 +85,6 @@ The detailed compatibility is described [here](http://www.eclipse.org/rap/notewo

## Known issues

- MenuBar is missing.
- Welcome page does not show anything.
- "Please Wait" dialog after the "Repository Connection" dialog won't close until it is manually moved or closed.
- "Run Options" dialog after the "Run" button won't popup until the canvas area is clicked.
Expand Down
18 changes: 8 additions & 10 deletions ui/src/org/pentaho/di/ui/spoon/Spoon.java
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,7 @@ public void init( TransMeta ti ) {
shell.pack();
shell.setMaximized( true ); // Default = maximized!
}
shell.setMaximized( true );

layout = new FormLayout();
layout.marginWidth = 0;
Expand All @@ -880,7 +881,6 @@ public void init( TransMeta ti ) {
data.grabExcessVerticalSpace = true;
data.verticalAlignment = SWT.FILL;
data.horizontalAlignment = SWT.FILL;
data.verticalSpan = 400;
sashComposite.setLayoutData( data );

sashComposite.setLayout( layout );
Expand Down Expand Up @@ -1463,9 +1463,9 @@ public void copy() {
boolean jobActive = jobMeta != null;
Control focusControl = getDisplay().getFocusControl();

// if ( focusControl instanceof StyledText ) {
// copyLogSelectedText( (StyledText) focusControl );
// } else {
if ( focusControl instanceof Text ) {
copyLogSelectedText( (Text) focusControl );
} else {
if ( transActive ) {
if ( transMeta.getSelectedSteps().size() > 0 ) {
copySteps();
Expand All @@ -1479,7 +1479,7 @@ public void copy() {
copyJob();
}
}
// }
}
}

public void copyFile() {
Expand Down Expand Up @@ -1642,9 +1642,9 @@ public boolean isExecutionResultsPaneVisible() {
return ( transGraph != null ) && ( transGraph.isExecutionResultsPaneVisible() );
}

// public void copyLogSelectedText( StyledText text ) {
// toClipboard( text.getSelectionText() );
// }
public void copyLogSelectedText( Text text ) {
toClipboard( text.getSelectionText() );
}

public void copyTransformation() {
copyTransformation( getActiveTransformation() );
Expand Down Expand Up @@ -9253,7 +9253,6 @@ protected void createContents( Composite parent ) {
shell = getShell();

init( null );
loadLastUsedFiles(); // has to be after init.

openSpoon();

Expand All @@ -9278,7 +9277,6 @@ protected void createContents( Composite parent ) {
//getMenuBarManager().updateAll( true );

//return parent;
shell.setMaximized( true );
}

@Override
Expand Down

0 comments on commit d7b45f7

Please sign in to comment.