Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build_plugins
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,6 @@ do_ant()
echo "Copying created jar file into $DISTDIR..."
cp jar/*aist*.jar ../$DISTDIR
cp jar/*aist*.jar ../$JARDIR
cp jar/org.iso*.jar ../$DISTDIR
cp jar/org.iso*.jar ../$JARDIR
cd ..
else
echo "Project: $project does not exist"
Expand Down
6 changes: 5 additions & 1 deletion jp.go.aist.rtm.nameserviceview/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
import java.util.ArrayList;
import java.util.List;

import jp.go.aist.rtm.nameserviceview.manager.NameServiceViewPreferenceManager;
import jp.go.aist.rtm.toolscommon.corba.CorbaUtil;

import org.omg.CosNaming.Binding;
import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContext;
import org.omg.CosNaming.NamingContextExt;
import org.omg.CosNaming.NamingContextExtHelper;

import RTM.ManagerHelper;
import jp.go.aist.rtm.nameserviceview.manager.NameServiceViewPreferenceManager;
import jp.go.aist.rtm.toolscommon.corba.CorbaUtil;

/**
* ネームサーバにアクセスするユーティリティ CORBA専用のクラスである
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package jp.go.aist.rtm.nameserviceview.ui.dialog;

import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
Expand Down Expand Up @@ -43,7 +44,12 @@ protected Control createDialogArea(Composite parent) {
createComposite(mainComposite);
return mainComposite;
}


@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, "Close", true);
}

private void createComposite(Composite mainComposite) {
Composite composite = new Composite(mainComposite, SWT.NONE);
GridLayout gl = new GridLayout(2, false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.DrillDownAdapter;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.ui.views.properties.IPropertySheetPage;

import jp.go.aist.rtm.nameserviceview.NameServiceViewPlugin;
Expand Down Expand Up @@ -69,7 +69,7 @@ public void createPartControl(Composite parent) {
getViewSite().setSelectionProvider(viewer);

viewer.addDragSupport(DND.DROP_COPY | DND.DROP_MOVE,
new Transfer[] { LocalSelectionTransfer.getInstance() },
new Transfer[] { LocalSelectionTransfer.getTransfer() },
new DragSourceAdapter() {
@Override
public void dragStart(DragSourceEvent event) {
Expand All @@ -84,7 +84,7 @@ public void dragSetData(DragSourceEvent event) {
.getSelection());

event.data = structuredSelection;
LocalSelectionTransfer.getInstance().setSelection(
LocalSelectionTransfer.getTransfer().setSelection(
structuredSelection);

super.dragSetData(event);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static String searchCommand(String target) {
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
result = reader.readLine();
} catch (IOException e) {
e.printStackTrace();
// e.printStackTrace();
}
return result;
}
Expand Down
6 changes: 5 additions & 1 deletion jp.go.aist.rtm.repositoryView/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/rtrepository_local-1.0.jar" sourcepath="jp.go.aist.rtm.repositoryViewsrc.zip"/>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.part.DrillDownAdapter;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -82,7 +82,7 @@ public void createPartControl(Composite parent) {
hookContextMenu();

viewer.addDragSupport(DND.DROP_COPY | DND.DROP_MOVE,
new Transfer[] { LocalSelectionTransfer.getInstance() },
new Transfer[] { LocalSelectionTransfer.getTransfer() },
new DragSourceAdapter() {
@Override
public void dragStart(DragSourceEvent event) {
Expand All @@ -97,7 +97,7 @@ public void dragSetData(DragSourceEvent event) {
.getSelection());

event.data = structuredSelection;
LocalSelectionTransfer.getInstance().setSelection(
LocalSelectionTransfer.getTransfer().setSelection(
structuredSelection);

super.dragSetData(event);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
2 changes: 2 additions & 0 deletions jp.go.aist.rtm.systemeditor/.classpath
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/jakarta.transaction-api-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/openjdk-orb-10.1.1.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-csv-1.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.10.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.10.2.jar"/>
Expand Down
4 changes: 3 additions & 1 deletion jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ Bundle-ClassPath: .,
lib/jackson-annotations-2.10.2.jar,
lib/jackson-core-2.10.2.jar,
lib/jackson-databind-2.10.2.jar,
lib/commons-csv-1.8.jar
lib/commons-csv-1.8.jar,
lib/jakarta.transaction-api-2.0.1.jar,
lib/openjdk-orb-10.1.1.Final.jar
Export-Package: influent,
jp.go.aist.rtm.systemeditor,
jp.go.aist.rtm.systemeditor._debug,
Expand Down
4 changes: 3 additions & 1 deletion jp.go.aist.rtm.systemeditor/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ bin.includes = META-INF/,\
lib/jackson-annotations-2.10.2.jar,\
lib/jackson-core-2.10.2.jar,\
lib/jackson-databind-2.10.2.jar,\
lib/commons-csv-1.8.jar
lib/commons-csv-1.8.jar,\
lib/jakarta.transaction-api-2.0.1.jar,\
lib/openjdk-orb-10.1.1.Final.jar
src.includes = lib/,\
COPYRIGHT,\
NOTICE.txt,\
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
import java.util.Iterator;
import java.util.List;

import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeConstants;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;

import org.eclipse.core.resources.IFile;
Expand Down Expand Up @@ -84,8 +86,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;

import jp.go.aist.rtm.systemeditor.RTSystemEditorPlugin;
import jp.go.aist.rtm.systemeditor.extension.SaveProfileExtension;
import jp.go.aist.rtm.systemeditor.factory.ProfileSaver;
Expand Down Expand Up @@ -384,9 +384,13 @@ public void doSave(IProgressMonitor monitor) {
boolean isReplace = dialog.isReplace();

getSystemDiagram().setSystemId(dialog.getSystemId());
XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
getSystemDiagram().setUpdateDate(calendar.toString());
try {
XMLGregorianCalendar calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar();
calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
getSystemDiagram().setUpdateDate(calendar.toString());
} catch (DatatypeConfigurationException e1) {
e1.printStackTrace();
}

// TODO バージョンアップログへの対応

Expand Down Expand Up @@ -432,10 +436,14 @@ public void doSaveAs() {
boolean isReplace = dialog.isReplace();

getSystemDiagram().setSystemId(dialog.getSystemId());
XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
getSystemDiagram().setCreationDate(calendar.toString());
getSystemDiagram().setUpdateDate(calendar.toString());
try {
XMLGregorianCalendar calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar();
calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
getSystemDiagram().setCreationDate(calendar.toString());
getSystemDiagram().setUpdateDate(calendar.toString());
} catch (DatatypeConfigurationException e1) {
e1.printStackTrace();
}

// TODO バージョンアップログへの対応

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class NameDirectEditManager extends DirectEditManager {

public NameDirectEditManager(GraphicalEditPart source, Class<?> editorType,
CellEditorLocator locator) {
super(source, editorType, locator);
super(source, (Class)editorType, locator);
this.model = source.getModel();
}

Expand Down
12 changes: 8 additions & 4 deletions jp.go.aist.rtm.toolscommon.profiles/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="schema"/>
<classpathentry kind="src" path="test"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl.jar"/>
<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0-2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.9.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-3.0.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.activation-api-1.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/jyaml-1.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/logback-classic-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/logback-core-1.1.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
19 changes: 16 additions & 3 deletions jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,19 @@ Bundle-ClassPath: .,
lib/logback-core-1.1.3.jar,
schema/,
lib/jyaml-1.3.jar,
lib/jaxb-impl.jar,
lib/istack-commons-runtime-3.0.7.jar,
lib/javax.activation-api-1.2.0.jar,
lib/jaxb-api-2.3.1.jar,
lib/jaxb-runtime-2.3.1.jar,
lib/jackson-databind-2.9.5.jar,
lib/jackson-annotations-2.9.5.jar,
lib/jackson-core-2.9.5.jar,
lib/jackson-databind-2.9.5.jar
lib/stax-api-1.0-2.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Import-Package: javax.xml.stream;version="1.0.2",
javax.xml.stream.events;version="1.0.2",
javax.xml.stream.util;version="1.0.2"
Export-Package: com.sun.xml.bind;
uses:="javax.xml.bind.annotation.adapters,
javax.xml.namespace,
Expand All @@ -31,7 +38,6 @@ Export-Package: com.sun.xml.bind;
org.xml.sax,
com.sun.xml.bind.v2.runtime,
javax.xml.bind.attachment,
javax.xml.stream,
javax.xml.transform,
com.sun.xml.bind.v2.model.annotation,
javax.xml.bind",
Expand Down Expand Up @@ -60,6 +66,13 @@ Export-Package: com.sun.xml.bind;
com.sun.xml.bind.v2.schemagen.episode,
com.sun.xml.bind.v2.schemagen.xmlschema,
com.sun.xml.bind.v2.util,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind.annotation.adapters,
javax.xml.bind.helpers,
javax.xml.stream;version="1.0.2",
javax.xml.stream.events;version="1.0.2",
javax.xml.stream.util;version="1.0.2",
jp.go.aist.rtm.toolscommon.profiles.util;uses:="junit.framework",
org.openrtp.namespaces.rtc.version02;uses:="javax.xml.bind,javax.xml.datatype",
org.openrtp.namespaces.rtc.version03;uses:="javax.xml.bind,javax.xml.datatype",
Expand Down
14 changes: 9 additions & 5 deletions jp.go.aist.rtm.toolscommon.profiles/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ bin.includes = .,\
plugin.xml,\
plugin.properties,\
lib/jyaml-1.3.jar,\
lib/jaxb-impl.jar,\
jyaml.yml,\
schema/,\
lib/slf4j-api-1.7.13.jar,\
lib/logback-classic-1.1.3.jar,\
lib/logback-core-1.1.3.jar,\
lib/jackson-annotations-2.9.5.jar,\
lib/jackson-core-2.9.5.jar,\
lib/jackson-databind-2.9.5.jar,\
COPYRIGHT,\
about.html,\
epl-1.0.txt
epl-1.0.txt,\
lib/istack-commons-runtime-3.0.7.jar,\
lib/javax.activation-api-1.2.0.jar,\
lib/jaxb-api-2.3.1.jar,\
lib/jaxb-runtime-2.3.1.jar,\
lib/jackson-databind-2.9.5.jar,\
lib/jackson-annotations-2.9.5.jar,\
lib/jackson-core-2.9.5.jar,\
lib/stax-api-1.0-2.jar
jars.compile.order = .
source.. = src/
output.. = bin/
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions jp.go.aist.rtm.toolscommon/.classpath
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/jakarta.transaction-api-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/openjdk-orb-10.1.1.Final.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Expand Down
14 changes: 11 additions & 3 deletions jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: jp.go.aist.rtm.toolscommon;singleton:=true
Bundle-Version: 2.0.0
Bundle-ClassPath: .,
lib/commons-lang-2.2.jar
Bundle-ClassPath: lib/commons-lang-2.2.jar,
lib/jakarta.transaction-api-2.0.1.jar,
lib/openjdk-orb-10.1.1.Final.jar,
.
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down Expand Up @@ -45,7 +47,13 @@ Export-Package: OpenRTM,
org.apache.commons.lang.math,
org.apache.commons.lang.mutable,
org.apache.commons.lang.text,
org.apache.commons.lang.time
org.apache.commons.lang.time,
org.omg.CORBA,
org.omg.CORBA.portable,
org.omg.CosNaming,
org.omg.CosNaming.NamingContextExtPackage,
org.omg.CosNaming.NamingContextPackage,
org.omg.PortableServer
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
Expand Down
4 changes: 3 additions & 1 deletion jp.go.aist.rtm.toolscommon/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ bin.includes = .,\
lib/,\
COPYRIGHT,\
about.html,\
epl-1.0.txt
epl-1.0.txt,\
lib/jakarta.transaction-api-2.0.1.jar,\
lib/openjdk-orb-10.1.1.Final.jar
jars.compile.order = .
source.. = src/
output.. = bin/
Expand Down
Binary file not shown.
Binary file not shown.
Loading