Derby
  1. Derby
  2. DERBY-436

clean up imports and static field references in DRDA classes

    Details

    • Type: Task Task
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 10.1.1.0, 10.2.1.6
    • Fix Version/s: 10.10.1.1
    • Component/s: Network Server
    • Labels:
      None
    • Issue & fix info:
      Newcomer

      Description

      In DRDA Classes, eg. DRAConnThread.java, and other classes in org.apache.derby.drda, Eclipse shows that the imports need to be organized and the static field references need to be referenced in a static way. It would be good to clean up the warnings.

      1. d436.diff
        22 kB
        Knut Anders Hatlen

        Issue Links

          Activity

          Transition Time In Source Status Execution Times Last Executer Last Execution Date
          Open Open Resolved Resolved
          2575d 3h 59m 1 Knut Anders Hatlen 20/Jul/12 08:21
          Resolved Resolved Closed Closed
          483d 54m 1 Knut Anders Hatlen 15/Nov/13 08:15
          Knut Anders Hatlen made changes -
          Status Resolved [ 5 ] Closed [ 6 ]
          Hide
          Knut Anders Hatlen added a comment -

          [bulk update: close all resolved issues that haven't had any activity the last year]

          Show
          Knut Anders Hatlen added a comment - [bulk update: close all resolved issues that haven't had any activity the last year]
          Gavin made changes -
          Workflow jira [ 12321890 ] Default workflow, editable Closed status [ 12797560 ]
          Hide
          Kathey Marsden added a comment -

          Thanks Knut,

          I verified the -x -b option is there for svn diff and svn annotate as well and filed DERBY-5870 for the issue.

          Show
          Kathey Marsden added a comment - Thanks Knut, I verified the -x -b option is there for svn diff and svn annotate as well and filed DERBY-5870 for the issue.
          Knut Anders Hatlen made changes -
          Status Open [ 1 ] Resolved [ 5 ]
          Assignee Knut Anders Hatlen [ knutanders ]
          Fix Version/s 10.10.0.0 [ 12321550 ]
          Resolution Fixed [ 1 ]
          Hide
          Knut Anders Hatlen added a comment -

          Thanks, Kathey. I took that as a +1 to the patch, and committed it to trunk with revision 1363662. Marking this issue as resolved.

          I'm in favour of making the indentation style consistent, and now is probably as good a time to do it as any. Making merging difficult has been the main reason why we haven't done it before. If svn handles that now, I guess the main argument against it would be that it would be more difficult to check with svn annotate when a code fragment was introduced. But maybe the same flags could be used with svn annotate.

          (I'd probably be in favour of making this change even if the problems with merging and annotation weren't solved, though. Backporting may be a little painful in the beginning, but the old branches will become less relevant and backporting to them will happen less frequently as time passes. The sooner we do it, the sooner the pain will go away.

          Show
          Knut Anders Hatlen added a comment - Thanks, Kathey. I took that as a +1 to the patch, and committed it to trunk with revision 1363662. Marking this issue as resolved. I'm in favour of making the indentation style consistent, and now is probably as good a time to do it as any. Making merging difficult has been the main reason why we haven't done it before. If svn handles that now, I guess the main argument against it would be that it would be more difficult to check with svn annotate when a code fragment was introduced. But maybe the same flags could be used with svn annotate. (I'd probably be in favour of making this change even if the problems with merging and annotation weren't solved, though. Backporting may be a little painful in the beginning, but the old branches will become less relevant and backporting to them will happen less frequently as time passes. The sooner we do it, the sooner the pain will go away.
          Hide
          Kathey Marsden added a comment -

          Thank you Knut for all the cleanup in the drda package.

          This is a huge sideline and worthy of a separate issue if we do it, but I wonder during this cleanup time if it would be good at long last to change the drda package to use spaces instead of tabs. It looks like svn merge has an option to ignore spaces -x -b which will hopefully make merges less painful and anyone wanting a more complete annotation could look at the branches.

          Thoughts?

          Show
          Kathey Marsden added a comment - Thank you Knut for all the cleanup in the drda package. This is a huge sideline and worthy of a separate issue if we do it, but I wonder during this cleanup time if it would be good at long last to change the drda package to use spaces instead of tabs. It looks like svn merge has an option to ignore spaces -x -b which will hopefully make merges less painful and anyone wanting a more complete annotation could look at the branches. Thoughts?
          Knut Anders Hatlen made changes -
          Attachment d436.diff [ 12537243 ]
          Hide
          Knut Anders Hatlen added a comment -

          Here's a patch that fixes the import and static field issues I found in the org.apache.derby.impl.drda and org.apache.derby.drda packages. I just told NetBeans to organize the imports, on the assumption that it organizes them in a way that Eclipse also is happy with.

          All the regression tests passed.

          Show
          Knut Anders Hatlen added a comment - Here's a patch that fixes the import and static field issues I found in the org.apache.derby.impl.drda and org.apache.derby.drda packages. I just told NetBeans to organize the imports, on the assumption that it organizes them in a way that Eclipse also is happy with. All the regression tests passed.
          Kathey Marsden made changes -
          Link This issue relates to DERBY-5847 [ DERBY-5847 ]
          Dag H. Wanvik made changes -
          Issue & fix info [Newcomer]
          Kathey Marsden made changes -
          Field Original Value New Value
          Derby Categories [Newcomer]
          Kathey Marsden created issue -

            People

            • Assignee:
              Knut Anders Hatlen
              Reporter:
              Kathey Marsden
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development