diff --git a/MToolsFeatureProject/feature.xml b/MToolsFeatureProject/feature.xml index 062d4f2..6c92603 100644 --- a/MToolsFeatureProject/feature.xml +++ b/MToolsFeatureProject/feature.xml @@ -1,11 +1,11 @@ - - - - + + + + Copyright 2013 US Department of Veterans Affairs Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,88 +18,88 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MToolsUpdateSiteProject/artifacts.jar b/MToolsUpdateSiteProject/artifacts.jar index 511d877..ede4e79 100644 Binary files a/MToolsUpdateSiteProject/artifacts.jar and b/MToolsUpdateSiteProject/artifacts.jar differ diff --git a/MToolsUpdateSiteProject/content.jar b/MToolsUpdateSiteProject/content.jar index 86250de..6e14cae 100644 Binary files a/MToolsUpdateSiteProject/content.jar and b/MToolsUpdateSiteProject/content.jar differ diff --git a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.10.jar b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.10.jar new file mode 100644 index 0000000..788d30f Binary files /dev/null and b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.10.jar differ diff --git a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.6.jar b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.6.jar deleted file mode 100644 index e8c11b6..0000000 Binary files a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.6.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.7.jar b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.7.jar deleted file mode 100644 index 3acdc61..0000000 Binary files a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.7.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.8.jar b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.8.jar new file mode 100644 index 0000000..d7d877b Binary files /dev/null and b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.8.jar differ diff --git a/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.9.jar b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.9.jar new file mode 100644 index 0000000..2de1bfc Binary files /dev/null and b/MToolsUpdateSiteProject/features/gov.va.vista.mtools_1.1.9.jar differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.0.0.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.1.0.jar similarity index 97% rename from MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.0.0.jar rename to MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.1.0.jar index 478ffa3..337301a 100644 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.0.0.jar and b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.1.0.jar differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_0.1.9.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.1.1.jar similarity index 97% rename from MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_0.1.9.jar rename to MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.1.1.jar index 642a9d0..3c77bd7 100644 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_0.1.9.jar and b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.connection_1.1.1.jar differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_0.2.2.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_0.2.2.jar deleted file mode 100644 index d8a2842..0000000 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_0.2.2.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_1.0.0.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_1.0.0.jar index b8367e5..c8f08d2 100644 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_1.0.0.jar and b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.core_1.0.0.jar differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_0.2.1.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_0.2.1.jar deleted file mode 100644 index 745a22b..0000000 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_0.2.1.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_1.0.0.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_1.0.0.jar index b5be034..e8e27f0 100644 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_1.0.0.jar and b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.debug.ui_1.0.0.jar differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_0.1.13.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_0.1.13.jar deleted file mode 100644 index d19a732..0000000 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_0.1.13.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_1.0.0.jar b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_1.0.0.jar index 130333e..3edadfe 100644 Binary files a/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_1.0.0.jar and b/MToolsUpdateSiteProject/plugins/gov.va.med.iss.meditor_1.0.0.jar differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.0.2.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.0.2.jar deleted file mode 100644 index 49eaa45..0000000 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.0.2.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.0.3.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.0.3.jar deleted file mode 100644 index 1107765..0000000 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.0.3.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.1.0.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.1.0.jar new file mode 100644 index 0000000..a400f01 Binary files /dev/null and b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.core_1.1.0.jar differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.1.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.1.jar deleted file mode 100644 index c8c3cc6..0000000 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.1.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.2.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.2.jar index e28d9eb..8bdbfa4 100644 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.2.jar and b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.server_1.0.2.jar differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.2.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.2.jar deleted file mode 100644 index 382818c..0000000 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.2.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.3.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.3.jar index 8737508..ef98070 100644 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.3.jar and b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.tools_1.1.3.jar differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.wizard_1.0.1.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.wizard_1.0.1.jar index 0738d76..729666b 100644 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.wizard_1.0.1.jar and b/MToolsUpdateSiteProject/plugins/us.pwc.vista.eclipse.wizard_1.0.1.jar differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.2.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.2.jar deleted file mode 100644 index 75688b7..0000000 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.2.jar and /dev/null differ diff --git a/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.3.jar b/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.3.jar index 9dcfd68..e1b446d 100644 Binary files a/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.3.jar and b/MToolsUpdateSiteProject/plugins/us.pwc.vista.mlib_1.0.3.jar differ diff --git a/MToolsUpdateSiteProject/site.xml b/MToolsUpdateSiteProject/site.xml index 2c88d98..d5d7ded 100644 --- a/MToolsUpdateSiteProject/site.xml +++ b/MToolsUpdateSiteProject/site.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/README.md b/README.md new file mode 100644 index 0000000..62eef61 --- /dev/null +++ b/README.md @@ -0,0 +1,118 @@ +# Introduction +This package lets you edit M Routines and Look at globals using Eclipse. It also includes a non-functional terminal and Debugging capabilities which are close to being done but are not quite there yet. + +# Installation +## Requirements + - Recent Eclipse. Tested on Luna, Kepler, and Juno. + - Java 1.7 or Java 1.8. YOU MUST CHECK FOR THAT USING YOUR OS'S COMMAND LINE. + ECLISPE DOES NOT WARN YOU IF IT CAN'T LOAD IT. Use `java -version` to find out + what version you have. + - DOES NOT WORK ON MACS. Joel Ivey's version works, but I have to make + instructions for it. + +## How to install +### Eclipse + - Download the latest Eclipse IDE from http://eclipse.org. Any version-type is + fine. Download the smallest one. + - To install Eclipse, all you need to do is unzip the downloaded folder in a + place you can remember and open the Eclipse file (Eclipse.exe on Windows, + eclipse on Linux) + - On Eclipse, Menu Help > Install New Software... + - Click Add + - Enter `M-tools` in first field and `https://raw.githubusercontent.com/shabiel/M-Tools-Project/master/MToolsUpdateSiteProject/` on the next. + - Click on Next, Next, Accept the license, Finish. + - Override the warning about unsigned content. + +### VISTA + - Log into VISTA as a programmer in Programming Mode + - Create a user that has XUPROG and XUPROGMODE. If you use the OSEHRA Test + runner or the OSEHRA virtual machine, you will already have the System Manager + user (AC;VC: SM1234;SM1234!!!) that has that permission. I won't cover how to + create a user here. + - Get and Install this KID build: https://raw.githubusercontent.com/shabiel/M-Tools/T12/M-Editor%20For%20Eclipse%20XT_7.3_101%20not%20yet%20released/XT73P101T12.kid + - Get the file first: On Linux, type: + ``` + cd /tmp/ + wget https://raw.githubusercontent.com/shabiel/M-Tools/T12/M-Editor%20For%20Eclipse%20XT_7.3_101%20not%20yet%20released/XT73P101T12.kid + $gtm_dist/mumps -dir + + GTM>D ^XPDIL,^XPDI + + Enter a Host File: /tmp/XT73P101T12.kid + + KIDS Distribution saved on Apr 17, 2015@16:20:41 + Comment: T12: Added the correct version of XUSRB1 + + This Distribution contains Transport Globals for the following Package(s): + XT*7.3*101 + Distribution OK! + + Want to Continue with Load? YES// + GTM>D ^XPDIL,^XPDI + + Enter a Host File: /tmp/XT73P101T12.kid + + KIDS Distribution saved on Apr 17, 2015@16:20:41 + Comment: T12: Added the correct version of XUSRB1 + + This Distribution contains Transport Globals for the following Package(s): + XT*7.3*101 + Distribution OK! + + Want to Continue with Load? YES// + + Select INSTALL NAME: XT*7.3*101 Loaded from Distribution 4/17/15@16:54 + :11 + => T12: Added the correct version of XUSRB1 ;Created on Apr 17, 2015@16: + + This Distribution was loaded on Apr 17, 2015@16:54:11 with header of + T12: Added the correct version of XUSRB1 ;Created on Apr 17, 2015@16:20:41 + It consisted of the following Install(s): + XT*7.3*101 + Checking Install for Package XT*7.3*101 + + Install Questions for XT*7.3*101 + + + + Want KIDS to INHIBIT LOGONs during the install? NO// + Want to DISABLE Scheduled Options, Menu Options, and Protocols? NO// +``` + + +# Brief Usage Tutorial + 1. Make sure that you have a VistALink port open on your VISTA environment. Cache users can use the XOBU SITE SETUP MENU to start a port. GT.M users need to use a xinetd listener that invokes `GTMLNX^XOBVTCP`. + 2. Menu Window > Preferences > VistA. Give the server a name and add its ip address and port number for your VistALink port. + 3. Hit OK, OK. + 4. Open M Prespective by Window > Open Prespective > Other > VistA. You may need to resize your prespective by "restoring" the Windows. + 5. Create a new Project, or import a git repository. You can google the latter. For the first, File > New > Project > General > Project. Choose a name and hit okay. + 6. On the Project Exlporer on your upper left corner, right click on the Project, choose Properties, then choose VistA. Type in the name *exactly* of your VistA server that you set up in Step 2. Hit OK. + 7. Click on Menu VistA > Connect to VistA. You should see a screen asking you for the access and verify code. If you don't see this screen, you need to check all your settings, down to whether you can even connect to the VistALink port from netcat or telnet. Also, YOU MUST USE A USER WHO HAS THE KEY XUPROGMODE. + 8. Once you are signed in, you can use the VistA menu or the ugly green M button to load a routine. Saving is done using the regular Eclipse Save. To create a new routine Menu File > New > VistA Routine. + + That's it. + + There is detailed usage documentation in the repository. + +# Linux Notes +Linux is always finicky. So here's my set-up that I am sure works. + + - I have Ubuntu 14.04 x64. + - Install Oracle Java 7 or 8. Make sure it's set to be the default java + implementation in the system. My memory tells me that OpenJDK didn't work; but + it should be tried again. + - Eclipse Luna x64. + +# Plug-in Development guidance + +MTools imported as an Eclipse project. + +Can be ran via opening the plugin.xml of a given projecting and clicking run or debug in the upper right corner. + +Or alternatively just to copy the files from /MtoolsUpdateSiteProject/plugins (the 3 jar plugin files) into $ECLIPSE_HOME/dropins. + +Can also use the project 'MToolsUpdateSite' to create and deploy p2 update site later (as is done in RASR). + + +Notes: +Refer to /MiscDependencies and /docs for complete installation details. diff --git a/README.txt b/README.txt deleted file mode 100644 index 475bb1c..0000000 --- a/README.txt +++ /dev/null @@ -1,11 +0,0 @@ -MTools imported as an Eclipse project. - -Can be ran via opening the plugin.xml of a given projecting and clicking run or debug in the upper right corner. - -Or alternatively just to copy the files from /MtoolsUpdateSiteProject/plugins (the 3 jar plugin files) into $ECLIPSE_HOME/dropins. - -Can also use the project 'MToolsUpdateSite' to create and deploy p2 update site later (as is done in RASR). - - -Notes: -Refer to /MiscDependencies and /docs for complete installation details. \ No newline at end of file diff --git a/gov.va.med.iss.connection/.project b/gov.va.med.iss.connection/.project index 6db9697..b982bad 100644 --- a/gov.va.med.iss.connection/.project +++ b/gov.va.med.iss.connection/.project @@ -1,28 +1,28 @@ - - - gov.va.med.iss.connection - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + gov.va.med.iss.connection + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/gov.va.med.iss.connection/LICENSE b/gov.va.med.iss.connection/LICENSE index 4228ba5..eb0bea1 100644 --- a/gov.va.med.iss.connection/LICENSE +++ b/gov.va.med.iss.connection/LICENSE @@ -1,13 +1,13 @@ - Copyright 2013 US Department of Veteran Affairs - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and + Copyright 2013 US Department of Veteran Affairs + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and limitations under the License. \ No newline at end of file diff --git a/gov.va.med.iss.connection/META-INF/MANIFEST.MF b/gov.va.med.iss.connection/META-INF/MANIFEST.MF index a3821a1..c8e5e51 100644 --- a/gov.va.med.iss.connection/META-INF/MANIFEST.MF +++ b/gov.va.med.iss.connection/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: VistA Connection Bundle-SymbolicName: gov.va.med.iss.connection;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.1 Bundle-Activator: gov.va.med.iss.connection.VLConnectionPlugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseConnection.java b/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseConnection.java index 7cffa56..ce958a1 100644 --- a/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseConnection.java +++ b/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseConnection.java @@ -87,49 +87,105 @@ public VistaKernelPrincipalImpl getConnection(String server, String port) { // get principal userPrincipal = VistaKernelPrincipalImpl.getKernelPrincipal(eclipseLoginModule.getSubject()); } catch (Exception e) { - if (e.getMessage().indexOf("Connection timed out") > -1) { - MessageDialog.openInformation( - window.getShell(), - "Meditor Login Error", - "Timed out while attempting to connect.\n\nCheck that \""+server+"\" and "+port+" are correct for server and port.\n\nCheck that the listener is running."); - - } - else if (e.getMessage().indexOf("Connection refused: connect") > -1) { - MessageDialog.openError( - window.getShell(), - "MEditor Login Error", - "Connection Refused - check if VistALink listener is running"); - } - else if (e.getMessage().indexOf("response is not VistaLink") > -1) { - MessageDialog.openError( - window.getShell(), - "MEditor Login Error", - "Connection Refused - does not appear to be a VistALink listener (a VistaLink not RPCBroker listener port is needed)."); - } - else if (e.getMessage().indexOf("ArrayIndexOutOfBounds") > -1) { - MessageDialog.openError( - window.getShell(), - "MEditor Login Error", - "Connection Refused - check that a VistALink listener is running on the specified port and that the port number is not for an RPCBroker listener."); - } - else if (e.getMessage().indexOf("Error converting port string to integer") > -1) { - MessageDialog.openError( - window.getShell(), - "MEditor Login Error", - "Connection Refused - not a numeric port number (and perhaps other problems). From the menu select Window - Preferences - expand the VistA tab and select Connection. Add a new entry with the correct data, then use the Move Up button to make it first in the list, then select the bad entry (next to the top) and click the Remove button to remove it. Then click Apply and OK."); - } - else { - MessageDialog.openInformation( - window.getShell(), - "Meditor Login Error", - e.getMessage()); - } + displayError(server, port, window, e); userPrincipal = null; topFrame.dispose(); } if (! (topFrame == null)) topFrame.dispose(); return userPrincipal; } + + /** + * @author Sam Habiel (ven/smh) + * + * Silent implementation of logging in. Helps with Mac OS X support as AWT doesn't + * work with Eclipse on a Mac as of Java 1.7. + * + * */ + +public VistaKernelPrincipalImpl getConnection(String server, String port, String ac, String vc) +{ + int intPort; + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + Subject subject = new Subject(); + + try + { + eclipseLoginModule = new EclipseLoginModule(); + eclipseLoginModule.initialize(subject); + intPort = Integer.parseInt(port); + } + catch (Exception e) + { + throw new RuntimeException("Error in eclipseLoginModule creation " + e.getMessage()); + } + + try + { + boolean loggedIn = eclipseLoginModule.loginSilent(server, intPort, ac, vc); + + if (loggedIn) + { + eclipseLoginModule.commit(true); + + userPrincipal = VistaKernelPrincipalImpl.getKernelPrincipal(eclipseLoginModule.getSubject()); + } + else + { + userPrincipal = null; + } + + } + + catch (Exception e) + { + displayError(server, port, window, e); + userPrincipal = null; + } + + return userPrincipal; +} + + private void displayError(String server, String port, + IWorkbenchWindow window, Exception e) { + if (e.getMessage().indexOf("Connection timed out") > -1) { + MessageDialog.openInformation( + window.getShell(), + "Meditor Login Error", + "Timed out while attempting to connect.\n\nCheck that \""+server+"\" and "+port+" are correct for server and port.\n\nCheck that the listener is running."); + + } + else if (e.getMessage().indexOf("Connection refused: connect") > -1) { + MessageDialog.openError( + window.getShell(), + "MEditor Login Error", + "Connection Refused - check if VistALink listener is running"); + } + else if (e.getMessage().indexOf("response is not VistaLink") > -1) { + MessageDialog.openError( + window.getShell(), + "MEditor Login Error", + "Connection Refused - does not appear to be a VistALink listener (a VistaLink not RPCBroker listener port is needed)."); + } + else if (e.getMessage().indexOf("ArrayIndexOutOfBounds") > -1) { + MessageDialog.openError( + window.getShell(), + "MEditor Login Error", + "Connection Refused - check that a VistALink listener is running on the specified port and that the port number is not for an RPCBroker listener."); + } + else if (e.getMessage().indexOf("Error converting port string to integer") > -1) { + MessageDialog.openError( + window.getShell(), + "MEditor Login Error", + "Connection Refused - not a numeric port number (and perhaps other problems). From the menu select Window - Preferences - expand the VistA tab and select Connection. Add a new entry with the correct data, then use the Move Up button to make it first in the list, then select the bad entry (next to the top) and click the Remove button to remove it. Then click Apply and OK."); + } + else { + MessageDialog.openInformation( + window.getShell(), + "Meditor Login Error", + e.getMessage()); + } + } @SuppressWarnings("rawtypes") diff --git a/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseLoginModule.java b/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseLoginModule.java index 413e3a7..9f77c55 100644 --- a/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseLoginModule.java +++ b/gov.va.med.iss.connection/src/gov/va/med/foundations/security/vistalink/EclipseLoginModule.java @@ -23,6 +23,7 @@ import java.util.TreeMap; import java.util.Vector; +import javax.resource.ResourceException; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -32,6 +33,10 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; @SuppressWarnings("rawtypes") @@ -139,6 +144,12 @@ public void initialize(Subject subject, CallbackHandler callbackHandler, Map sha this.callbackHandler = callbackHandler; } + // ven/smh -- let's see if that fixes the undef bug. + public void initialize(Subject subject) + { + this.subject = subject; + } + public String getServer() { return (String) this.options.get(SERVER_ADDRESS_KEY); } @@ -520,10 +531,127 @@ private SecurityDataLogonResponse getIntroductoryTextAndSetupInfo( return returnVal; } + /* + * @author Sam Habiel + * Silent log-in, generally useful; but also good to support Mac OS as AWT in Eclipse + * doesn't work as of Java 7. + */ + public boolean loginSilent(String serverAddress, int serverPort, String ac, String vc) + throws + VistaLoginModuleException, + VistaLoginModuleLoginsDisabledException, + VistaLoginModuleNoJobSlotsAvailableException, + VistaLoginModuleNoPathToListenerException + { + + if(logger.isDebugEnabled()) + { + logger.debug("Entered Silent Login"); + } + + VistaLinkConnection myConnection = null; + SecurityResponseFactory securityResponseFactory = null; + String exceptionMessage = "VistaLoginModule login method failed."; + loginSucceeded = false; + + try { + myVCF = VistaLinkConnectionFactory.getVistaLinkConnectionFactory(serverAddress, serverPort); + myConnection = (VistaLinkConnection) myVCF.getConnection(); + } catch (ResourceException e) { + throw new VistaLoginModuleException(exceptionMessage, e); + } + securityResponseFactory = new SecurityResponseFactory(); + + try + { + // Create message + SecurityRequest requestVO = SecurityRequestFactory.getAVSetupAndIntroTextRequest(); + + if (logger.isDebugEnabled()) + { + logger.debug("-> sending " + SecurityRequestFactory.MSG_ACTION_SETUP_AND_INTRO_TEXT); + } + + // Send to XUS SETUP and XUS INTRO TEXT + Object responseDataObj = myConnection.executeInteraction(requestVO, securityResponseFactory); + + // If we didn't crash (vi exceptions), this must be true. + assert(responseDataObj instanceof SecurityDataSetupAndIntroTextResponse); + + // log for my entertainment + if (logger.isDebugEnabled()) + { + SecurityDataSetupAndIntroTextResponse responseData = + (SecurityDataSetupAndIntroTextResponse) responseDataObj; + { + logger.debug("Result SecurityDataSetupAndIntroTextResponse responseData: " + responseData.getResultType()); + } + } + + // Create log-in message for XUS AV CODE + requestVO = SecurityRequestFactory.getAVLogonRequest(ac, vc, false); + + if (logger.isDebugEnabled()) { + logger.debug("-> sending " + SecurityRequestFactory.MSG_ACTION_LOGON); + } + + // and call XUS AV CODE + SecurityDataLogonResponse logonResponseData = + (SecurityDataLogonResponse) myConnection.executeInteraction(requestVO, securityResponseFactory); + + if (logger.isDebugEnabled()) { + logger.debug("Result from logonResposeData: " + logonResponseData.getResultType()); + } + + // XUS AV CODE says we can't log-in or we need to change our verify code. + if (logonResponseData.getResultType() == SecurityResponse.RESULT_PARTIAL || + logonResponseData.getResultType() == SecurityResponse.RESULT_FAILURE) + { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + Shell shell = window.getShell(); + MessageDialog.openError(shell, "Log-in Failed", logonResponseData.getResultMessage()); + } + + else + { + // Call XUS GET USER INFO + assert(logonResponseData.getResultType() == SecurityResponse.RESULT_SUCCESS); + getUserDemographicsAndBuildPrincipal(myConnection, securityResponseFactory); + userPrincipal.setAuthenticatedConnection(myConnection); + loginSucceeded = true; + } + } + + + + catch (ParserConfigurationException e) { + logoutConnectionBeforeLoginComplete(myConnection, securityResponseFactory); + if (logger.isEnabledFor(Level.ERROR)) { + logger.error(exceptionMessage, e); + } + throw new VistaLoginModuleException(exceptionMessage, e); + } catch (SecurityFaultException e) { + // logged lower down + logoutConnectionBeforeLoginComplete(myConnection, securityResponseFactory); + String errMsg = "Security fault occured on the M system."; + throw new VistaLoginModuleException(errMsg, e); + } catch (VistaLinkFaultException e) { + // logged lower down + logoutConnectionBeforeLoginComplete(myConnection, securityResponseFactory); + throw new VistaLoginModuleException(exceptionMessage, e); + } catch (FoundationsException e) { + // connector code already logged + logoutConnectionBeforeLoginComplete(myConnection, securityResponseFactory); + throw new VistaLoginModuleException(exceptionMessage, e); + } + + return loginSucceeded; + } /** * Called by both the "auto-logon" and regular logon code to process a partially successful login * (i.e., either the v/c needs to be changed or a division needs to be selected.) + * (nb: not called by silent log-on... b/c it's silent) * @param myConnection connection to use * @param responseData the logon response returned from the logon attempt that was partially successful * @param retryLogonCount # of times to retry the login @@ -1041,6 +1169,18 @@ public boolean commit() throws LoginException { return true; } + /* VEN/SMH I overloaded the previous method so that I can + * get a new signature for just doing a commit with no UI work + */ + + @SuppressWarnings("unchecked") + public boolean commit(boolean silent) throws LoginException { + if (!subject.getPrincipals().contains(userPrincipal)) { + subject.getPrincipals().add(userPrincipal); + } + return true; + } + /** * Should never be called by an application directly. Instead, this method is invoked behind the scenes by the proxy * of the JAAS LoginContext.

Part of the JAAS interface for a login module. This loginmodule's implementation of diff --git a/gov.va.med.iss.connection/src/gov/va/med/iss/connection/ConnectionManager.java b/gov.va.med.iss.connection/src/gov/va/med/iss/connection/ConnectionManager.java index 4c626c0..9874a8e 100644 --- a/gov.va.med.iss.connection/src/gov/va/med/iss/connection/ConnectionManager.java +++ b/gov.va.med.iss.connection/src/gov/va/med/iss/connection/ConnectionManager.java @@ -56,7 +56,20 @@ private void checkProductionConnection(VistaLinkConnection connection, String se private VistAConnection createConnection(ServerData serverData) { try { EclipseConnection eclipseConnection = new EclipseConnection(); - VistaKernelPrincipalImpl principal = eclipseConnection.getConnection(serverData.getAddress(), serverData.getPort()); + VistaKernelPrincipalImpl principal; + + /* VEN/SMH - new to support silent log-in */ + if (serverData.getAC() != "" && serverData.getVC() != "") + { + principal = eclipseConnection.getConnection( + serverData.getAddress(), serverData.getPort(), serverData.getAC(), serverData.getVC()); + } + + else + { + principal = eclipseConnection.getConnection(serverData.getAddress(), serverData.getPort()); + } + if (principal != null) { VistaLinkConnection connection = principal.getAuthenticatedConnection(); VistAConnection result = new VistAConnection(serverData, connection, eclipseConnection); diff --git a/gov.va.med.iss.connection/src/log4j.properties b/gov.va.med.iss.connection/src/log4j.properties new file mode 100644 index 0000000..e4fcb01 --- /dev/null +++ b/gov.va.med.iss.connection/src/log4j.properties @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=DEBUG, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n \ No newline at end of file diff --git a/gov.va.med.iss.debug.ui/src/gov/va/mumps/debug/ui/terminal/TerminalControlWrap.java b/gov.va.med.iss.debug.ui/src/gov/va/mumps/debug/ui/terminal/TerminalControlWrap.java index 488f747..44b53b4 100644 --- a/gov.va.med.iss.debug.ui/src/gov/va/mumps/debug/ui/terminal/TerminalControlWrap.java +++ b/gov.va.med.iss.debug.ui/src/gov/va/mumps/debug/ui/terminal/TerminalControlWrap.java @@ -7,6 +7,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; +import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; @@ -80,4 +81,49 @@ public void setTerminalTitle(String title) { public void setMsg(String msg) { this.actual.setMsg(msg); } + + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isConnectOnEnterIfClosed() + */ + @Override + public boolean isConnectOnEnterIfClosed() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isVT100LineWrapping() + */ + @Override + public boolean isVT100LineWrapping() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setConnectOnEnterIfClosed(boolean) + */ + @Override + public void setConnectOnEnterIfClosed(boolean arg0) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setVT100LineWrapping(boolean) + */ + @Override + public void setVT100LineWrapping(boolean arg0) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setupTerminal(org.eclipse.swt.widgets.Composite) + */ + @Override + public void setupTerminal(Composite arg0) { + // TODO Auto-generated method stub + + } } diff --git a/gov.va.med.iss.meditor/.project b/gov.va.med.iss.meditor/.project index c63bd2e..4460533 100644 --- a/gov.va.med.iss.meditor/.project +++ b/gov.va.med.iss.meditor/.project @@ -1,28 +1,28 @@ - - - gov.va.med.iss.meditor - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + gov.va.med.iss.meditor + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/gov.va.med.iss.meditor/LICENSE b/gov.va.med.iss.meditor/LICENSE index 4228ba5..eb0bea1 100644 --- a/gov.va.med.iss.meditor/LICENSE +++ b/gov.va.med.iss.meditor/LICENSE @@ -1,13 +1,13 @@ - Copyright 2013 US Department of Veteran Affairs - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and + Copyright 2013 US Department of Veteran Affairs + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and limitations under the License. \ No newline at end of file diff --git a/us.pwc.vista.eclipse.core/.project b/us.pwc.vista.eclipse.core/.project index 70977ec..dd47354 100644 --- a/us.pwc.vista.eclipse.core/.project +++ b/us.pwc.vista.eclipse.core/.project @@ -1,28 +1,28 @@ - - - us.pwc.vista.eclipse.core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + us.pwc.vista.eclipse.core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/us.pwc.vista.eclipse.core/META-INF/MANIFEST.MF b/us.pwc.vista.eclipse.core/META-INF/MANIFEST.MF index 278a0e1..8aded03 100644 --- a/us.pwc.vista.eclipse.core/META-INF/MANIFEST.MF +++ b/us.pwc.vista.eclipse.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: VistA Eclipse Core Bundle-SymbolicName: us.pwc.vista.eclipse.core;singleton:=true -Bundle-Version: 1.0.3 +Bundle-Version: 1.1.0 Bundle-Activator: us.pwc.vista.eclipse.core.VistACorePlugin Bundle-Vendor: PwC Require-Bundle: org.eclipse.ui, diff --git a/us.pwc.vista.eclipse.core/build.properties b/us.pwc.vista.eclipse.core/build.properties index 285b8bf..6c480f3 100644 --- a/us.pwc.vista.eclipse.core/build.properties +++ b/us.pwc.vista.eclipse.core/build.properties @@ -1,6 +1,6 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - icons/ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + icons/ diff --git a/us.pwc.vista.eclipse.core/plugin.xml b/us.pwc.vista.eclipse.core/plugin.xml index 46fee8a..f56a2f2 100644 --- a/us.pwc.vista.eclipse.core/plugin.xml +++ b/us.pwc.vista.eclipse.core/plugin.xml @@ -1,247 +1,247 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/ServerData.java b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/ServerData.java index 212e5df..3ae2aef 100644 --- a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/ServerData.java +++ b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/ServerData.java @@ -1,3 +1,7 @@ +// +// @Authors: Ufsin A, JD Spivey, SMA Habiel +// + package us.pwc.vista.eclipse.core; import org.eclipse.jface.viewers.LabelProvider; @@ -7,23 +11,35 @@ public class ServerData { private String name; private String address; private String port; + private String ac; // access code + private String vc; // verify code public ServerData() { - super(); this.name = ""; this.address = ""; this.port = ""; + this.ac = ""; + this.vc = ""; } public ServerData(String name, String address, String port) { - super(); this.name = name; this.address = address; this.port = port; + this.ac = ""; + this.vc = ""; } + public ServerData(String name, String address, String port, String ac, String vc) { + this.name = name; + this.address = address; + this.port = port; + this.ac = ac; + this.vc = vc; + } + public ServerData(ServerData rhs) { - this(rhs.name, rhs.address, rhs.port); + this(rhs.name, rhs.address, rhs.port, rhs.ac, rhs.vc); } public String getName() { @@ -37,20 +53,30 @@ public String getAddress() { public String getPort() { return port; } + + public String getAC() { + return ac; + } + + public String getVC() { + return vc; + } public void reset() { this.name = ""; this.address = ""; this.port = ""; + this.ac = ""; + this.vc = ""; } @Override public String toString() { - return this.name + ";" + this.address + ";" + this.port; + return this.name + ";" + this.address + ";" + this.port + ";" + this.ac + ";" + this.vc; } public String toUIString() { - return this.name + " (" + this.address + ";" + this.port + ")"; + return this.name + " (" + this.address + ";" + this.port + ") " + "AC: " + this.ac; } public static LabelProvider getLabelProvider() { @@ -74,11 +100,40 @@ public String getText(Object element) { public static ServerData valueOf(String s) { String[] fields = s.split(";"); - ServerData serverData = new ServerData(fields[0], fields[1], fields[2]); + + ServerData serverData = null; + + if (fields.length == 3) + { + serverData = new ServerData(fields[0], fields[1], fields[2]); + } + if (fields.length == 5) + { + serverData = new ServerData(fields[0], fields[1], fields[2], fields[3], fields[4]); + } + + // Just in case our internal user decided to use 4 args. Only 3 or 5 is okay. + assert (serverData != null); + return serverData; } public boolean isComplete() { - return ! (this.name.isEmpty() || this.address.isEmpty() || this.port.isEmpty()); + // Are we on a Mac? Eclipse doesn't support AWT on a Mac + // since Java 1.7. Causes a dead lock. + // Ref: https://developer.apple.com/legacy/library/technotes/tn2147/_index.html + // Ref: https://community.oracle.com/thread/1394443 + boolean onMac = System.getProperty("os.name").toUpperCase().contains("MAC"); + + // Version 1: no ac/vc (but only on Non-Macs + if (this.ac.isEmpty() && this.vc.isEmpty() && !onMac) + { + return ! (this.name.isEmpty() || this.address.isEmpty() || this.port.isEmpty()); + } + // Version 2: has to have both ac and vc + else + { + return ! (this.name.isEmpty() || this.address.isEmpty() || this.port.isEmpty() || this.ac.isEmpty() || this.vc.isEmpty()); + } } } diff --git a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/VistACorePlugin.java b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/VistACorePlugin.java index d1a8ac0..f82a4e7 100644 --- a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/VistACorePlugin.java +++ b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/VistACorePlugin.java @@ -1,70 +1,70 @@ -package us.pwc.vista.eclipse.core; - -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class VistACorePlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "us.pwc.vista.eclipse.core"; //$NON-NLS-1$ - - // The shared instance - private static VistACorePlugin plugin; - - /** - * The constructor - */ - public VistACorePlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static VistACorePlugin getDefault() { - return plugin; - } - - /** - * Convenience method to return the dialog settings for a particular - * Dialog. Class name is used as section and a subsection - * can also be used. If the dialog settings is not found it is created. - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#getDialogSettings - * @param clazz dialog class - * @param subsection - * @return the dialog settings - */ - public IDialogSettings getDialogSettings(Object object, String subsection) { - IDialogSettings settings = this.getDialogSettings(); - String section = object.getClass().getName() + "_" + subsection; - IDialogSettings result = settings.getSection(section); - if (result == null) { - result = settings.addNewSection(section); - } - return result; - } -} +package us.pwc.vista.eclipse.core; + +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class VistACorePlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "us.pwc.vista.eclipse.core"; //$NON-NLS-1$ + + // The shared instance + private static VistACorePlugin plugin; + + /** + * The constructor + */ + public VistACorePlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static VistACorePlugin getDefault() { + return plugin; + } + + /** + * Convenience method to return the dialog settings for a particular + * Dialog. Class name is used as section and a subsection + * can also be used. If the dialog settings is not found it is created. + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#getDialogSettings + * @param clazz dialog class + * @param subsection + * @return the dialog settings + */ + public IDialogSettings getDialogSettings(Object object, String subsection) { + IDialogSettings settings = this.getDialogSettings(); + String section = object.getClass().getName() + "_" + subsection; + IDialogSettings result = settings.getSection(section); + if (result == null) { + result = settings.addNewSection(section); + } + return result; + } +} diff --git a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/helper/SWTHelper.java b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/helper/SWTHelper.java index f2c55fb..4f624a9 100644 --- a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/helper/SWTHelper.java +++ b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/helper/SWTHelper.java @@ -1,191 +1,191 @@ -package us.pwc.vista.eclipse.core.helper; - -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.layout.PixelConverter; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TableViewerColumn; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Text; - -public class SWTHelper { - private static int getButtonWidthHint(Button button) { - PixelConverter pc = new PixelConverter(button); - int h= pc.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - return Math.max(h, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - } - - public static Button createButton(Composite parent, String text) { - Button b = new Button(parent, SWT.PUSH); - b.setFont(parent.getFont()); - b.setText(text); - - GridData gd = new GridData(); - gd.widthHint= getButtonWidthHint(b); - gd.horizontalAlignment = GridData.FILL; - gd.verticalAlignment = SWT.BEGINNING; - b.setLayoutData(gd); - - return b; - } - - public static Button createCheckButton(Composite parent, String text) { - return createCheckButton(parent, text, 1); - } - - public static Button createCheckButton(Composite parent, String text, int horizontalSpan) { - Button b = new Button(parent, SWT.CHECK); - b.setFont(parent.getFont()); - b.setText(text); - - GridData gd = new GridData(); - gd.horizontalSpan = horizontalSpan; - b.setLayoutData(gd); - - return b; - } - - public static Button[] createButtons(Composite parent, String[] buttonNames) { - Button[] result = new Button[buttonNames.length]; - Composite buttons = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(1, false); - layout.marginHeight = 0; - buttons.setLayout(layout); - buttons.setFont(parent.getFont()); - GridData gd = new GridData(GridData.FILL_VERTICAL); - gd.horizontalSpan = 1; - gd.verticalAlignment = SWT.BEGINNING; - buttons.setLayoutData(gd); - int i = 0; - for (String name : buttonNames) { - result[i] = createButton(buttons, name); - ++i; - } - return result; - } - - public static Button[] createCheckButtons(Composite parent, String[] titles) { - Button[] result = new Button[titles.length]; - for (int i=0; i 0) { - column.setWidth(width); - } - column.setResizable(true); - column.setMoveable(true); - return viewerColumn; - } - - public static Button createRadioBox(Composite parent, String text, int horizontalSpan) { - Button b = new Button(parent, SWT.RADIO); - b.setFont(parent.getFont()); - b.setText(text); - - GridData gd = new GridData(); - gd.horizontalSpan = horizontalSpan; - gd.horizontalAlignment = SWT.BEGINNING; - gd.verticalAlignment = SWT.BEGINNING; - b.setLayoutData(gd); - - return b; - } - - public static void addEmptyLabel(Composite parent, int horizontalSpan) { - Label label = new Label(parent, SWT.NONE); - label.setVisible(false); - - GridData gd = new GridData(); - gd.horizontalSpan = horizontalSpan; - label.setLayoutData(gd); - } - - public static Label addLabel(Composite parent, String text, int horizontalSpan) { - Label label = new Label(parent, SWT.WRAP | SWT.LEFT); - label.setText(text); - GridData gd = SWTHelper.setGridData(label, SWT.FILL, true, SWT.CENTER, false); - gd.horizontalSpan = horizontalSpan; - return label; - } - - public static GridData setGridData(Control component, int horizontalAlignment, boolean grabExcessHorizontalSpace, int verticalAlignment, boolean grabExcessVerticalSpace) { - GridData gd = new GridData(); - gd.horizontalAlignment= horizontalAlignment; - gd.grabExcessHorizontalSpace= grabExcessHorizontalSpace; - gd.verticalAlignment= verticalAlignment; - gd.grabExcessVerticalSpace= grabExcessVerticalSpace; - component.setLayoutData(gd); - return gd; - } - - public static Composite createComposite(Composite parent, int numColumns) { - Composite result = new Composite(parent, SWT.NONE); - result.setFont(parent.getFont()); - GridLayout layout = new GridLayout(); - result.setLayout(layout); - layout.numColumns = numColumns; - return result; - } - - public static Text createLabelTextPair(Composite parent, String labelText) { - Font font = parent.getFont(); - - Label label = new Label(parent, SWT.NONE); - label.setText(labelText); - label.setFont(font); - - Text text = new Text(parent, SWT.BORDER | SWT.SINGLE); - text.setText(""); - text.setFont(font); - - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - text.setLayoutData(gd); - - return text; - } - - public static Combo createLabelComboPair(Composite parent, String labelText) { - Font font = parent.getFont(); - - Label label = new Label(parent, SWT.NONE); - label.setText(labelText); - label.setFont(font); - - Combo combo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); - combo.setFont(font); - - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - combo.setLayoutData(gd); - - return combo; - } - - public static Label createLabelLabelPair(Composite parent, String labelText) { - Label label = new Label(parent, SWT.NONE); - label.setText(labelText); - - Label target = new Label(parent, SWT.NONE); - target.setText(""); - - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - target.setLayoutData(gd); - - return target; - } -} +package us.pwc.vista.eclipse.core.helper; + +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.layout.PixelConverter; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.Text; + +public class SWTHelper { + private static int getButtonWidthHint(Button button) { + PixelConverter pc = new PixelConverter(button); + int h= pc.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); + return Math.max(h, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); + } + + public static Button createButton(Composite parent, String text) { + Button b = new Button(parent, SWT.PUSH); + b.setFont(parent.getFont()); + b.setText(text); + + GridData gd = new GridData(); + gd.widthHint= getButtonWidthHint(b); + gd.horizontalAlignment = GridData.FILL; + gd.verticalAlignment = SWT.BEGINNING; + b.setLayoutData(gd); + + return b; + } + + public static Button createCheckButton(Composite parent, String text) { + return createCheckButton(parent, text, 1); + } + + public static Button createCheckButton(Composite parent, String text, int horizontalSpan) { + Button b = new Button(parent, SWT.CHECK); + b.setFont(parent.getFont()); + b.setText(text); + + GridData gd = new GridData(); + gd.horizontalSpan = horizontalSpan; + b.setLayoutData(gd); + + return b; + } + + public static Button[] createButtons(Composite parent, String[] buttonNames) { + Button[] result = new Button[buttonNames.length]; + Composite buttons = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(1, false); + layout.marginHeight = 0; + buttons.setLayout(layout); + buttons.setFont(parent.getFont()); + GridData gd = new GridData(GridData.FILL_VERTICAL); + gd.horizontalSpan = 1; + gd.verticalAlignment = SWT.BEGINNING; + buttons.setLayoutData(gd); + int i = 0; + for (String name : buttonNames) { + result[i] = createButton(buttons, name); + ++i; + } + return result; + } + + public static Button[] createCheckButtons(Composite parent, String[] titles) { + Button[] result = new Button[titles.length]; + for (int i=0; i 0) { + column.setWidth(width); + } + column.setResizable(true); + column.setMoveable(true); + return viewerColumn; + } + + public static Button createRadioBox(Composite parent, String text, int horizontalSpan) { + Button b = new Button(parent, SWT.RADIO); + b.setFont(parent.getFont()); + b.setText(text); + + GridData gd = new GridData(); + gd.horizontalSpan = horizontalSpan; + gd.horizontalAlignment = SWT.BEGINNING; + gd.verticalAlignment = SWT.BEGINNING; + b.setLayoutData(gd); + + return b; + } + + public static void addEmptyLabel(Composite parent, int horizontalSpan) { + Label label = new Label(parent, SWT.NONE); + label.setVisible(false); + + GridData gd = new GridData(); + gd.horizontalSpan = horizontalSpan; + label.setLayoutData(gd); + } + + public static Label addLabel(Composite parent, String text, int horizontalSpan) { + Label label = new Label(parent, SWT.WRAP | SWT.LEFT); + label.setText(text); + GridData gd = SWTHelper.setGridData(label, SWT.FILL, true, SWT.CENTER, false); + gd.horizontalSpan = horizontalSpan; + return label; + } + + public static GridData setGridData(Control component, int horizontalAlignment, boolean grabExcessHorizontalSpace, int verticalAlignment, boolean grabExcessVerticalSpace) { + GridData gd = new GridData(); + gd.horizontalAlignment= horizontalAlignment; + gd.grabExcessHorizontalSpace= grabExcessHorizontalSpace; + gd.verticalAlignment= verticalAlignment; + gd.grabExcessVerticalSpace= grabExcessVerticalSpace; + component.setLayoutData(gd); + return gd; + } + + public static Composite createComposite(Composite parent, int numColumns) { + Composite result = new Composite(parent, SWT.NONE); + result.setFont(parent.getFont()); + GridLayout layout = new GridLayout(); + result.setLayout(layout); + layout.numColumns = numColumns; + return result; + } + + public static Text createLabelTextPair(Composite parent, String labelText) { + Font font = parent.getFont(); + + Label label = new Label(parent, SWT.NONE); + label.setText(labelText); + label.setFont(font); + + Text text = new Text(parent, SWT.BORDER | SWT.SINGLE); + text.setText(""); + text.setFont(font); + + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + text.setLayoutData(gd); + + return text; + } + + public static Combo createLabelComboPair(Composite parent, String labelText) { + Font font = parent.getFont(); + + Label label = new Label(parent, SWT.NONE); + label.setText(labelText); + label.setFont(font); + + Combo combo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); + combo.setFont(font); + + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + combo.setLayoutData(gd); + + return combo; + } + + public static Label createLabelLabelPair(Composite parent, String labelText) { + Label label = new Label(parent, SWT.NONE); + label.setText(labelText); + + Label target = new Label(parent, SWT.NONE); + target.setText(""); + + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + target.setLayoutData(gd); + + return target; + } +} diff --git a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/prefui/AddServerDialog.java b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/prefui/AddServerDialog.java index 9c9d0a1..46154d7 100644 --- a/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/prefui/AddServerDialog.java +++ b/us.pwc.vista.eclipse.core/src/us/pwc/vista/eclipse/core/prefui/AddServerDialog.java @@ -27,6 +27,8 @@ public class AddServerDialog extends Dialog { private Text nameCtrl; private Text addressCtrl; private Text portCtrl; + private Text acCtrl; + private Text vcCtrl; private ServerData data; @@ -49,14 +51,18 @@ protected Control createDialogArea(Composite parent) { panel.setLayout(layout); SWTHelper.setGridData(panel, SWT.FILL, true, SWT.FILL, false); - this.nameCtrl = this.createTextLablePair(panel, "Server name:"); - this.addressCtrl = this.createTextLablePair(panel, "Server address:"); - this.portCtrl = this.createTextLablePair(panel, "Server port:"); + Label label = new Label(parent, SWT.NONE); + label.setText("Mac users must fill in AC/VC"); + this.nameCtrl = this.createTextLabelPair(panel, "Server name:"); + this.addressCtrl = this.createTextLabelPair(panel, "Server address:"); + this.portCtrl = this.createTextLabelPair(panel, "Server port:"); + this.acCtrl = this.createTextLabelPair(panel, "Access Code:"); + this.vcCtrl = this.createTextLabelPair(panel, "Verify Code:"); return panel; } - private Text createTextLablePair(Composite parent, String labelText) { + private Text createTextLabelPair(Composite parent, String labelText) { Label labelCtrl = new Label(parent, SWT.NONE); labelCtrl.setText(labelText); @@ -110,10 +116,12 @@ protected IDialogSettings getDialogBoundsSettings() { } private ServerData ctrlToData() { - String name = this.nameCtrl.getText(); + String name = this.nameCtrl.getText(); String address = this.addressCtrl.getText(); - String port = this.portCtrl.getText(); - return new ServerData(name, address, port); + String port = this.portCtrl.getText(); + String ac = this.acCtrl.getText(); + String vc = this.vcCtrl.getText(); + return new ServerData(name, address, port, ac, vc); } public ServerData getData() { diff --git a/us.pwc.vista.eclipse.server/.project b/us.pwc.vista.eclipse.server/.project index ace29cc..42da006 100644 --- a/us.pwc.vista.eclipse.server/.project +++ b/us.pwc.vista.eclipse.server/.project @@ -1,28 +1,28 @@ - - - us.pwc.vista.eclipse.server - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + us.pwc.vista.eclipse.server + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/us.pwc.vista.eclipse.server/build.properties b/us.pwc.vista.eclipse.server/build.properties index 6f20375..e9863e2 100644 --- a/us.pwc.vista.eclipse.server/build.properties +++ b/us.pwc.vista.eclipse.server/build.properties @@ -1,5 +1,5 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/us.pwc.vista.eclipse.server/plugin.xml b/us.pwc.vista.eclipse.server/plugin.xml index 6ad036c..6673357 100644 --- a/us.pwc.vista.eclipse.server/plugin.xml +++ b/us.pwc.vista.eclipse.server/plugin.xml @@ -1,300 +1,300 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/us.pwc.vista.eclipse.server/src/us/pwc/vista/eclipse/server/VistAServerPlugin.java b/us.pwc.vista.eclipse.server/src/us/pwc/vista/eclipse/server/VistAServerPlugin.java index 344fcc8..e2c81b7 100644 --- a/us.pwc.vista.eclipse.server/src/us/pwc/vista/eclipse/server/VistAServerPlugin.java +++ b/us.pwc.vista.eclipse.server/src/us/pwc/vista/eclipse/server/VistAServerPlugin.java @@ -1,70 +1,70 @@ -package us.pwc.vista.eclipse.server; - -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class VistAServerPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "us.pwc.vista.eclipse.server"; //$NON-NLS-1$ - - // The shared instance - private static VistAServerPlugin plugin; - - /** - * The constructor - */ - public VistAServerPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static VistAServerPlugin getDefault() { - return plugin; - } - - /** - * Convenience method to return the dialog settings for a particular - * Dialog. Class name is used as section and a subsection - * can also be used. If the dialog settings is not found it is created. - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#getDialogSettings - * @param clazz dialog class - * @param subsection - * @return the dialog settings - */ - public IDialogSettings getDialogSettings(Object object, String subsection) { - IDialogSettings settings = this.getDialogSettings(); - String section = object.getClass().getName() + "_" + subsection; - IDialogSettings result = settings.getSection(section); - if (result == null) { - result = settings.addNewSection(section); - } - return result; - } -} +package us.pwc.vista.eclipse.server; + +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class VistAServerPlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "us.pwc.vista.eclipse.server"; //$NON-NLS-1$ + + // The shared instance + private static VistAServerPlugin plugin; + + /** + * The constructor + */ + public VistAServerPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static VistAServerPlugin getDefault() { + return plugin; + } + + /** + * Convenience method to return the dialog settings for a particular + * Dialog. Class name is used as section and a subsection + * can also be used. If the dialog settings is not found it is created. + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#getDialogSettings + * @param clazz dialog class + * @param subsection + * @return the dialog settings + */ + public IDialogSettings getDialogSettings(Object object, String subsection) { + IDialogSettings settings = this.getDialogSettings(); + String section = object.getClass().getName() + "_" + subsection; + IDialogSettings result = settings.getSection(section); + if (result == null) { + result = settings.addNewSection(section); + } + return result; + } +} diff --git a/us.pwc.vista.eclipse.tools/.classpath b/us.pwc.vista.eclipse.tools/.classpath index 2818691..098194c 100644 --- a/us.pwc.vista.eclipse.tools/.classpath +++ b/us.pwc.vista.eclipse.tools/.classpath @@ -1,6 +1,6 @@ - + diff --git a/us.pwc.vista.eclipse.tools/build.properties b/us.pwc.vista.eclipse.tools/build.properties index 4ce6e56..5648d4c 100644 --- a/us.pwc.vista.eclipse.tools/build.properties +++ b/us.pwc.vista.eclipse.tools/build.properties @@ -6,4 +6,7 @@ bin.includes = plugin.xml,\ contexts.xml jars.compile.order = com.pwc.us.rgi.mparseanalyze.jar,\ . +src.includes = src/,\ + contexts.xml,\ + bin/ diff --git a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/AssumedVariables.java b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/AssumedVariables.java index 17f21e5..41a3201 100644 --- a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/AssumedVariables.java +++ b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/AssumedVariables.java @@ -1,78 +1,78 @@ -package us.pwc.vista.eclipse.tools.propertyPage; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.List; -import org.eclipse.ui.IWorkbenchPropertyPage; -import org.eclipse.ui.dialogs.PropertyPage; - -import us.pwc.vista.eclipse.core.helper.SWTHelper; - -public class AssumedVariables extends PropertyPage implements IWorkbenchPropertyPage { - private ExpectedAssumedVariablesHandler expectedAssumedVariablesHandler; - private RecursionSpecificationHandler recursionSpecificationHandler; - - public AssumedVariables() { - super(); - } - - private List addExpectedVarsList(Composite parent) { - List list = new List(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - list.setFont(parent.getFont()); - - GridData gd = new GridData(GridData.FILL_BOTH); - gd.horizontalSpan = 2; - gd.heightHint = 100; - gd.widthHint = 50; - gd.horizontalAlignment = SWT.FILL; - list.setLayoutData(gd); - - return list; - } - - private void initializeExpectedVarsHandler(List expectedVarsList, Button addVar, Button removeVars) { - IAdaptable adaptable = this.getElement(); - IProject project = (IProject) adaptable.getAdapter(IProject.class); - this.expectedAssumedVariablesHandler = new ExpectedAssumedVariablesHandler(expectedVarsList, addVar, removeVars); - this.expectedAssumedVariablesHandler.initialize(project); - } - - private void addExpectedVarsSection(Composite parent) { - SWTHelper.addLabel(parent, "Specify expected assumed variables:", 3); - List expectedVarsList = this.addExpectedVarsList(parent); - Button[] buttons = SWTHelper.createButtons(parent, new String[]{"Add", "Remove"}); - - this.initializeExpectedVarsHandler(expectedVarsList, buttons[0], buttons[1]); - } - - @Override - protected Control createContents(Composite parent) { - Composite contents = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(3, false); - contents.setLayout(gl); - - IAdaptable adaptable = this.getElement(); - IProject project = (IProject) adaptable.getAdapter(IProject.class); - this.recursionSpecificationHandler = RecursionSpecificationHandlerFactory.getInstance(contents, RecursionSpecificationHandler.AV_PREFIX); - this.recursionSpecificationHandler.initialize(project); - - this.addExpectedVarsSection(contents); - - return contents; - } - - @Override - public boolean performOk() { - IAdaptable adaptable = this.getElement(); - IProject project = (IProject) adaptable.getAdapter(IProject.class); - this.expectedAssumedVariablesHandler.accept(project); - this.recursionSpecificationHandler.accept(project); - return super.performOk(); - } - } +package us.pwc.vista.eclipse.tools.propertyPage; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.List; +import org.eclipse.ui.IWorkbenchPropertyPage; +import org.eclipse.ui.dialogs.PropertyPage; + +import us.pwc.vista.eclipse.core.helper.SWTHelper; + +public class AssumedVariables extends PropertyPage implements IWorkbenchPropertyPage { + private ExpectedAssumedVariablesHandler expectedAssumedVariablesHandler; + private RecursionSpecificationHandler recursionSpecificationHandler; + + public AssumedVariables() { + super(); + } + + private List addExpectedVarsList(Composite parent) { + List list = new List(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); + list.setFont(parent.getFont()); + + GridData gd = new GridData(GridData.FILL_BOTH); + gd.horizontalSpan = 2; + gd.heightHint = 100; + gd.widthHint = 50; + gd.horizontalAlignment = SWT.FILL; + list.setLayoutData(gd); + + return list; + } + + private void initializeExpectedVarsHandler(List expectedVarsList, Button addVar, Button removeVars) { + IAdaptable adaptable = this.getElement(); + IProject project = (IProject) adaptable.getAdapter(IProject.class); + this.expectedAssumedVariablesHandler = new ExpectedAssumedVariablesHandler(expectedVarsList, addVar, removeVars); + this.expectedAssumedVariablesHandler.initialize(project); + } + + private void addExpectedVarsSection(Composite parent) { + SWTHelper.addLabel(parent, "Specify expected assumed variables:", 3); + List expectedVarsList = this.addExpectedVarsList(parent); + Button[] buttons = SWTHelper.createButtons(parent, new String[]{"Add", "Remove"}); + + this.initializeExpectedVarsHandler(expectedVarsList, buttons[0], buttons[1]); + } + + @Override + protected Control createContents(Composite parent) { + Composite contents = new Composite(parent, SWT.NONE); + GridLayout gl = new GridLayout(3, false); + contents.setLayout(gl); + + IAdaptable adaptable = this.getElement(); + IProject project = (IProject) adaptable.getAdapter(IProject.class); + this.recursionSpecificationHandler = RecursionSpecificationHandlerFactory.getInstance(contents, RecursionSpecificationHandler.AV_PREFIX); + this.recursionSpecificationHandler.initialize(project); + + this.addExpectedVarsSection(contents); + + return contents; + } + + @Override + public boolean performOk() { + IAdaptable adaptable = this.getElement(); + IProject project = (IProject) adaptable.getAdapter(IProject.class); + this.expectedAssumedVariablesHandler.accept(project); + this.recursionSpecificationHandler.accept(project); + return super.performOk(); + } + } diff --git a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/ExpectedAssumedVariablesHandler.java b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/ExpectedAssumedVariablesHandler.java index 67d5a16..4d15b02 100644 --- a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/ExpectedAssumedVariablesHandler.java +++ b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/ExpectedAssumedVariablesHandler.java @@ -1,135 +1,135 @@ -package us.pwc.vista.eclipse.tools.propertyPage; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.QualifiedName; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.List; -import org.eclipse.swt.widgets.Shell; - -import us.pwc.vista.eclipse.tools.VistAToolsPlugin; - -public class ExpectedAssumedVariablesHandler { - private static final QualifiedName EXPECTED_ASSUMED_VARS = new QualifiedName(VistAToolsPlugin.PLUGIN_ID, "expectedassumedvars"); - - private List list; - private Button removeButton; - - public ExpectedAssumedVariablesHandler(List list, Button addButton, Button removeButton) { - this.list = list; - this.removeButton = removeButton; - this.attachListeners(list, addButton, removeButton); - } - - private void attachListeners(List list, Button addButton, Button removeButton) { - list.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - ExpectedAssumedVariablesHandler.this.handleSelectionChanged(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - addButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - ExpectedAssumedVariablesHandler.this.addNewValue(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - removeButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - ExpectedAssumedVariablesHandler.this.removeSelected(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - removeButton.setEnabled(false); - } - - private void handleSelectionChanged() { - boolean futureEnabled = this.list.getSelectionCount() > 0; - boolean currentEnabled = this.removeButton.getEnabled(); - if (currentEnabled != futureEnabled) { - this.removeButton.setEnabled(futureEnabled); - } - } - - private void addNewValue() { - Shell shell = this.list.getParent().getShell(); - IInputValidator v = new IInputValidator() { - @Override - public String isValid(String newText) { - if ((newText == null) || (newText.length() == 0)) { - return "Empty values are not accepted."; - } else { - return null; - } - } - }; - InputDialog d = new InputDialog(shell, "Enter Value", "Enter Value", "", v); - d.open(); - String value = d.getValue(); - if (value != null) { - this.list.add(value); - } - } - - private void removeSelected() { - int[] indices = this.list.getSelectionIndices(); - this.list.remove(indices); - } - - public static String[] getVarsFromStore(IProject project) { - try { - String vars = project.getPersistentProperty(EXPECTED_ASSUMED_VARS); - if (vars == null) { - return new String[0]; - } else { - return vars.split(" "); - } - } catch (CoreException e) { - return new String[0]; - } - } - - public void initialize(IProject project) { - String[] vars = getVarsFromStore(project); - this.list.setItems(vars); - } - - public String getVarsAsString() { - String[] items = this.list.getItems(); - if ((items == null) || (items.length == 0)) { - return null; - } else { - String values = items[0]; - for (int i=1; i 0; + boolean currentEnabled = this.removeButton.getEnabled(); + if (currentEnabled != futureEnabled) { + this.removeButton.setEnabled(futureEnabled); + } + } + + private void addNewValue() { + Shell shell = this.list.getParent().getShell(); + IInputValidator v = new IInputValidator() { + @Override + public String isValid(String newText) { + if ((newText == null) || (newText.length() == 0)) { + return "Empty values are not accepted."; + } else { + return null; + } + } + }; + InputDialog d = new InputDialog(shell, "Enter Value", "Enter Value", "", v); + d.open(); + String value = d.getValue(); + if (value != null) { + this.list.add(value); + } + } + + private void removeSelected() { + int[] indices = this.list.getSelectionIndices(); + this.list.remove(indices); + } + + public static String[] getVarsFromStore(IProject project) { + try { + String vars = project.getPersistentProperty(EXPECTED_ASSUMED_VARS); + if (vars == null) { + return new String[0]; + } else { + return vars.split(" "); + } + } catch (CoreException e) { + return new String[0]; + } + } + + public void initialize(IProject project) { + String[] vars = getVarsFromStore(project); + this.list.setItems(vars); + } + + public String getVarsAsString() { + String[] items = this.list.getItems(); + if ((items == null) || (items.length == 0)) { + return null; + } else { + String values = items[0]; + for (int i=1; i typesSet = new HashSet(Arrays.asList(types)); - for (Button b : this.buttons) { - String text = b.getText(); - b.setSelection(typesSet.contains(text)); - } - } - } - - public void accept(IProject project) { - try { - String result = ""; - for (Button b : this.buttons) { - if (b.getSelection()) { - String text = b.getText().replace(' ', '_'); - if (result.length() > 0) { - result = result + " "; - } - result = result + text; - } - } - project.setPersistentProperty(OCCURANCE_TYPES, result); - } catch (CoreException e) { - } - } -} +package us.pwc.vista.eclipse.tools.propertyPage; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.swt.widgets.Button; + +import us.pwc.vista.eclipse.tools.VistAToolsPlugin; + +public class OccuranceTypesHandler { + private static final QualifiedName OCCURANCE_TYPES = new QualifiedName(VistAToolsPlugin.PLUGIN_ID, "occurancetypes"); + + private Button[] buttons; + + public OccuranceTypesHandler(Button[] buttons) { + this.buttons = buttons; + } + + public static String[] getTypesFromStore(IProject project) { + try { + String types = project.getPersistentProperty(OCCURANCE_TYPES); + if (types == null) { + return null; + } else { + String[] rawResults = types.split(" "); + if (rawResults.length == 0) return null; + String[] results = new String[rawResults.length]; + for (int i=0; i typesSet = new HashSet(Arrays.asList(types)); + for (Button b : this.buttons) { + String text = b.getText(); + b.setSelection(typesSet.contains(text)); + } + } + } + + public void accept(IProject project) { + try { + String result = ""; + for (Button b : this.buttons) { + if (b.getSelection()) { + String text = b.getText().replace(' ', '_'); + if (result.length() > 0) { + result = result + " "; + } + result = result + text; + } + } + project.setPersistentProperty(OCCURANCE_TYPES, result); + } catch (CoreException e) { + } + } +} diff --git a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/Occurances.java b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/Occurances.java index d692c30..2a16697 100644 --- a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/Occurances.java +++ b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/Occurances.java @@ -1,51 +1,51 @@ -package us.pwc.vista.eclipse.tools.propertyPage; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.IWorkbenchPropertyPage; -import org.eclipse.ui.dialogs.PropertyPage; - -import us.pwc.vista.eclipse.core.helper.SWTHelper; - -public class Occurances extends PropertyPage implements IWorkbenchPropertyPage { - private OccuranceTypesHandler occurancesTypesHandler; - - public Occurances() { - super(); - } - - private void addOccuranceTypes(Composite parent) { - SWTHelper.addLabel(parent, "Specify occurance types:", 4); - - String[] titles = new String[]{"Write", "Read", "Indirection", "Intrinsic Text", "Naked Global", "Execute", "Exclusive Kill", "Goto"}; - Button[] buttons = SWTHelper.createCheckButtons(parent, titles); - this.occurancesTypesHandler = new OccuranceTypesHandler(buttons); - } - - @Override - protected Control createContents(Composite parent) { - Composite contents = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(4, false); - contents.setLayout(gl); - - IAdaptable adaptable = this.getElement(); - IProject project = (IProject) adaptable.getAdapter(IProject.class); - this.addOccuranceTypes(contents); - this.occurancesTypesHandler.initialize(project); - - return contents; - } - - @Override - public boolean performOk() { - IAdaptable adaptable = this.getElement(); - IProject project = (IProject) adaptable.getAdapter(IProject.class); - this.occurancesTypesHandler.accept(project); - return super.performOk(); - } +package us.pwc.vista.eclipse.tools.propertyPage; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IWorkbenchPropertyPage; +import org.eclipse.ui.dialogs.PropertyPage; + +import us.pwc.vista.eclipse.core.helper.SWTHelper; + +public class Occurances extends PropertyPage implements IWorkbenchPropertyPage { + private OccuranceTypesHandler occurancesTypesHandler; + + public Occurances() { + super(); + } + + private void addOccuranceTypes(Composite parent) { + SWTHelper.addLabel(parent, "Specify occurance types:", 4); + + String[] titles = new String[]{"Write", "Read", "Indirection", "Intrinsic Text", "Naked Global", "Execute", "Exclusive Kill", "Goto"}; + Button[] buttons = SWTHelper.createCheckButtons(parent, titles); + this.occurancesTypesHandler = new OccuranceTypesHandler(buttons); + } + + @Override + protected Control createContents(Composite parent) { + Composite contents = new Composite(parent, SWT.NONE); + GridLayout gl = new GridLayout(4, false); + contents.setLayout(gl); + + IAdaptable adaptable = this.getElement(); + IProject project = (IProject) adaptable.getAdapter(IProject.class); + this.addOccuranceTypes(contents); + this.occurancesTypesHandler.initialize(project); + + return contents; + } + + @Override + public boolean performOk() { + IAdaptable adaptable = this.getElement(); + IProject project = (IProject) adaptable.getAdapter(IProject.class); + this.occurancesTypesHandler.accept(project); + return super.performOk(); + } } \ No newline at end of file diff --git a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/RecursionSpecificationHandler.java b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/RecursionSpecificationHandler.java index 63acfdc..dd22de2 100644 --- a/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/RecursionSpecificationHandler.java +++ b/us.pwc.vista.eclipse.tools/src/us/pwc/vista/eclipse/tools/propertyPage/RecursionSpecificationHandler.java @@ -1,236 +1,236 @@ -package us.pwc.vista.eclipse.tools.propertyPage; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.QualifiedName; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Shell; - -import us.pwc.vista.eclipse.tools.VistAToolsPlugin; - -public class RecursionSpecificationHandler { - public static final String AV_PREFIX = "assumedvars"; - public static final String OC_PREFIX = "occurances"; - - private String propertyNamePrefix; - private Button[] radioButtons; - private TableViewer viewer; - private Button addButton; - private Button removeButton; - private List filters; - - public RecursionSpecificationHandler(String propertyNamePrefix, Button[] radioButtons, TableViewer viewer, Button addButton, Button removeButton) { - this.propertyNamePrefix = propertyNamePrefix; - this.radioButtons = radioButtons; - this.viewer = viewer; - this.addButton = addButton; - this.removeButton = removeButton; - this.attachListeners(viewer, addButton, removeButton); - } - - private static QualifiedName getRecursionDepthQualifiedName(String prefix) { - return new QualifiedName(VistAToolsPlugin.PLUGIN_ID, prefix + "recursiondepth"); - } - - private static QualifiedName getNameFiltersQuaifiedName(String prefix) { - return new QualifiedName(VistAToolsPlugin.PLUGIN_ID, prefix + "recursionnamefilters"); - } - - private void attachListeners(TableViewer viewer, Button addButton, Button removeButton) { - for (int i=0; i<3; ++i) { - radioButtons[i].addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - RecursionSpecificationHandler.this.enableRoutineNameFilter(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - } - - radioButtons[3].addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - RecursionSpecificationHandler.this.disableRoutineNameFilter(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - viewer.getTable().addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - RecursionSpecificationHandler.this.handleSelectionChanged(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - addButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - RecursionSpecificationHandler.this.addNewValue(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - removeButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - RecursionSpecificationHandler.this.removeSelected(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - removeButton.setEnabled(false); - } - - private void enableRoutineNameFilter() { - this.viewer.getTable().setEnabled(false); - this.addButton.setEnabled(false); - this.removeButton.setEnabled(false); - } - - private void disableRoutineNameFilter() { - this.viewer.getTable().setEnabled(true); - this.addButton.setEnabled(true); - this.removeButton.setEnabled(this.viewer.getTable().getSelectionCount() > 0); - } - - private void handleSelectionChanged() { - boolean futureEnabled = this.viewer.getTable().getSelectionCount() > 0; - boolean currentEnabled = this.removeButton.getEnabled(); - if (currentEnabled != futureEnabled) { - this.removeButton.setEnabled(futureEnabled); - } - } - - private void addNewValue() { - Shell shell = this.viewer.getTable().getParent().getShell(); - IInputValidator v = new IInputValidator() { - @Override - public String isValid(String newText) { - if ((newText == null) || (newText.length() == 0)) { - return "Empty values are not accepted."; - } else { - return null; - } - } - }; - InputDialog d = new InputDialog(shell, "Enter Value", "Enter Value", "", v); - d.open(); - String value = d.getValue(); - if (value != null) { - NameFilter filter = new NameFilter(value, NameFilterType.INCLUDE); - this.filters.add(filter); - this.viewer.refresh(); - } - } - - private void removeSelected() { - int[] indices = this.viewer.getTable().getSelectionIndices(); - Arrays.sort(indices); - for (int i=indices.length-1; i>=0; --i) { - this.filters.remove(i); - } - this.viewer.refresh(); - } - - public static int getRecursionDepthFromStore(IProject project, String prefix) { - try { - QualifiedName propertyName = getRecursionDepthQualifiedName(prefix); - String recursionDepth = project.getPersistentProperty(propertyName); - if ((recursionDepth == null) || recursionDepth.isEmpty()) { - return 0; - } else { - return Integer.parseInt(recursionDepth); - } - } catch (CoreException e) { - return 0; - } - } - - public static List getFiltersFromStore(IProject project, String prefix) { - try { - QualifiedName propertyName = getNameFiltersQuaifiedName(prefix); - String filterStringsTotal = project.getPersistentProperty(propertyName); - if (filterStringsTotal == null) { - return new ArrayList(); - } else { - String[] filterStrings = filterStringsTotal.split(" "); - List result = new ArrayList(); - for (int i=0; i(); - } - } - - public void initialize(IProject project) { - int recursionDepth = getRecursionDepthFromStore(project, this.propertyNamePrefix); - this.radioButtons[recursionDepth].setSelection(true); - this.filters = getFiltersFromStore(project, this.propertyNamePrefix); - this.viewer.setInput(this.filters); - this.viewer.getTable().setEnabled(recursionDepth == 3); - } - - private String getRecursionDepth() { - for (int i=0; i<4; ++i) { - if (this.radioButtons[i].getSelection()) { - return String.valueOf(i); - } - } - return "0"; - } - - private String getNameFiltersAsString() { - if ((this.filters == null) || (this.filters.size() == 0)) { - return null; - } else { - String result = this.filters.get(0).toString(); - for (int i=1; i filters; + + public RecursionSpecificationHandler(String propertyNamePrefix, Button[] radioButtons, TableViewer viewer, Button addButton, Button removeButton) { + this.propertyNamePrefix = propertyNamePrefix; + this.radioButtons = radioButtons; + this.viewer = viewer; + this.addButton = addButton; + this.removeButton = removeButton; + this.attachListeners(viewer, addButton, removeButton); + } + + private static QualifiedName getRecursionDepthQualifiedName(String prefix) { + return new QualifiedName(VistAToolsPlugin.PLUGIN_ID, prefix + "recursiondepth"); + } + + private static QualifiedName getNameFiltersQuaifiedName(String prefix) { + return new QualifiedName(VistAToolsPlugin.PLUGIN_ID, prefix + "recursionnamefilters"); + } + + private void attachListeners(TableViewer viewer, Button addButton, Button removeButton) { + for (int i=0; i<3; ++i) { + radioButtons[i].addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + RecursionSpecificationHandler.this.enableRoutineNameFilter(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + } + + radioButtons[3].addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + RecursionSpecificationHandler.this.disableRoutineNameFilter(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + viewer.getTable().addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + RecursionSpecificationHandler.this.handleSelectionChanged(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + addButton.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + RecursionSpecificationHandler.this.addNewValue(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + removeButton.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + RecursionSpecificationHandler.this.removeSelected(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + removeButton.setEnabled(false); + } + + private void enableRoutineNameFilter() { + this.viewer.getTable().setEnabled(false); + this.addButton.setEnabled(false); + this.removeButton.setEnabled(false); + } + + private void disableRoutineNameFilter() { + this.viewer.getTable().setEnabled(true); + this.addButton.setEnabled(true); + this.removeButton.setEnabled(this.viewer.getTable().getSelectionCount() > 0); + } + + private void handleSelectionChanged() { + boolean futureEnabled = this.viewer.getTable().getSelectionCount() > 0; + boolean currentEnabled = this.removeButton.getEnabled(); + if (currentEnabled != futureEnabled) { + this.removeButton.setEnabled(futureEnabled); + } + } + + private void addNewValue() { + Shell shell = this.viewer.getTable().getParent().getShell(); + IInputValidator v = new IInputValidator() { + @Override + public String isValid(String newText) { + if ((newText == null) || (newText.length() == 0)) { + return "Empty values are not accepted."; + } else { + return null; + } + } + }; + InputDialog d = new InputDialog(shell, "Enter Value", "Enter Value", "", v); + d.open(); + String value = d.getValue(); + if (value != null) { + NameFilter filter = new NameFilter(value, NameFilterType.INCLUDE); + this.filters.add(filter); + this.viewer.refresh(); + } + } + + private void removeSelected() { + int[] indices = this.viewer.getTable().getSelectionIndices(); + Arrays.sort(indices); + for (int i=indices.length-1; i>=0; --i) { + this.filters.remove(i); + } + this.viewer.refresh(); + } + + public static int getRecursionDepthFromStore(IProject project, String prefix) { + try { + QualifiedName propertyName = getRecursionDepthQualifiedName(prefix); + String recursionDepth = project.getPersistentProperty(propertyName); + if ((recursionDepth == null) || recursionDepth.isEmpty()) { + return 0; + } else { + return Integer.parseInt(recursionDepth); + } + } catch (CoreException e) { + return 0; + } + } + + public static List getFiltersFromStore(IProject project, String prefix) { + try { + QualifiedName propertyName = getNameFiltersQuaifiedName(prefix); + String filterStringsTotal = project.getPersistentProperty(propertyName); + if (filterStringsTotal == null) { + return new ArrayList(); + } else { + String[] filterStrings = filterStringsTotal.split(" "); + List result = new ArrayList(); + for (int i=0; i(); + } + } + + public void initialize(IProject project) { + int recursionDepth = getRecursionDepthFromStore(project, this.propertyNamePrefix); + this.radioButtons[recursionDepth].setSelection(true); + this.filters = getFiltersFromStore(project, this.propertyNamePrefix); + this.viewer.setInput(this.filters); + this.viewer.getTable().setEnabled(recursionDepth == 3); + } + + private String getRecursionDepth() { + for (int i=0; i<4; ++i) { + if (this.radioButtons[i].getSelection()) { + return String.valueOf(i); + } + } + return "0"; + } + + private String getNameFiltersAsString() { + if ((this.filters == null) || (this.filters.size() == 0)) { + return null; + } else { + String result = this.filters.get(0).toString(); + for (int i=1; i - - us.pwc.vista.eclipse.wizard - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + us.pwc.vista.eclipse.wizard + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/us.pwc.vista.eclipse.wizard/build.properties b/us.pwc.vista.eclipse.wizard/build.properties index 6f20375..e9863e2 100644 --- a/us.pwc.vista.eclipse.wizard/build.properties +++ b/us.pwc.vista.eclipse.wizard/build.properties @@ -1,5 +1,5 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/us.pwc.vista.eclipse.wizard/plugin.xml b/us.pwc.vista.eclipse.wizard/plugin.xml index f7f4fc3..47950b0 100644 --- a/us.pwc.vista.eclipse.wizard/plugin.xml +++ b/us.pwc.vista.eclipse.wizard/plugin.xml @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/us.pwc.vista.eclipse.wizard/src/us/pwc/vista/eclipse/wizard/VistAWizardsPlugin.java b/us.pwc.vista.eclipse.wizard/src/us/pwc/vista/eclipse/wizard/VistAWizardsPlugin.java index 083f71a..740959b 100644 --- a/us.pwc.vista.eclipse.wizard/src/us/pwc/vista/eclipse/wizard/VistAWizardsPlugin.java +++ b/us.pwc.vista.eclipse.wizard/src/us/pwc/vista/eclipse/wizard/VistAWizardsPlugin.java @@ -1,50 +1,50 @@ -package us.pwc.vista.eclipse.wizard; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class VistAWizardsPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "us.pwc.vista.eclipse.wizard"; //$NON-NLS-1$ - - // The shared instance - private static VistAWizardsPlugin plugin; - - /** - * The constructor - */ - public VistAWizardsPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static VistAWizardsPlugin getDefault() { - return plugin; - } - -} +package us.pwc.vista.eclipse.wizard; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class VistAWizardsPlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "us.pwc.vista.eclipse.wizard"; //$NON-NLS-1$ + + // The shared instance + private static VistAWizardsPlugin plugin; + + /** + * The constructor + */ + public VistAWizardsPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static VistAWizardsPlugin getDefault() { + return plugin; + } + +} diff --git a/us.pwc.vista.mlib/.project b/us.pwc.vista.mlib/.project index 8de54dd..f4786c6 100644 --- a/us.pwc.vista.mlib/.project +++ b/us.pwc.vista.mlib/.project @@ -1,28 +1,28 @@ - - - us.pwc.vista.mlib - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + us.pwc.vista.mlib + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/us.pwc.vista.mlib/build.properties b/us.pwc.vista.mlib/build.properties index 7fb144c..d3e7f1b 100644 --- a/us.pwc.vista.mlib/build.properties +++ b/us.pwc.vista.mlib/build.properties @@ -1,5 +1,5 @@ -source.. = eclipsesrc/,\ - src/ -output.. = bin/ -bin.includes = META-INF/,\ - . +source.. = eclipsesrc/,\ + src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/us.pwc.vista.mlib/eclipsesrc/us/pwc/vista/mlib/MLibPlugin.java b/us.pwc.vista.mlib/eclipsesrc/us/pwc/vista/mlib/MLibPlugin.java index 89d2abd..89abebe 100644 --- a/us.pwc.vista.mlib/eclipsesrc/us/pwc/vista/mlib/MLibPlugin.java +++ b/us.pwc.vista.mlib/eclipsesrc/us/pwc/vista/mlib/MLibPlugin.java @@ -1,68 +1,68 @@ -//--------------------------------------------------------------------------- -// Copyright 2013 PwC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -//--------------------------------------------------------------------------- - -package us.pwc.vista.mlib; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class MLibPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "us.pwc.vista.mlib"; //$NON-NLS-1$ - - // The shared instance - private static MLibPlugin plugin; - - /** - * The constructor - */ - public MLibPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static MLibPlugin getDefault() { - return plugin; - } - -} +//--------------------------------------------------------------------------- +// Copyright 2013 PwC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +//--------------------------------------------------------------------------- + +package us.pwc.vista.mlib; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class MLibPlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "us.pwc.vista.mlib"; //$NON-NLS-1$ + + // The shared instance + private static MLibPlugin plugin; + + /** + * The constructor + */ + public MLibPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static MLibPlugin getDefault() { + return plugin; + } + +} diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU00.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU00.m index 8f28d7c..80ad299 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU00.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU00.m @@ -1,53 +1,53 @@ -APIROU00 ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -FACT(N) ; - N R - S R=1 - F I=1:1:N S R=R*I - Q R - ; -SUM(N) ; - S R=0 - F I=1:1:M S R=R+I - S ^RGI0("EF")=5 - Q R - ; -SUMFACT(N,M) - N I - F D Q:I>3 - . N R - . S R=$$FACT(I)+$$SUM(I) - . S I=I+1 - . S P=R - Q S - ; -STORE(A) ; - N I - F I=1:1:10 D - . S A("F")=$$FACT(I) - . S D=4 - . S A(D)=4 - Q:K>3 - S R=1 - Q - ; -STOREG ; - N I - F I=1:1:10 D - . S A("F")=$$FACT(I) - . S D=4 - . S A(D)=4 - Q:K>3 - S R=1 - Q - ; -TOOTHER - D FACT^APIROU02(5) Q -TONONE - D ^APIROU02 - ; -ZZ S A=A+1 - S D=D+1 +APIROU00 ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +FACT(N) ; + N R + S R=1 + F I=1:1:N S R=R*I + Q R + ; +SUM(N) ; + S R=0 + F I=1:1:M S R=R+I + S ^RGI0("EF")=5 + Q R + ; +SUMFACT(N,M) + N I + F D Q:I>3 + . N R + . S R=$$FACT(I)+$$SUM(I) + . S I=I+1 + . S P=R + Q S + ; +STORE(A) ; + N I + F I=1:1:10 D + . S A("F")=$$FACT(I) + . S D=4 + . S A(D)=4 + Q:K>3 + S R=1 + Q + ; +STOREG ; + N I + F I=1:1:10 D + . S A("F")=$$FACT(I) + . S D=4 + . S A(D)=4 + Q:K>3 + S R=1 + Q + ; +TOOTHER + D FACT^APIROU02(5) Q +TONONE + D ^APIROU02 + ; +ZZ S A=A+1 + S D=D+1 diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU01.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU01.m index e129b3c..905fa3d 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU01.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU01.m @@ -1,39 +1,39 @@ -APIROU01 ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -SUMFACT(N,M) - N I - F D Q:I>3 - . N R - . S R=$$FACT^APIROU00(I)+$$SUM^APIROU00(I) - . S ^UD(5,7)=^UD(N,M) - . S I=I+1+^UM - . S P=R - Q S - ; -STORE(A) ; - N A - G:A>1 STOREG^APIROU00 - N I - F I=1:1:10 D - . S A("F")=$$FACT^APIROU00(I) - . S D=4 - . S A(D)=4 - Q:K>3 - S R=1 - Q - ; -LOOP(NUM) ; - F I=1:1:NUM D - . F J=1:1:NUM D - . . I A S B=$$SUMFACT(2,3) - . . S D=$$SUMFACT(4,1) - . . D LATER(J) - Q - ; -LATER(N) ; - W C - Q - ; +APIROU01 ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +SUMFACT(N,M) + N I + F D Q:I>3 + . N R + . S R=$$FACT^APIROU00(I)+$$SUM^APIROU00(I) + . S ^UD(5,7)=^UD(N,M) + . S I=I+1+^UM + . S P=R + Q S + ; +STORE(A) ; + N A + G:A>1 STOREG^APIROU00 + N I + F I=1:1:10 D + . S A("F")=$$FACT^APIROU00(I) + . S D=4 + . S A(D)=4 + Q:K>3 + S R=1 + Q + ; +LOOP(NUM) ; + F I=1:1:NUM D + . F J=1:1:NUM D + . . I A S B=$$SUMFACT(2,3) + . . S D=$$SUMFACT(4,1) + . . D LATER(J) + Q + ; +LATER(N) ; + W C + Q + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU02.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU02.m index f796e46..5bd1954 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU02.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU02.m @@ -1,14 +1,14 @@ -APIROU02 ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - S (NE,HR)=1 - W ME - Q - ; -FACT(N) ; - N R - S R=1 - F I=1:1:N S R=R*I - S M=R - Q R - ; +APIROU02 ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + S (NE,HR)=1 + W ME + Q + ; +FACT(N) ; + N R + S R=1 + F I=1:1:N S R=R*I + S M=R + Q R + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU03.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU03.m index 45cb444..e24cfc4 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU03.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU03.m @@ -1,48 +1,48 @@ -APIROU03 ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -GPIND ; - S A=B - G @A - ; -CALL1 - D B(A,.B) - Q - ; -B(A1,A2) - W A1 - ; -C ; - S A2=$G(A2)_"F" - Q - ; -FILEMAN - S DIC="^DIC(9.4," - S DIK="^DIE(9.5," - S DIE="^DIK(9.6," - S DIF="^DIK(9.7," - D CHK^FIE("10.9",4) - D CHK^DIE("10.1",4) - D CHK^DMI(10.2,4) - D CHK^DDI(10.3,4) - Q - ; -NEWFOLVL ; - D ASSUMEV1^APIROU04 - N V1 - S V1=V1+1 - Q - ; -NEWDOLVL - N A - S A=0 - F D S A=A+1 Q:A=3 - . S B=$G(B)+1 - . W B - N B - S B=$G(B)+1 - Q B - ; +APIROU03 ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +GPIND ; + S A=B + G @A + ; +CALL1 + D B(A,.B) + Q + ; +B(A1,A2) + W A1 + ; +C ; + S A2=$G(A2)_"F" + Q + ; +FILEMAN + S DIC="^DIC(9.4," + S DIK="^DIE(9.5," + S DIE="^DIK(9.6," + S DIF="^DIK(9.7," + D CHK^FIE("10.9",4) + D CHK^DIE("10.1",4) + D CHK^DMI(10.2,4) + D CHK^DDI(10.3,4) + Q + ; +NEWFOLVL ; + D ASSUMEV1^APIROU04 + N V1 + S V1=V1+1 + Q + ; +NEWDOLVL + N A + S A=0 + F D S A=A+1 Q:A=3 + . S B=$G(B)+1 + . W B + N B + S B=$G(B)+1 + Q B + ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU04.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU04.m index 740740f..fded2d0 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU04.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/APIROU04.m @@ -1,28 +1,28 @@ -APIROU04 ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -INDOBLK ; - D CALL1^APIROU03 - F I=1:5:1 D - . S Y=$GET(Y)+1 - Q - ; -ASSUMEV1 ; - S V1=V1+1 - Q - ; -ASSUMEV2 - N A - F I=1:5:1 D - . D ASSUMEV1 - . N T -LOOP . S T=T+1 - . I T>4 Q - . W M - . G LOOP - ; -ASSUMEV3 - S V3=V3+1 - Q +APIROU04 ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +INDOBLK ; + D CALL1^APIROU03 + F I=1:5:1 D + . S Y=$GET(Y)+1 + Q + ; +ASSUMEV1 ; + S V1=V1+1 + Q + ; +ASSUMEV2 + N A + F I=1:5:1 D + . D ASSUMEV1 + . N T +LOOP . S T=T+1 + . I T>4 Q + . W M + . G LOOP + ; +ASSUMEV3 + S V3=V3+1 + Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0RST.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0RST.m index 2a717c5..86c3d5f 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0RST.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0RST.m @@ -1,15 +1,15 @@ -BEAT0SRC ;ALB/CJM - AICS LIST CLINIC SETUP ; JUL 20,1993 - ;;3.0;AUTOMATED INFO COLLECTION SYS;;APR 24, 1997 - ; -SETUPS ; -- Lists forms/reports defined in print manager clinic setup - ; -% NEW CLINIC,SETUP,NODE,COND,INTRFACE,PAGE,IBQUIT,IBHDT,X,Y,FORM,REPORT,NAME,VAUTD,DIVIS,NEWDIV,CNT,MULTI - WRITE !!,"AICS Print Manager Clinic Setup Report",!! - SET IBQUIT=0 - DO DIVIS GOTO:IBQUIT EXIT - DO DEVICE GOTO:IBQUIT EXIT - DO DQ - GOTO EXIT - IF $PIECE($ZVER,"/",2)<4 ZNSPACE X ZNSPACE CURUCI QUIT X - QUIT - ; +BEAT0SRC ;ALB/CJM - AICS LIST CLINIC SETUP ; JUL 20,1993 + ;;3.0;AUTOMATED INFO COLLECTION SYS;;APR 24, 1997 + ; +SETUPS ; -- Lists forms/reports defined in print manager clinic setup + ; +% NEW CLINIC,SETUP,NODE,COND,INTRFACE,PAGE,IBQUIT,IBHDT,X,Y,FORM,REPORT,NAME,VAUTD,DIVIS,NEWDIV,CNT,MULTI + WRITE !!,"AICS Print Manager Clinic Setup Report",!! + SET IBQUIT=0 + DO DIVIS GOTO:IBQUIT EXIT + DO DEVICE GOTO:IBQUIT EXIT + DO DQ + GOTO EXIT + IF $PIECE($ZVER,"/",2)<4 ZNSPACE X ZNSPACE CURUCI QUIT X + QUIT + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0SRC.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0SRC.m index 5e6a10f..9f82b1b 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0SRC.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT0SRC.m @@ -1,15 +1,15 @@ -BEAT0SRC ;ALB/CJM - AICS LIST CLINIC SETUP ; JUL 20,1993 - ;;3.0;AUTOMATED INFO COLLECTION SYS;;APR 24, 1997 - ; -SETUPS ; -- Lists forms/reports defined in print manager clinic setup - ; -% N CLINIC,SETUP,NODE,COND,INTRFACE,PAGE,IBQUIT,IBHDT,X,Y,FORM,REPORT,NAME,VAUTD,DIVIS,NEWDIV,CNT,MULTI - W !!,"AICS Print Manager Clinic Setup Report",!! - S IBQUIT=0 - D DIVIS G:IBQUIT EXIT - D DEVICE G:IBQUIT EXIT - D DQ - G EXIT - I $P($ZVER,"/",2)<4 ZN X ZNSPACE CURUCI Q X - Q - ; +BEAT0SRC ;ALB/CJM - AICS LIST CLINIC SETUP ; JUL 20,1993 + ;;3.0;AUTOMATED INFO COLLECTION SYS;;APR 24, 1997 + ; +SETUPS ; -- Lists forms/reports defined in print manager clinic setup + ; +% N CLINIC,SETUP,NODE,COND,INTRFACE,PAGE,IBQUIT,IBHDT,X,Y,FORM,REPORT,NAME,VAUTD,DIVIS,NEWDIV,CNT,MULTI + W !!,"AICS Print Manager Clinic Setup Report",!! + S IBQUIT=0 + D DIVIS G:IBQUIT EXIT + D DEVICE G:IBQUIT EXIT + D DQ + G EXIT + I $P($ZVER,"/",2)<4 ZN X ZNSPACE CURUCI Q X + Q + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1RST.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1RST.m index 4cb5ed8..d984260 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1RST.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1RST.m @@ -1,3 +1,3 @@ -LABEL - SET A=5,U=4 MERGE T=A +LABEL + SET A=5,U=4 MERGE T=A QUIT \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1SRC.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1SRC.m index 257b28e..ff212b1 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1SRC.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/BEAT1SRC.m @@ -1,3 +1,3 @@ -LABEL - S A=5,U=4 MERGE T=A +LABEL + S A=5,U=4 MERGE T=A QUIT \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/CMDTEST0.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/CMDTEST0.m index 0abb079..fa23243 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/CMDTEST0.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/CMDTEST0.m @@ -1,56 +1,56 @@ -CMDTEST0 ; - ; - Q - ; -DO ; - D L0^R0,L1^R1(A,B,C),L2^R3(.A,,.C) - D @FIND0,@LIND1^@RINDI1 - D:TCOND0 T0,T1:COND1,T2 - DO:TCOND1 T2(A,,) - D T0:COND0,T1:$$AR DO:TCOND2 - . D @FIND1^R4 - . D L4^@RIND4 - DO:TCOND3 - . D T5+5^R5,@LIND5+3,@LIND6+3^@RIND6 - . D 2+1^R6,3+1,7+5^R6,T8^R8 - . D L8+4^@RIND8 - D:TCOND4 - . D ^R10 - . D ^@RIND10 - D:(5+$$A^X) - . DO &Y0,&X1^Y1 D &PK2.Y2 - . D &PK3.X3^Y3 - D:TCOND6 - . D &E0(P1,P2),&D1^E1(P1,.P2) M @A=@B - . DO &PK2.E2(P3,@PIND) - . D &PK3.D3^E3(P5) - D:CONDENV - . D LE0^[ENV1,ENV2]RE0,L1^|ENV1|RE1(A,B,C),LE2^[ENV3]RE3(.A,,.C) - . D ^[ENV4]RE4:$$AX^RX(GG,HH,.I) - . DO T5+5^[ENV8]R5,@LIND5+3^|ENV9|R9 - Q - ; -GOTO ; - G L0^R0:ZZZ,L1^R1:ZZZ,L2^R2:ZZZ - G:ZZ @FIND0,@LIND1^@RINDI1 - G:TCOND0 T0,T1:COND1,T2 - GOTO:TCOND1 T2 - G T0:COND0,T1:COND1 DO:TCOND2 - . G:Z @FIND1^R4 - . G L4^@RIND4:Z - DO:TCOND3 W 5 D K@A - . G:Z T5+5^R5,@LIND5+3,@LIND6+3^@RIND6 - . G:Z 2+1^R6,3+1,7+5^R6,T8^R8 - . G L8+4^@RIND8 - D:TCOND4 - . G:Z ^R10 - . G ^@RIND10 - D:CONDENV - . G:Z LE0^[ENV1,ENV2]RE0,L1^|ENV1|RE1,LE2^[ENV3]RE3 - . G ^[ENV4]RE4:COND7 - . GOTO T5+5^[ENV8]R5,@LIND5+3^|ENV9|R9 - GOTO DE^RE:TCOND G:Z ARZ - S %=$$DFR^JUH,%=$$DF^GDE(A,B,C) - S (A,@(H_G))=5 - Q +CMDTEST0 ; + ; + Q + ; +DO ; + D L0^R0,L1^R1(A,B,C),L2^R3(.A,,.C) + D @FIND0,@LIND1^@RINDI1 + D:TCOND0 T0,T1:COND1,T2 + DO:TCOND1 T2(A,,) + D T0:COND0,T1:$$AR DO:TCOND2 + . D @FIND1^R4 + . D L4^@RIND4 + DO:TCOND3 + . D T5+5^R5,@LIND5+3,@LIND6+3^@RIND6 + . D 2+1^R6,3+1,7+5^R6,T8^R8 + . D L8+4^@RIND8 + D:TCOND4 + . D ^R10 + . D ^@RIND10 + D:(5+$$A^X) + . DO &Y0,&X1^Y1 D &PK2.Y2 + . D &PK3.X3^Y3 + D:TCOND6 + . D &E0(P1,P2),&D1^E1(P1,.P2) M @A=@B + . DO &PK2.E2(P3,@PIND) + . D &PK3.D3^E3(P5) + D:CONDENV + . D LE0^[ENV1,ENV2]RE0,L1^|ENV1|RE1(A,B,C),LE2^[ENV3]RE3(.A,,.C) + . D ^[ENV4]RE4:$$AX^RX(GG,HH,.I) + . DO T5+5^[ENV8]R5,@LIND5+3^|ENV9|R9 + Q + ; +GOTO ; + G L0^R0:ZZZ,L1^R1:ZZZ,L2^R2:ZZZ + G:ZZ @FIND0,@LIND1^@RINDI1 + G:TCOND0 T0,T1:COND1,T2 + GOTO:TCOND1 T2 + G T0:COND0,T1:COND1 DO:TCOND2 + . G:Z @FIND1^R4 + . G L4^@RIND4:Z + DO:TCOND3 W 5 D K@A + . G:Z T5+5^R5,@LIND5+3,@LIND6+3^@RIND6 + . G:Z 2+1^R6,3+1,7+5^R6,T8^R8 + . G L8+4^@RIND8 + D:TCOND4 + . G:Z ^R10 + . G ^@RIND10 + D:CONDENV + . G:Z LE0^[ENV1,ENV2]RE0,L1^|ENV1|RE1,LE2^[ENV3]RE3 + . G ^[ENV4]RE4:COND7 + . GOTO T5+5^[ENV8]R5,@LIND5+3^|ENV9|R9 + GOTO DE^RE:TCOND G:Z ARZ + S %=$$DFR^JUH,%=$$DF^GDE(A,B,C) + S (A,@(H_G))=5 + Q ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DDI.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DDI.m index 7f1fe81..da94a79 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DDI.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DDI.m @@ -1,6 +1,6 @@ -DDI ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -CHK(A) Q +DDI ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +CHK(A) Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DIE.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DIE.m index 4dec9ae..fce5f46 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DIE.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DIE.m @@ -1,6 +1,6 @@ -DIE ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -CHK(A) Q +DIE ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +CHK(A) Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DMI.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DMI.m index 39b13ea..042335e 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DMI.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/DMI.m @@ -1,6 +1,6 @@ -DMI ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -CHK(A) Q +DMI ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +CHK(A) Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/ERRTEST0.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/ERRTEST0.m index 6811896..95248b5 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/ERRTEST0.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/ERRTEST0.m @@ -1,34 +1,34 @@ -ERRORTST ; - ; -ADD(A,B) ; - N SUM - S SUM=A+B - Q SUM - ; -MULTIPLY(A,B) ; - N PROD - S PROD=A* - Q PROD ; QUIT - ; -MAIN - N A,B - N C,D - S C= - S D=A+B - S MULTIPLY(C,D) - W D Q ; - Q - ; -DOERR - F J=1:1:1 S A=A+1 - . S Y=1 - Q - ; -DOERR2 - S A=A+1 D - . S Y=1 - ; - . S K=3 - Q - ; +ERRORTST ; + ; +ADD(A,B) ; + N SUM + S SUM=A+B + Q SUM + ; +MULTIPLY(A,B) ; + N PROD + S PROD=A* + Q PROD ; QUIT + ; +MAIN + N A,B + N C,D + S C= + S D=A+B + S MULTIPLY(C,D) + W D Q ; + Q + ; +DOERR + F J=1:1:1 S A=A+1 + . S Y=1 + Q + ; +DOERR2 + S A=A+1 D + . S Y=1 + ; + . S K=3 + Q + ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FIE.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FIE.m index a09dd58..df8e206 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FIE.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FIE.m @@ -1,6 +1,6 @@ -FIE ;AU - API TEST ; JUN 18,2012 - ;;3.0;TESTING;;JUN 18,2012 - ; - Q - ; -CHK(A) Q +FIE ;AU - API TEST ; JUN 18,2012 + ;;3.0;TESTING;;JUN 18,2012 + ; + Q + ; +CHK(A) Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU00.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU00.m index 1279e52..04819e3 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU00.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU00.m @@ -1,19 +1,19 @@ -FINROU00 ; AU - FANIN TEST ; NOV 12,2012 - ;;3.0;TESTING;; NOV 12,2012 - ; - Q - ; -ADD(TARGET,SOURCE) ; - S TARGET=TARGET+SOURCE - Q - ; -SUB(TARGET,SOURCE) ; - S TARGET=TARGET-SOURCE - Q - ; -MULT(TARGET,SOURCE) ; - S TARGET=TARGET*SOURCE - Q - ; -MULTADD(TARGET,SOURCE,SCALAR) ; - D ADD(TARGET,SOURCE*SCALAR) +FINROU00 ; AU - FANIN TEST ; NOV 12,2012 + ;;3.0;TESTING;; NOV 12,2012 + ; + Q + ; +ADD(TARGET,SOURCE) ; + S TARGET=TARGET+SOURCE + Q + ; +SUB(TARGET,SOURCE) ; + S TARGET=TARGET-SOURCE + Q + ; +MULT(TARGET,SOURCE) ; + S TARGET=TARGET*SOURCE + Q + ; +MULTADD(TARGET,SOURCE,SCALAR) ; + D ADD(TARGET,SOURCE*SCALAR) diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU01.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU01.m index 28a19c1..7afff01 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU01.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU01.m @@ -1,42 +1,42 @@ -FINROU01 ; AU - FANIN TEST ; NOV 12,2012 - ;;3.0;TESTING;; NOV 12,2012 - ; - F I=1:1:2 D - . D ADD^FINROU00(RESULT,LIST(I)) - ; - Q - ; -ADDALL(LIST) ; - N RESULT - S RESULT=0 - F I=1:1:LIST D ADD^FINROU00(RESULT,LIST(I)) - Q - ; -CONDADD(LIST,FLAG) ; - N RESULT - S RESULT=0 - I FLAG=1 G DE0 -CONDADD2 - F I=1:1:LIST D ADD^FINROU00(RESULT,LIST(I)) - Q - ; -DE0 Q - ; -SUBALL(LIST) ; - N RESULT - S RESULT=0 - F I=1:1:LIST D SUB^FINROU00(RESULT,LIST(I)) - Q - ; -MULTALL(LIST) ; - N RESULT - S RESULT=1 - F I=1:1:LIST D MULT^FINROU00(RESULT,LIST(I)) - Q - ; -MULTAALL(LIST,SCALAR) ; - N RESULT - S RESULT=0 - F I=1:1:LIST D MULTADD^FINROU00(RESULT,LIST(I),SCALAR) - Q - ; +FINROU01 ; AU - FANIN TEST ; NOV 12,2012 + ;;3.0;TESTING;; NOV 12,2012 + ; + F I=1:1:2 D + . D ADD^FINROU00(RESULT,LIST(I)) + ; + Q + ; +ADDALL(LIST) ; + N RESULT + S RESULT=0 + F I=1:1:LIST D ADD^FINROU00(RESULT,LIST(I)) + Q + ; +CONDADD(LIST,FLAG) ; + N RESULT + S RESULT=0 + I FLAG=1 G DE0 +CONDADD2 + F I=1:1:LIST D ADD^FINROU00(RESULT,LIST(I)) + Q + ; +DE0 Q + ; +SUBALL(LIST) ; + N RESULT + S RESULT=0 + F I=1:1:LIST D SUB^FINROU00(RESULT,LIST(I)) + Q + ; +MULTALL(LIST) ; + N RESULT + S RESULT=1 + F I=1:1:LIST D MULT^FINROU00(RESULT,LIST(I)) + Q + ; +MULTAALL(LIST,SCALAR) ; + N RESULT + S RESULT=0 + F I=1:1:LIST D MULTADD^FINROU00(RESULT,LIST(I),SCALAR) + Q + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU02.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU02.m index 9fa3469..8269c3e 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU02.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU02.m @@ -1,37 +1,37 @@ -FINROU02 ; AU - FANIN TEST ; NOV 12,2012 - ;;3.0;TESTING;; NOV 12,2012 - ; - Q - ; -ADD - S LIST=+$G(LIST)+1 - S LIST(LIST)=5 - D ADDALL^FINROU01(.LIST) - Q - ; -SUB - S LIST=+$G(LIST)+1 - S LIST(LIST)=5 - D SUBALL^FINROU01(.LIST) - Q - ; -OTHER - D ADD^FINROU00(RESULT,LIST(I)) - Q - ; -MULT - S LIST=+$G(LIST)+1 - S LIST(LIST)=5 - D MULTALL^FINROU01(.LIST) - Q - ; -SUB2 - S LIST=+$G(LIST)+1 - S LIST(LIST)=4 - G SUB - ; -ADD2 - S LIST=+$G(LIST)+1 - S LIST(LIST)=4 - G ADD +FINROU02 ; AU - FANIN TEST ; NOV 12,2012 + ;;3.0;TESTING;; NOV 12,2012 + ; + Q + ; +ADD + S LIST=+$G(LIST)+1 + S LIST(LIST)=5 + D ADDALL^FINROU01(.LIST) + Q + ; +SUB + S LIST=+$G(LIST)+1 + S LIST(LIST)=5 + D SUBALL^FINROU01(.LIST) + Q + ; +OTHER + D ADD^FINROU00(RESULT,LIST(I)) + Q + ; +MULT + S LIST=+$G(LIST)+1 + S LIST(LIST)=5 + D MULTALL^FINROU01(.LIST) + Q + ; +SUB2 + S LIST=+$G(LIST)+1 + S LIST(LIST)=4 + G SUB + ; +ADD2 + S LIST=+$G(LIST)+1 + S LIST(LIST)=4 + G ADD \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU03.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU03.m index d54af62..b8a6964 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU03.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU03.m @@ -1,8 +1,8 @@ -FINROU03 ; AU - FANIN TEST ; NOV 12,2012 - ;;3.0;TESTING;; NOV 12,2012 -TESTINDO - D ADD^FINROU00 - Q -TESTIND2 - S A=1 - Q +FINROU03 ; AU - FANIN TEST ; NOV 12,2012 + ;;3.0;TESTING;; NOV 12,2012 +TESTINDO + D ADD^FINROU00 + Q +TESTIND2 + S A=1 + Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU04.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU04.m index 80392e5..07b75b5 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU04.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/FINROU04.m @@ -1,9 +1,9 @@ -FINROU04 ; AU - FANIN TEST ; NOV 12,2012 - ;;3.0;TESTING;; NOV 12,2012 - ; -TESTINDO - F I=1:1:4 D - . W "B" - . ; - . D OTHER^FINROU02 - Q +FINROU04 ; AU - FANIN TEST ; NOV 12,2012 + ;;3.0;TESTING;; NOV 12,2012 + ; +TESTINDO + F I=1:1:4 D + . W "B" + . ; + . D OTHER^FINROU02 + Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST0.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST0.m index ecd9c08..0409f55 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST0.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST0.m @@ -1,28 +1,28 @@ -QTTTEST0 ; AU - QUIT TYPE TEST ; MAY 4, 2013 - ;;1.0;TESTING;; MAY 4, 2013 - ; - Q - ; -SUMXYZ(A,B,C) ; - N RESULT,T - F I=1:5:1 D Q:T - . S RESULT=RESULT+^X(A) - . S T=(^X(A,0)>1) - G:$D(B(0)) SUMY - D:$D(B(1)) SUMZ^QTTTEST1(B(1),.RESULT) - ; -SUMC - N I S I=0 - F Q:'$D(C(I)) S RESULT=RESULT+C(I) S I=I+1 - Q - ; -SUMY - Q ^X("ADS") - ; -SUMALL - N A - S A=1 - F I=1:3:1 D Q - . D THRUERR0^QTTEST1(.A) - W A - Q +QTTTEST0 ; AU - QUIT TYPE TEST ; MAY 4, 2013 + ;;1.0;TESTING;; MAY 4, 2013 + ; + Q + ; +SUMXYZ(A,B,C) ; + N RESULT,T + F I=1:5:1 D Q:T + . S RESULT=RESULT+^X(A) + . S T=(^X(A,0)>1) + G:$D(B(0)) SUMY + D:$D(B(1)) SUMZ^QTTTEST1(B(1),.RESULT) + ; +SUMC + N I S I=0 + F Q:'$D(C(I)) S RESULT=RESULT+C(I) S I=I+1 + Q + ; +SUMY + Q ^X("ADS") + ; +SUMALL + N A + S A=1 + F I=1:3:1 D Q + . D THRUERR0^QTTEST1(.A) + W A + Q diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST1.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST1.m index 0db0618..c10be92 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST1.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST1.m @@ -1,22 +1,22 @@ -QTTTEST1 ; AU - QUIT TYPE TEST ; MAY 4, 2013 - ;;1.0;TESTING;; MAY 4, 2013 - ; - Q - ; -SUMZ - S RESULT=RESULT+^Z(B) - Q RESULT - ; -THRUERR0(A) - D EXTR^QTTTEST2(A) - S A=A+1 - S A=3*A - Q - ; -THRUGOOD(A) - S A=$$EXTR^QTTTEST2(A) - S A=A+1 - S A=A+$$THRUERR0(A) - Q A - ; - +QTTTEST1 ; AU - QUIT TYPE TEST ; MAY 4, 2013 + ;;1.0;TESTING;; MAY 4, 2013 + ; + Q + ; +SUMZ + S RESULT=RESULT+^Z(B) + Q RESULT + ; +THRUERR0(A) + D EXTR^QTTTEST2(A) + S A=A+1 + S A=3*A + Q + ; +THRUGOOD(A) + S A=$$EXTR^QTTTEST2(A) + S A=A+1 + S A=A+$$THRUERR0(A) + Q A + ; + diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST2.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST2.m index f29bc2d..7a8bda2 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST2.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/QTTTEST2.m @@ -1,10 +1,10 @@ -QTTTEST2 ; AU - QUIT TYPE TEST ; MAY 420, 2013 - ;;1.0;TESTING;; MAY 4, 2013 - ; - Q - ; -EXTR(A) - S A=A+1 - W A - Q A - ; +QTTTEST2 ; AU - QUIT TYPE TEST ; MAY 420, 2013 + ;;1.0;TESTING;; MAY 4, 2013 + ; + Q + ; +EXTR(A) + S A=A+1 + W A + Q A + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA000.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA000.m index 109c4d2..aee0450 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA000.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA000.m @@ -1,40 +1,40 @@ -RFIOA000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; - Q - ; -TOPD(A) ; - I $D(A) D AD0^RFIOA001(A) - D INTD(A) - D COMD(A) - D COMD^RFIOD000(A) - D T0^RFIOXLLC - Q - ; -TOPE(A) - N SUM,I S SUM=1 - D COMD^RFIOB001(A) - F I=1:3:1 D - . Q:$$AE0^RFIOB000(^G(A,I))="N" - . S SUM=SUM+$$INTE(I) - . S SUM=SUM+$$COME^RFIOD001(I) - Q - ; -FROM2 ; - Q - ; -DE0(A) ; - Q 1 - ; -INTD(A) ; - Q - ; -INTE(A) ; - Q A - ; -COMD(A) ; - Q - ; -COME(A) ; - Q 1 +RFIOA000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; + Q + ; +TOPD(A) ; + I $D(A) D AD0^RFIOA001(A) + D INTD(A) + D COMD(A) + D COMD^RFIOD000(A) + D T0^RFIOXLLC + Q + ; +TOPE(A) + N SUM,I S SUM=1 + D COMD^RFIOB001(A) + F I=1:3:1 D + . Q:$$AE0^RFIOB000(^G(A,I))="N" + . S SUM=SUM+$$INTE(I) + . S SUM=SUM+$$COME^RFIOD001(I) + Q + ; +FROM2 ; + Q + ; +DE0(A) ; + Q 1 + ; +INTD(A) ; + Q + ; +INTE(A) ; + Q A + ; +COMD(A) ; + Q + ; +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA001.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA001.m index 2bef6cd..80e10dc 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA001.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA001.m @@ -1,14 +1,14 @@ -RFIOA001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; - Q - ; -AD0(A) ; - Q - ; -COMD(A) ; - D T1^RFIOXLLC - Q -COME(A) ; - Q 1 +RFIOA001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; + Q + ; +AD0(A) ; + Q + ; +COMD(A) ; + D T1^RFIOXLLC + Q +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA002.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA002.m index f7f5eaa..ae8c5ec 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA002.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOA002.m @@ -1,4 +1,4 @@ -RFIOA002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; +RFIOA002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; D FROM2^RFIOA000 \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB000.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB000.m index ff0dc42..af06ef0 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB000.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB000.m @@ -1,40 +1,40 @@ -RFIOB000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 12,2012 - ; - Q - ; -TOPD(A) ; - I $D(A) D BD0^RFIOB001(A) - D INTD(A) - D COMD(A) - D COMD^RFIOA000(A) - D T0^RFIOXLLC - Q - ; -TOPE(A) - N SUM,I S SUM=1 - D COMD^RFIOC001(A) - F I=1:3:1 D - . Q:$$BE0^RFIOC000(^G(A,I))="N" - . S SUM=SUM+$$INTE(I) - . S SUM=SUM+$$COME^RFIOA001(I) - Q - ; -FROM2 ; - Q - ; -AE0(A) ; - Q 1 - ; -INTD(A) ; - Q - ; -INTE(A) ; - Q A - ; -COMD(A) ; - Q - ; -COME(A) ; - Q 1 +RFIOB000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 12,2012 + ; + Q + ; +TOPD(A) ; + I $D(A) D BD0^RFIOB001(A) + D INTD(A) + D COMD(A) + D COMD^RFIOA000(A) + D T0^RFIOXLLC + Q + ; +TOPE(A) + N SUM,I S SUM=1 + D COMD^RFIOC001(A) + F I=1:3:1 D + . Q:$$BE0^RFIOC000(^G(A,I))="N" + . S SUM=SUM+$$INTE(I) + . S SUM=SUM+$$COME^RFIOA001(I) + Q + ; +FROM2 ; + Q + ; +AE0(A) ; + Q 1 + ; +INTD(A) ; + Q + ; +INTE(A) ; + Q A + ; +COMD(A) ; + Q + ; +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB001.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB001.m index c233300..ddef15a 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB001.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB001.m @@ -1,14 +1,14 @@ -RFIOB001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; - Q - ; -BD0(A) ; - Q - ; -COMD(A) ; - D T1^RFIOXLLC - Q -COME(A) ; - Q 1 +RFIOB001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; + Q + ; +BD0(A) ; + Q + ; +COMD(A) ; + D T1^RFIOXLLC + Q +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB002.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB002.m index 22abf55..ea1c00f 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB002.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOB002.m @@ -1,4 +1,4 @@ -RFIOB002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; +RFIOB002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; D FROM2^RFIOB000 \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC000.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC000.m index 73cca53..c114ca2 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC000.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC000.m @@ -1,40 +1,40 @@ -RFIOC000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 12,2012 - ; - Q - ; -TOPD(A) ; - I $D(A) D CD0^RFIOC001(A) - D INTD(A) - D COMD(A) - D COMD^RFIOB000(A) - D T0^RFIOXLLC - Q - ; -TOPE(A) - N SUM,I S SUM=1 - D COMD^RFIOD001(A) - F I=1:3:1 D - . Q:$$CE0^RFIOD000(^G(A,I))="N" - . S SUM=SUM+$$INTE(I) - . S SUM=SUM+$$COME^RFIOB001(I) - Q - ; -FROM2 ; - Q - ; -BE0(A) ; - Q 1 - ; -INTD(A) ; - Q - ; -INTE(A) ; - Q A - ; -COMD(A) ; - Q - ; -COME(A) ; - Q 1 +RFIOC000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 12,2012 + ; + Q + ; +TOPD(A) ; + I $D(A) D CD0^RFIOC001(A) + D INTD(A) + D COMD(A) + D COMD^RFIOB000(A) + D T0^RFIOXLLC + Q + ; +TOPE(A) + N SUM,I S SUM=1 + D COMD^RFIOD001(A) + F I=1:3:1 D + . Q:$$CE0^RFIOD000(^G(A,I))="N" + . S SUM=SUM+$$INTE(I) + . S SUM=SUM+$$COME^RFIOB001(I) + Q + ; +FROM2 ; + Q + ; +BE0(A) ; + Q 1 + ; +INTD(A) ; + Q + ; +INTE(A) ; + Q A + ; +COMD(A) ; + Q + ; +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC001.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC001.m index 1330a88..4695b24 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC001.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC001.m @@ -1,14 +1,14 @@ -RFIOC001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; - Q - ; -CD0(A) ; - Q - ; -COMD(A) ; - D T1^RFIOXLLC - Q -COME(A) ; - Q 1 +RFIOC001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; + Q + ; +CD0(A) ; + Q + ; +COMD(A) ; + D T1^RFIOXLLC + Q +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC002.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC002.m index e9ff1c1..8b26603 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC002.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOC002.m @@ -1,4 +1,4 @@ -RFIOC002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; +RFIOC002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; D FROM2^RFIOC000 \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD000.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD000.m index a2f908a..b970784 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD000.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD000.m @@ -1,40 +1,40 @@ -RFIOD000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 12,2012 - ; - Q - ; -TOPD(A) ; - I $D(A) D DD0^RFIOD001(A) - D INTD(A) - D COMD(A) - D COMD^RFIOC000(A) - D T0^RFIOXLLC - Q - ; -TOPE(A) - N SUM,I S SUM=1 - D COMD^RFIOA001(A) - F I=1:3:1 D - . Q:$$DE0^RFIOA000(^G(A,I))="N" - . S SUM=SUM+$$INTE(I) - . S SUM=SUM+$$COME^RFIOC001(I) - Q - ; -FROM2 ; - Q - ; -CE0(A) ; - Q 1 - ; -INTD(A) ; - Q - ; -INTE(A) ; - Q A - ; -COMD(A) ; - Q - ; -COME(A) ; - Q 1 +RFIOD000 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 12,2012 + ; + Q + ; +TOPD(A) ; + I $D(A) D DD0^RFIOD001(A) + D INTD(A) + D COMD(A) + D COMD^RFIOC000(A) + D T0^RFIOXLLC + Q + ; +TOPE(A) + N SUM,I S SUM=1 + D COMD^RFIOA001(A) + F I=1:3:1 D + . Q:$$DE0^RFIOA000(^G(A,I))="N" + . S SUM=SUM+$$INTE(I) + . S SUM=SUM+$$COME^RFIOC001(I) + Q + ; +FROM2 ; + Q + ; +CE0(A) ; + Q 1 + ; +INTD(A) ; + Q + ; +INTE(A) ; + Q A + ; +COMD(A) ; + Q + ; +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD001.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD001.m index 9af1c67..8313ba8 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD001.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD001.m @@ -1,14 +1,14 @@ -RFIOD001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; - Q - ; -DD0(A) ; - Q - ; -COMD(A) ; - D T1^RFIOXLLC - Q -COME(A) ; - Q 1 +RFIOD001 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; + Q + ; +DD0(A) ; + Q + ; +COMD(A) ; + D T1^RFIOXLLC + Q +COME(A) ; + Q 1 ; \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD002.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD002.m index abd5c1b..1942765 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD002.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOD002.m @@ -1,4 +1,4 @@ -RFIOD002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 30,2012 - ; +RFIOD002 ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 30,2012 + ; D FROM2^RFIOD000 \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOXLLC.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOXLLC.m index 6923a1c..1324b06 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOXLLC.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/RFIOXLLC.m @@ -1,11 +1,11 @@ -RFIOXLLC ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 - ;;3.0;TESTING;; JUN 12,2012 - ; - Q - ; -T0 ; - Q -T1 ; - Q -T2 ; +RFIOXLLC ; AU - ROUTINE FANIN/FANOUT TESTS ; JUN 30, 2013 + ;;3.0;TESTING;; JUN 12,2012 + ; + Q + ; +T0 ; + Q +T1 ; + Q +T2 ; Q \ No newline at end of file diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/TAGLOC00.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/TAGLOC00.m index fa25d5c..58d4c4b 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/TAGLOC00.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/TAGLOC00.m @@ -1,28 +1,28 @@ -TAGLOC00 ; - Q - ; -E0 ; - N I,SUM - F I=1:5:1 D -IN0 . S SUM=SUM+I - . I SUM>5 D - . . S SUM=SUM-1 N J -IN1 . . S J=$G(J)+1 Q:J>4 - . . S SUM=SUM+1 - . . G IN1 -IN2 . S SUM=SUM+3 - . G:SUM<100 IN2 - Q - ; -E1 ; - N N,SUM - F S N=$O(^X(N)),SUM=SUM+N Q:SUM>5 - Q - ; -E2 ; - N N,SUM - F S N=$O(^X(N)),SUM=SUM+N Q:SUM>5 - ; -E3 - Q - ; +TAGLOC00 ; + Q + ; +E0 ; + N I,SUM + F I=1:5:1 D +IN0 . S SUM=SUM+I + . I SUM>5 D + . . S SUM=SUM-1 N J +IN1 . . S J=$G(J)+1 Q:J>4 + . . S SUM=SUM+1 + . . G IN1 +IN2 . S SUM=SUM+3 + . G:SUM<100 IN2 + Q + ; +E1 ; + N N,SUM + F S N=$O(^X(N)),SUM=SUM+N Q:SUM>5 + Q + ; +E2 ; + N N,SUM + F S N=$O(^X(N)),SUM=SUM+N Q:SUM>5 + ; +E3 + Q + ; diff --git a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/XRGITST0.m b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/XRGITST0.m index 0843508..716b7de 100644 --- a/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/XRGITST0.m +++ b/us.pwc.vista.mlib/test/com/pwc/us/rgi/m/resource/XRGITST0.m @@ -1,27 +1,27 @@ -XRGITST0 ; - Q - ; -ADD(A,B,C) ; - S A=B+C - Q - ; -SUB(A,B,C) - S A=B-C - Q - ; -TAG1 ; - N A,B,C - S A=1,B=1,C=1 - F I=1:1 D ADD:A>5,SUB:A>10 D Q:A>20 G TAG1 - . S A=1 - G TAG3:A=3,@("TAG"_B):C'>3,@A^@B - D @C^@B,@B - Q - ; -TAG2 ; - F I=1:1 D ADD:A>5,SUB:A>10 D Q:A>20 G TAG1 - . ; Empty line - . S A=1 - Q - ; -TAG3 N A S A=1 D:TAG1 ADD(A,1,1),SUB(A,1,1) Q +XRGITST0 ; + Q + ; +ADD(A,B,C) ; + S A=B+C + Q + ; +SUB(A,B,C) + S A=B-C + Q + ; +TAG1 ; + N A,B,C + S A=1,B=1,C=1 + F I=1:1 D ADD:A>5,SUB:A>10 D Q:A>20 G TAG1 + . S A=1 + G TAG3:A=3,@("TAG"_B):C'>3,@A^@B + D @C^@B,@B + Q + ; +TAG2 ; + F I=1:1 D ADD:A>5,SUB:A>10 D Q:A>20 G TAG1 + . ; Empty line + . S A=1 + Q + ; +TAG3 N A S A=1 D:TAG1 ADD(A,1,1),SUB(A,1,1) Q