same name in progress handler as in editor and output tab
authorchrislovsund@netbeans.org
Tue, 28 May 2013 14:19:27 +0200
changeset 4173bf26d425839
parent 416 78be12b51ef0
child 418 59bb74aeee06
same name in progress handler as in editor and output tab
EADS-3756 - more meaning full name of progressbar
PLSQL/Execution/src/org/netbeans/modules/plsql/execution/impl/DatabaseConnectionIO.java
PLSQL/Execution/src/org/netbeans/modules/plsql/execution/impl/PlsqlExecutor.java
Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/PlsqlExecutableObject.java
     1.1 --- a/PLSQL/Execution/src/org/netbeans/modules/plsql/execution/impl/DatabaseConnectionIO.java	Tue May 28 13:57:55 2013 +0200
     1.2 +++ b/PLSQL/Execution/src/org/netbeans/modules/plsql/execution/impl/DatabaseConnectionIO.java	Tue May 28 14:19:27 2013 +0200
     1.3 @@ -51,8 +51,7 @@
     1.4      private String getIOTabName(PlsqlExecutableObject executionObject, String fileName, String displayName) {
     1.5          if (fileName.equals(displayName)) {
     1.6              if (executionObject != null && fileName.endsWith(".tdb")) {
     1.7 -                String str = executionObject.getPlsqlString().replaceAll("\n", " ");
     1.8 -                fileName = str.length() > 30 ? str.substring(0, 30) + "..." : str;
     1.9 +                fileName = executionObject.getSummery();
    1.10              }
    1.11          } else if (displayName != null) {
    1.12              fileName = displayName;
     2.1 --- a/PLSQL/Execution/src/org/netbeans/modules/plsql/execution/impl/PlsqlExecutor.java	Tue May 28 13:57:55 2013 +0200
     2.2 +++ b/PLSQL/Execution/src/org/netbeans/modules/plsql/execution/impl/PlsqlExecutor.java	Tue May 28 14:19:27 2013 +0200
     2.3 @@ -143,7 +143,7 @@
     2.4  
     2.5      @Override
     2.6      public void execute(List<PlsqlExecutableObject> executableObjects, Document document) {
     2.7 -        final ProgressHandle handle = ProgressHandleFactory.createHandle("Executing database file...", new Cancellable() {
     2.8 +        final ProgressHandle handle = ProgressHandleFactory.createHandle(executableObjects.get(0).getSummery(), new Cancellable() {
     2.9              @Override
    2.10              public boolean cancel() {
    2.11                  return handleCancel();
     3.1 --- a/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/PlsqlExecutableObject.java	Tue May 28 13:57:55 2013 +0200
     3.2 +++ b/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/PlsqlExecutableObject.java	Tue May 28 14:19:27 2013 +0200
     3.3 @@ -94,6 +94,15 @@
     3.4      public int getEndOffset() {
     3.5          return endoffset;
     3.6      }
     3.7 +
     3.8 +    /**
     3.9 +     *
    3.10 +     * @return first part of the PLSQL statement text.
    3.11 +     */
    3.12 +    public String getSummery() {
    3.13 +        String str = getPlsqlString().replaceAll("\n", " ");
    3.14 +        return str.length() > 30 ? str.substring(0, 30) + "..." : str;
    3.15 +    }
    3.16      private String plsqlString;
    3.17      private int startLineNo;
    3.18      private int startOffset;