Skip to content

Commit

Permalink
Merge pull request #759 from fipro78/main
Browse files Browse the repository at this point in the history
Fixes #758 - Improve UI project structure
  • Loading branch information
amitjoy authored Nov 5, 2024
2 parents 74b1efa + 97e391f commit 1150d88
Show file tree
Hide file tree
Showing 71 changed files with 169 additions and 1,296 deletions.
23 changes: 0 additions & 23 deletions com.osgifx.console.extension.ui.tictactoe/_plugin.xml

This file was deleted.

2 changes: 1 addition & 1 deletion com.osgifx.console.extension.ui.tictactoe/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Bundle-SymbolicName : ${p}; singleton:=true
Model-Fragment: fragment.e4xmi;apply=always
-fixupmessages : 'No translation found'
-privatepackage : com.osgifx.console.extension.tictactoe
-includeresource : \
plugin.xml = _plugin.xml,\
fragment.e4xmi = fragment.e4xmi,\
css = css,\
fxml = fxml,\
Expand Down
23 changes: 0 additions & 23 deletions com.osgifx.console.ui.batchinstall/_plugin.xml

This file was deleted.

2 changes: 1 addition & 1 deletion com.osgifx.console.ui.batchinstall/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bundle-SymbolicName : ${p}; singleton:=true
Model-Fragment: fragment.e4xmi;apply=always
-includeresource : \
plugin.xml = _plugin.xml,\
fragment.e4xmi = fragment.e4xmi,\
css = css,\
fxml = fxml,\
Expand Down
23 changes: 0 additions & 23 deletions com.osgifx.console.ui.bundles/_plugin.xml

This file was deleted.

2 changes: 1 addition & 1 deletion com.osgifx.console.ui.bundles/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bundle-SymbolicName : ${p}; singleton:=true
Model-Fragment: fragment.e4xmi;apply=always
-includeresource : \
plugin.xml = _plugin.xml,\
fragment.e4xmi = fragment.e4xmi,\
css = css,\
fxml = fxml,\
Expand Down
133 changes: 32 additions & 101 deletions com.osgifx.console.ui.bundles/fragment.e4xmi
Original file line number Diff line number Diff line change
@@ -1,103 +1,34 @@
<?xml version="1.0" encoding="ASCII"?>
<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application"
xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands"
xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
xmi:id="_s7J3oCBGEey33dbookdebQ">
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
parentElementId="com.osgifx.console.ui.extensions.partstack">
<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
elementId="com.osgifx.console.application.tab.bundles"
accessibilityPhrase=""
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.BundlesFxUI"
label="Bundles"
iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/bundles.png"
tooltip="Shows all installed bundles in the remote framework"
closeable="true" />
</fragments>
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_kPgEQH67EeyYfeV-7UqQeg" featurename="handlers"
parentElementId="com.osgifx.console.application">
<elements xsi:type="commands:Handler" xmi:id="_kPgEQX67EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.handler.bundle.start"
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStartHandler"
command="_kPgERX67EeyYfeV-7UqQeg" />
<elements xsi:type="commands:Handler" xmi:id="_kPgEQn67EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.handler.bundle.stop"
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStopHandler"
command="_kPgER367EeyYfeV-7UqQeg" />
<elements xsi:type="commands:Handler" xmi:id="_kPgEQ367EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.handler.bundle.uninstall"
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleUninstallHandler"
command="_kPgESX67EeyYfeV-7UqQeg" />
</fragments>
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_kPgERH67EeyYfeV-7UqQeg" featurename="commands"
parentElementId="com.osgifx.console.application">
<elements xsi:type="commands:Command" xmi:id="_kPgERX67EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.command.bundle.start"
commandName="Bundle Start Command"
description="Starts the specified bundle having the specified ID"
category="_kPgETH67EeyYfeV-7UqQeg">
<parameters xmi:id="_kPgERn67EeyYfeV-7UqQeg" elementId="id"
name="ID" optional="false" />
</elements>
<elements xsi:type="commands:Command" xmi:id="_kPgER367EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.command.bundle.stop"
commandName="Bundle Stop Command"
description="Stops the specified bundle having the specified ID"
category="_kPgETH67EeyYfeV-7UqQeg">
<parameters xmi:id="_kPgESH67EeyYfeV-7UqQeg" elementId="id"
name="ID" optional="false" />
</elements>
<elements xsi:type="commands:Command" xmi:id="_kPgESX67EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.command.bundle.uninstall"
commandName="Bundle Uninstall Command"
description="Uninstalls the specified bundle having the specified ID"
category="_kPgETH67EeyYfeV-7UqQeg">
<parameters xmi:id="_kPgESn67EeyYfeV-7UqQeg" elementId="id"
name="ID" optional="false" />
</elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_kPgES367EeyYfeV-7UqQeg" featurename="categories"
parentElementId="com.osgifx.console.application">
<elements xsi:type="commands:Category" xmi:id="_kPgETH67EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.category.bundle"
name="Bundle Action"
description="This category is used to group all commands relating to bundle state changes" />
</fragments>
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_kPgET367EeyYfeV-7UqQeg" featurename="children"
parentElementId="com.osgifx.console.application.menu.actions">
<elements xsi:type="menu:DirectMenuItem"
xmi:id="_kPgEUH67EeyYfeV-7UqQeg"
elementId="com.osgifx.console.application.directmenuitem.install"
label="Install/Update Bundle"
iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/install.png"
tooltip="Installs or updates bundle in the remote OSGi framework"
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleInstallHandler" />
</fragments>
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_VmcXgM78EeyLr9jX3JzBRQ" featurename="children"
parentElementId="com.osgifx.console.application.menu.actions">
<elements xsi:type="menu:DirectMenuItem"
xmi:id="_VmcXgc78EeyLr9jX3JzBRQ"
elementId="com.osgifx.console.application.directmenuitem.obr"
label="Generate OBR"
iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/obr.png"
tooltip="Generates OBR XML from the connected runtime resources"
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.GenerateObrHandler" />
</fragments>
<fragments xsi:type="fragment:StringModelFragment"
xmi:id="_cBJPIGpBEe21Cs8uJesKFQ" featurename="addons"
parentElementId="com.osgifx.console.application">
<elements xsi:type="application:Addon" xmi:id="_cBJPIWpBEe21Cs8uJesKFQ"
elementId="com.osgifx.console.ui.bundles.addon.dragndrop"
contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.addon.DragAndDropAddon" />
</fragments>
<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_s7J3oCBGEey33dbookdebQ">
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:1">
<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.bundles" accessibilityPhrase="" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.BundlesFxUI" label="Bundles" iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/bundles.png" tooltip="Shows all installed bundles in the remote framework" closeable="true"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgEQH67EeyYfeV-7UqQeg" featurename="handlers" parentElementId="com.osgifx.console.application">
<elements xsi:type="commands:Handler" xmi:id="_kPgEQX67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.bundle.start" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStartHandler" command="_kPgERX67EeyYfeV-7UqQeg"/>
<elements xsi:type="commands:Handler" xmi:id="_kPgEQn67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.bundle.stop" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStopHandler" command="_kPgER367EeyYfeV-7UqQeg"/>
<elements xsi:type="commands:Handler" xmi:id="_kPgEQ367EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.bundle.uninstall" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleUninstallHandler" command="_kPgESX67EeyYfeV-7UqQeg"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgERH67EeyYfeV-7UqQeg" featurename="commands" parentElementId="com.osgifx.console.application">
<elements xsi:type="commands:Command" xmi:id="_kPgERX67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.bundle.start" commandName="Bundle Start Command" description="Starts the specified bundle having the specified ID" category="_kPgETH67EeyYfeV-7UqQeg">
<parameters xmi:id="_kPgERn67EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
</elements>
<elements xsi:type="commands:Command" xmi:id="_kPgER367EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.bundle.stop" commandName="Bundle Stop Command" description="Stops the specified bundle having the specified ID" category="_kPgETH67EeyYfeV-7UqQeg">
<parameters xmi:id="_kPgESH67EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
</elements>
<elements xsi:type="commands:Command" xmi:id="_kPgESX67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.bundle.uninstall" commandName="Bundle Uninstall Command" description="Uninstalls the specified bundle having the specified ID" category="_kPgETH67EeyYfeV-7UqQeg">
<parameters xmi:id="_kPgESn67EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
</elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgES367EeyYfeV-7UqQeg" featurename="categories" parentElementId="com.osgifx.console.application">
<elements xsi:type="commands:Category" xmi:id="_kPgETH67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.category.bundle" name="Bundle Action" description="This category is used to group all commands relating to bundle state changes"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgET367EeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
<elements xsi:type="menu:DirectMenuItem" xmi:id="_kPgEUH67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.install" label="Install/Update Bundle" iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/install.png" tooltip="Installs or updates bundle in the remote OSGi framework" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleInstallHandler"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_VmcXgM78EeyLr9jX3JzBRQ" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
<elements xsi:type="menu:DirectMenuItem" xmi:id="_VmcXgc78EeyLr9jX3JzBRQ" elementId="com.osgifx.console.application.directmenuitem.obr" label="Generate OBR" iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/obr.png" tooltip="Generates OBR XML from the connected runtime resources" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.GenerateObrHandler"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_cBJPIGpBEe21Cs8uJesKFQ" featurename="addons" parentElementId="com.osgifx.console.application">
<elements xsi:type="application:Addon" xmi:id="_cBJPIWpBEe21Cs8uJesKFQ" elementId="com.osgifx.console.ui.bundles.addon.dragndrop" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.addon.DragAndDropAddon"/>
</fragments>
</fragment:ModelFragments>
23 changes: 0 additions & 23 deletions com.osgifx.console.ui.components/_plugin.xml

This file was deleted.

2 changes: 1 addition & 1 deletion com.osgifx.console.ui.components/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bundle-SymbolicName : ${p}; singleton:=true
Model-Fragment: fragment.e4xmi;apply=always
-includeresource : \
plugin.xml = _plugin.xml,\
fragment.e4xmi = fragment.e4xmi,\
css = css,\
fxml = fxml,\
Expand Down
Loading

0 comments on commit 1150d88

Please sign in to comment.