← Back to branch summary

~ubuntu-branches/ubuntu/vivid/eclipse-linuxtools/vivid-proposed

« back to all changes in this revision

Viewing changes to lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizardPage.java

  • Committer: Package Import Robot
  • Author(s): Jakub Adam, Jakub Adam, tony mancill
  • Date: 2014-10-11 11:44:05 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20141011114405-yazjvxfzzhmi5sgj
Tags: 3.1.0-1
http://bugs.debian.org/761524
[ Jakub Adam ]
* New upstream release (Closes: #761524).
* Refreshed d/patches.
* Don't build removed feature org.eclipse.linuxtools.tools.launch
  - merged into org.eclipse.linuxtools.profiling.
* Use javac target 1.7.
* Build new feature org.eclipse.linuxtools.dataviewers.feature
  - required by Valgrind integration.
* Build-depend on eclipse-remote-services-api and eclipse-cdt-autotools.
* Bump Standards-Version to 3.9.6.
* Override incompatible-java-bytecode-format - linuxtools needs Java 7.
* Remove unused codeless-jar override.

[ tony mancill ]
* Tweak short package description to make lintian happy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizardPage.java
296
296
 
297
297
    @Override
298
298
    protected Object createElementViewerInput() {
299
 
        List<TracePackageTraceElement> traceElements = new ArrayList<TracePackageTraceElement>();
 
299
        List<TracePackageTraceElement> traceElements = new ArrayList<>();
300
300
        for (TmfTraceElement tmfTraceElement : fSelectedTraces) {
301
301
            TracePackageTraceElement traceElement = new TracePackageTraceElement(null, tmfTraceElement);
302
302
 
303
303
            // Trace files
304
 
            List<TracePackageElement> children = new ArrayList<TracePackageElement>();
 
304
            List<TracePackageElement> children = new ArrayList<>();
305
305
            TracePackageFilesElement filesElement = new TracePackageFilesElement(traceElement, tmfTraceElement.getResource());
306
306
            filesElement.setChecked(true);
307
307
            children.add(filesElement);
308
308
 
309
309
            // Supplementary files
310
310
            IResource[] supplementaryResources = tmfTraceElement.getSupplementaryResources();
311
 
            List<TracePackageElement> suppFilesChildren = new ArrayList<TracePackageElement>();
 
311
            List<TracePackageElement> suppFilesChildren = new ArrayList<>();
312
312
            TracePackageSupplFilesElement suppFilesElement = new TracePackageSupplFilesElement(traceElement);
313
313
            children.add(suppFilesElement);
314
314
            for (IResource res : supplementaryResources) {