diff --git a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/actions/InteractiveFeatureLocatorAction.java b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/actions/InteractiveFeatureLocatorAction.java index 35ca8c9..e5f632d 100644 --- a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/actions/InteractiveFeatureLocatorAction.java +++ b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/actions/InteractiveFeatureLocatorAction.java @@ -272,6 +272,8 @@ // ��̓{�^���������̏��� analysisButton.addSelectionListener(new SelectionAdapter() { + private InteractiveDerivationView interactiveDerivationView; + public void widgetSelected(SelectionEvent arg0) { featureXMLPath = featureFolderPath + "\\feature" + featureNo + ".xml"; File featureFile = new File(featureXMLPath); @@ -289,14 +291,17 @@ page.findView(TraceView.ID); } } - InteractiveDerivationView.theInstance.reset(); + interactiveDerivationView = InteractiveDerivationView.theInstance; + interactiveDerivationView.reset(); shell.dispose(); try { Feature feature = new Feature(featureFolderPath); - doAnalyze(feature); + derivationManager = doAnalyze(feature); traceListView.setDerivationManager(derivationManager); traceListView.updateViewer(); + interactiveDerivationView.setDerivationManager(derivationManager); + interactiveDerivationView.updateViewer(); } catch (ParserConfigurationException | SAXException | IOException e2) { e2.printStackTrace(); } @@ -340,10 +345,11 @@ } // scenario.xml�����Ƃɉ�� - public void doAnalyze(Feature feature) { + public DerivationManager doAnalyze(Feature feature) { // System.out.println("��͊J�n"); - derivationManager = new DerivationManager(feature); + DerivationManager derivationManager = new DerivationManager(feature); derivationManager.firstDerivation(); + return derivationManager; } public ArrayList getFolder(File[] files) {